##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Qt5: fix warnings about deprecated QT/CONFIG specification...
Marek Rosa -
r2051:7cd68cfd6696
parent child
Show More
Side by Side Unified
Context file:
r2051:7cd68cfd6696 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 !include( ../plugins.pri ) {
1 !include( ../plugins.pri ) {
2 error( "Couldn't find the plugins.pri file!" )
2 error( "Couldn't find the plugins.pri file!" )
3 }
3 }
4
4
5 TARGET=qtcommercialchartdesigner
5 TARGET=qtcommercialchartdesigner
6 DESTDIR = $$CHART_BUILD_DESIGNER_PLUGIN_DIR
6 DESTDIR = $$CHART_BUILD_DESIGNER_PLUGIN_DIR
7 CONFIG += designer
7 greaterThan(QT_MAJOR_VERSION, 4) {
8 QT += designer
9 } else {
10 CONFIG += designer
11 }
8 HEADERS = qchartsplugin.h
12 HEADERS = qchartsplugin.h
9 SOURCES = qchartsplugin.cpp
13 SOURCES = qchartsplugin.cpp
10 RESOURCES = qchartsplugin.qrc
14 RESOURCES = qchartsplugin.qrc
11
15
12 target.path = $$[QT_INSTALL_PLUGINS]/designer
16 target.path = $$[QT_INSTALL_PLUGINS]/designer
13 INSTALLS += target No newline at end of file
17 INSTALLS += target
Show file before | Show file after | Hide comments
@@ -1,14 +1,18
1 !include( ../tests.pri ) {
1 !include( ../tests.pri ) {
2 error( "Couldn't find the tests.pri file!" )
2 error( "Couldn't find the tests.pri file!" )
3 }
3 }
4
4
5 CONFIG += qtestlib
5 greaterThan(QT_MAJOR_VERSION, 4) {
6 QT += testlib
7 } else {
8 CONFIG += qtestlib
9 }
6 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
10 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
7
11
8 INCLUDEPATH += ../inc
12 INCLUDEPATH += ../inc
9 HEADERS += ../inc/tst_definitions.h
13 HEADERS += ../inc/tst_definitions.h
10
14
11 OBJECTS_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
15 OBJECTS_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
12 MOC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
16 MOC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
13 UI_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
17 UI_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
14 RCC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
18 RCC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
General Comments 0
You need to be logged in to leave comments. Login now