HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r605:c0502398e154

Fix vs2010 build

Jani Honkonen -

r605:c0502398e154

parent child

Context file:

r605:c0502398e154

src/barchart/qbarseries.cpp +1 0

             bool QBarSeries::setModel(QAbstractItemModel* model)
             {
                 m_model = model;
+                return true;
             }
             void QBarSeries::setModelMappingCategories(int modelColumn)

src/piechart/qpieseries.cpp +2 0

                     connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
                     connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
                 }
+                return true;
             }
             void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::Orientation orientation)

src/splinechart/qsplineseries.cpp +1 0

             {
                 QXYSeries::setModel(model);
             //    calculateControlPoints();
+                return true;
             }
             void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)

src/src.pro +2 -1

             TEMPLATE = lib
             QT += core \
                 gui
+            win32: LIBS += User32.lib
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
                 class = $$split(class,' ')
                 class = $$replace(class,' ','')
                 class = $$member(class,0)
-                command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
+                command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
                 system($$command)
                 }

src/xychart/qxyseries.cpp +1 0

                 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
                 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
                 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
+                return true;
             }
             void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages