##// END OF EJS Templates
Fix vs2010 build
Jani Honkonen -
r605:c0502398e154
parent child
Show More
@@ -224,6 +224,7 bool QBarSeries::separatorsVisible()
224 bool QBarSeries::setModel(QAbstractItemModel* model)
224 bool QBarSeries::setModel(QAbstractItemModel* model)
225 {
225 {
226 m_model = model;
226 m_model = model;
227 return true;
227 }
228 }
228
229
229 void QBarSeries::setModelMappingCategories(int modelColumn)
230 void QBarSeries::setModelMappingCategories(int modelColumn)
@@ -565,6 +565,8 bool QPieSeries::setModel(QAbstractItemModel* model)
565 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
565 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
566 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
566 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
567 }
567 }
568
569 return true;
568 }
570 }
569
571
570 void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::Orientation orientation)
572 void QPieSeries::setModelMapping(int modelValuesLine, int modelLabelsLine, Qt::Orientation orientation)
@@ -141,6 +141,7 bool QSplineSeries::setModel(QAbstractItemModel* model)
141 {
141 {
142 QXYSeries::setModel(model);
142 QXYSeries::setModel(model);
143 // calculateControlPoints();
143 // calculateControlPoints();
144 return true;
144 }
145 }
145
146
146 void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
147 void QSplineSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
@@ -4,6 +4,7 DESTDIR = $$CHART_BUILD_LIB_DIR
4 TEMPLATE = lib
4 TEMPLATE = lib
5 QT += core \
5 QT += core \
6 gui
6 gui
7 win32: LIBS += User32.lib
7 CONFIG += debug_and_release
8 CONFIG += debug_and_release
8 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
9 CONFIG(debug, debug|release):TARGET = QtCommercialChartd
9 SOURCES += \
10 SOURCES += \
@@ -79,7 +80,7 for(file, PUBLIC_HEADERS) {
79 class = $$split(class,' ')
80 class = $$split(class,' ')
80 class = $$replace(class,' ','')
81 class = $$replace(class,' ','')
81 class = $$member(class,0)
82 class = $$member(class,0)
82 command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
83 command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
83 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
84 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
84 system($$command)
85 system($$command)
85 }
86 }
@@ -290,6 +290,7 bool QXYSeries::setModel(QAbstractItemModel* model) {
290 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
290 connect(m_model,SIGNAL(dataChanged(QModelIndex,QModelIndex)), this, SLOT(modelUpdated(QModelIndex, QModelIndex)));
291 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
291 connect(m_model,SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(modelDataAdded(QModelIndex,int,int)));
292 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
292 connect(m_model, SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(modelDataRemoved(QModelIndex,int,int)));
293 return true;
293 }
294 }
294
295
295 void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
296 void QXYSeries::setModelMapping(int modelX, int modelY, Qt::Orientation orientation)
General Comments 0
You need to be logged in to leave comments. Login now