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

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

Qt5: fix declarative/quick1 module include
Marek Rosa -
r2050:0fecbcb1f664
parent child
Show More
Side by Side Unified
Context file:
r2050:0fecbcb1f664 Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -5,7 +5,11
5 # It is recommended not to modify this file, since newer versions of Qt Creator
5 # It is recommended not to modify this file, since newer versions of Qt Creator
6 # may offer an updated version of it.
6 # may offer an updated version of it.
7
7
8 greaterThan(QT_MAJOR_VERSION, 4) {
9 QT += quick1
10 } else {
8 QT += declarative
11 QT += declarative
12 }
9
13
10 SOURCES += $$PWD/qmlapplicationviewer.cpp
14 SOURCES += $$PWD/qmlapplicationviewer.cpp
11 HEADERS += $$PWD/qmlapplicationviewer.h
15 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -5,7 +5,11
5 # It is recommended not to modify this file, since newer versions of Qt Creator
5 # It is recommended not to modify this file, since newer versions of Qt Creator
6 # may offer an updated version of it.
6 # may offer an updated version of it.
7
7
8 greaterThan(QT_MAJOR_VERSION, 4) {
9 QT += quick1
10 } else {
8 QT += declarative
11 QT += declarative
12 }
9
13
10 SOURCES += $$PWD/qmlapplicationviewer.cpp
14 SOURCES += $$PWD/qmlapplicationviewer.cpp
11 HEADERS += $$PWD/qmlapplicationviewer.h
15 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -3,7 +3,11
3 }
3 }
4
4
5 TARGET = qtcommercialchartqml
5 TARGET = qtcommercialchartqml
6 greaterThan(QT_MAJOR_VERSION, 4) {
7 QT += quick1
8 } else {
6 QT += declarative
9 QT += declarative
10 }
7 DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
11 DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
8 INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
12 INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
9
13
Show file before | Show file after | Hide comments
@@ -2,4 +2,8
2 error( "Couldn't find the auto.pri file!" )
2 error( "Couldn't find the auto.pri file!" )
3 }
3 }
4 SOURCES += tst_qml.cpp
4 SOURCES += tst_qml.cpp
5 greaterThan(QT_MAJOR_VERSION, 4) {
6 QT += quick1
7 } else {
5 QT += declarative
8 QT += declarative
9 }
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
@@ -1,4 +1,8
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
1 QT += declarative
4 QT += declarative
5 }
2
6
3 SOURCES += $$PWD/qmlapplicationviewer.cpp
7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 HEADERS += $$PWD/qmlapplicationviewer.h
8 HEADERS += $$PWD/qmlapplicationviewer.h
General Comments 0
You need to be logged in to leave comments. Login now