##// 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,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,148 +1,152
1 1 # checksum 0x5b42 version 0x70013
2 2 # This file was generated by the Qt Quick Application wizard of Qt Creator.
3 3 # The code below adds the QmlApplicationViewer to the project and handles the
4 4 # activation of QML debugging.
5 5 # It is recommended not to modify this file, since newer versions of Qt Creator
6 6 # may offer an updated version of it.
7 7
8 QT += declarative
8 greaterThan(QT_MAJOR_VERSION, 4) {
9 QT += quick1
10 } else {
11 QT += declarative
12 }
9 13
10 14 SOURCES += $$PWD/qmlapplicationviewer.cpp
11 15 HEADERS += $$PWD/qmlapplicationviewer.h
12 16 INCLUDEPATH += $$PWD
13 17
14 18 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
15 19 !isEmpty(QMLJSDEBUGGER_PATH) {
16 20 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
17 21 } else {
18 22 DEFINES -= QMLJSDEBUGGER
19 23 }
20 24
21 25 contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
22 26 DEFINES += HARMATTAN_BOOSTER
23 27 }
24 28 # This file was generated by an application wizard of Qt Creator.
25 29 # The code below handles deployment to Symbian and Maemo, aswell as copying
26 30 # of the application data to shadow build directories on desktop.
27 31 # It is recommended not to modify this file, since newer versions of Qt Creator
28 32 # may offer an updated version of it.
29 33
30 34 defineTest(qtcAddDeployment) {
31 35 for(deploymentfolder, DEPLOYMENTFOLDERS) {
32 36 item = item$${deploymentfolder}
33 37 itemsources = $${item}.sources
34 38 $$itemsources = $$eval($${deploymentfolder}.source)
35 39 itempath = $${item}.path
36 40 $$itempath= $$eval($${deploymentfolder}.target)
37 41 export($$itemsources)
38 42 export($$itempath)
39 43 DEPLOYMENT += $$item
40 44 }
41 45
42 46 MAINPROFILEPWD = $$PWD
43 47
44 48 symbian {
45 49 isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
46 50 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
47 51 } else:win32 {
48 52 copyCommand =
49 53 for(deploymentfolder, DEPLOYMENTFOLDERS) {
50 54 source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
51 55 source = $$replace(source, /, \\)
52 56 sourcePathSegments = $$split(source, \\)
53 57 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
54 58 target = $$replace(target, /, \\)
55 59 target ~= s,\\\\\\.?\\\\,\\,
56 60 !isEqual(source,$$target) {
57 61 !isEmpty(copyCommand):copyCommand += &&
58 62 isEqual(QMAKE_DIR_SEP, \\) {
59 63 copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
60 64 } else {
61 65 source = $$replace(source, \\\\, /)
62 66 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
63 67 target = $$replace(target, \\\\, /)
64 68 copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
65 69 }
66 70 }
67 71 }
68 72 !isEmpty(copyCommand) {
69 73 copyCommand = @echo Copying application data... && $$copyCommand
70 74 copydeploymentfolders.commands = $$copyCommand
71 75 first.depends = $(first) copydeploymentfolders
72 76 export(first.depends)
73 77 export(copydeploymentfolders.commands)
74 78 QMAKE_EXTRA_TARGETS += first copydeploymentfolders
75 79 }
76 80 } else:unix {
77 81 maemo5 {
78 82 desktopfile.files = $${TARGET}.desktop
79 83 desktopfile.path = /usr/share/applications/hildon
80 84 icon.files = $${TARGET}64.png
81 85 icon.path = /usr/share/icons/hicolor/64x64/apps
82 86 } else:!isEmpty(MEEGO_VERSION_MAJOR) {
83 87 desktopfile.files = $${TARGET}_harmattan.desktop
84 88 desktopfile.path = /usr/share/applications
85 89 icon.files = $${TARGET}80.png
86 90 icon.path = /usr/share/icons/hicolor/80x80/apps
87 91 } else { # Assumed to be a Desktop Unix
88 92 copyCommand =
89 93 for(deploymentfolder, DEPLOYMENTFOLDERS) {
90 94 source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
91 95 source = $$replace(source, \\\\, /)
92 96 macx {
93 97 target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
94 98 } else {
95 99 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
96 100 }
97 101 target = $$replace(target, \\\\, /)
98 102 sourcePathSegments = $$split(source, /)
99 103 targetFullPath = $$target/$$last(sourcePathSegments)
100 104 targetFullPath ~= s,/\\.?/,/,
101 105 !isEqual(source,$$targetFullPath) {
102 106 !isEmpty(copyCommand):copyCommand += &&
103 107 copyCommand += $(MKDIR) \"$$target\"
104 108 copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
105 109 }
106 110 }
107 111 !isEmpty(copyCommand) {
108 112 copyCommand = @echo Copying application data... && $$copyCommand
109 113 copydeploymentfolders.commands = $$copyCommand
110 114 first.depends = $(first) copydeploymentfolders
111 115 export(first.depends)
112 116 export(copydeploymentfolders.commands)
113 117 QMAKE_EXTRA_TARGETS += first copydeploymentfolders
114 118 }
115 119 }
116 120 installPrefix = /opt/$${TARGET}
117 121 for(deploymentfolder, DEPLOYMENTFOLDERS) {
118 122 item = item$${deploymentfolder}
119 123 itemfiles = $${item}.files
120 124 $$itemfiles = $$eval($${deploymentfolder}.source)
121 125 itempath = $${item}.path
122 126 $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
123 127 export($$itemfiles)
124 128 export($$itempath)
125 129 INSTALLS += $$item
126 130 }
127 131
128 132 !isEmpty(desktopfile.path) {
129 133 export(icon.files)
130 134 export(icon.path)
131 135 export(desktopfile.files)
132 136 export(desktopfile.path)
133 137 INSTALLS += icon desktopfile
134 138 }
135 139
136 140 target.path = $${installPrefix}/bin
137 141 export(target.path)
138 142 INSTALLS += target
139 143 }
140 144
141 145 export (ICON)
142 146 export (INSTALLS)
143 147 export (DEPLOYMENT)
144 148 export (TARGET.EPOCHEAPSIZE)
145 149 export (TARGET.CAPABILITY)
146 150 export (LIBS)
147 151 export (QMAKE_EXTRA_TARGETS)
148 152 }
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,148 +1,152
1 1 # checksum 0x5b42 version 0x70013
2 2 # This file was generated by the Qt Quick Application wizard of Qt Creator.
3 3 # The code below adds the QmlApplicationViewer to the project and handles the
4 4 # activation of QML debugging.
5 5 # It is recommended not to modify this file, since newer versions of Qt Creator
6 6 # may offer an updated version of it.
7 7
8 QT += declarative
8 greaterThan(QT_MAJOR_VERSION, 4) {
9 QT += quick1
10 } else {
11 QT += declarative
12 }
9 13
10 14 SOURCES += $$PWD/qmlapplicationviewer.cpp
11 15 HEADERS += $$PWD/qmlapplicationviewer.h
12 16 INCLUDEPATH += $$PWD
13 17
14 18 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
15 19 !isEmpty(QMLJSDEBUGGER_PATH) {
16 20 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
17 21 } else {
18 22 DEFINES -= QMLJSDEBUGGER
19 23 }
20 24
21 25 contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) {
22 26 DEFINES += HARMATTAN_BOOSTER
23 27 }
24 28 # This file was generated by an application wizard of Qt Creator.
25 29 # The code below handles deployment to Symbian and Maemo, aswell as copying
26 30 # of the application data to shadow build directories on desktop.
27 31 # It is recommended not to modify this file, since newer versions of Qt Creator
28 32 # may offer an updated version of it.
29 33
30 34 defineTest(qtcAddDeployment) {
31 35 for(deploymentfolder, DEPLOYMENTFOLDERS) {
32 36 item = item$${deploymentfolder}
33 37 itemsources = $${item}.sources
34 38 $$itemsources = $$eval($${deploymentfolder}.source)
35 39 itempath = $${item}.path
36 40 $$itempath= $$eval($${deploymentfolder}.target)
37 41 export($$itemsources)
38 42 export($$itempath)
39 43 DEPLOYMENT += $$item
40 44 }
41 45
42 46 MAINPROFILEPWD = $$PWD
43 47
44 48 symbian {
45 49 isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
46 50 isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
47 51 } else:win32 {
48 52 copyCommand =
49 53 for(deploymentfolder, DEPLOYMENTFOLDERS) {
50 54 source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
51 55 source = $$replace(source, /, \\)
52 56 sourcePathSegments = $$split(source, \\)
53 57 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
54 58 target = $$replace(target, /, \\)
55 59 target ~= s,\\\\\\.?\\\\,\\,
56 60 !isEqual(source,$$target) {
57 61 !isEmpty(copyCommand):copyCommand += &&
58 62 isEqual(QMAKE_DIR_SEP, \\) {
59 63 copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
60 64 } else {
61 65 source = $$replace(source, \\\\, /)
62 66 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
63 67 target = $$replace(target, \\\\, /)
64 68 copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
65 69 }
66 70 }
67 71 }
68 72 !isEmpty(copyCommand) {
69 73 copyCommand = @echo Copying application data... && $$copyCommand
70 74 copydeploymentfolders.commands = $$copyCommand
71 75 first.depends = $(first) copydeploymentfolders
72 76 export(first.depends)
73 77 export(copydeploymentfolders.commands)
74 78 QMAKE_EXTRA_TARGETS += first copydeploymentfolders
75 79 }
76 80 } else:unix {
77 81 maemo5 {
78 82 desktopfile.files = $${TARGET}.desktop
79 83 desktopfile.path = /usr/share/applications/hildon
80 84 icon.files = $${TARGET}64.png
81 85 icon.path = /usr/share/icons/hicolor/64x64/apps
82 86 } else:!isEmpty(MEEGO_VERSION_MAJOR) {
83 87 desktopfile.files = $${TARGET}_harmattan.desktop
84 88 desktopfile.path = /usr/share/applications
85 89 icon.files = $${TARGET}80.png
86 90 icon.path = /usr/share/icons/hicolor/80x80/apps
87 91 } else { # Assumed to be a Desktop Unix
88 92 copyCommand =
89 93 for(deploymentfolder, DEPLOYMENTFOLDERS) {
90 94 source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
91 95 source = $$replace(source, \\\\, /)
92 96 macx {
93 97 target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
94 98 } else {
95 99 target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
96 100 }
97 101 target = $$replace(target, \\\\, /)
98 102 sourcePathSegments = $$split(source, /)
99 103 targetFullPath = $$target/$$last(sourcePathSegments)
100 104 targetFullPath ~= s,/\\.?/,/,
101 105 !isEqual(source,$$targetFullPath) {
102 106 !isEmpty(copyCommand):copyCommand += &&
103 107 copyCommand += $(MKDIR) \"$$target\"
104 108 copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
105 109 }
106 110 }
107 111 !isEmpty(copyCommand) {
108 112 copyCommand = @echo Copying application data... && $$copyCommand
109 113 copydeploymentfolders.commands = $$copyCommand
110 114 first.depends = $(first) copydeploymentfolders
111 115 export(first.depends)
112 116 export(copydeploymentfolders.commands)
113 117 QMAKE_EXTRA_TARGETS += first copydeploymentfolders
114 118 }
115 119 }
116 120 installPrefix = /opt/$${TARGET}
117 121 for(deploymentfolder, DEPLOYMENTFOLDERS) {
118 122 item = item$${deploymentfolder}
119 123 itemfiles = $${item}.files
120 124 $$itemfiles = $$eval($${deploymentfolder}.source)
121 125 itempath = $${item}.path
122 126 $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
123 127 export($$itemfiles)
124 128 export($$itempath)
125 129 INSTALLS += $$item
126 130 }
127 131
128 132 !isEmpty(desktopfile.path) {
129 133 export(icon.files)
130 134 export(icon.path)
131 135 export(desktopfile.files)
132 136 export(desktopfile.path)
133 137 INSTALLS += icon desktopfile
134 138 }
135 139
136 140 target.path = $${installPrefix}/bin
137 141 export(target.path)
138 142 INSTALLS += target
139 143 }
140 144
141 145 export (ICON)
142 146 export (INSTALLS)
143 147 export (DEPLOYMENT)
144 148 export (TARGET.EPOCHEAPSIZE)
145 149 export (TARGET.CAPABILITY)
146 150 export (LIBS)
147 151 export (QMAKE_EXTRA_TARGETS)
148 152 }
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,50 +1,54
1 1 !include( ../plugins.pri ) {
2 2 error( "Couldn't find the plugins.pri file!" )
3 3 }
4 4
5 5 TARGET = qtcommercialchartqml
6 QT += declarative
6 greaterThan(QT_MAJOR_VERSION, 4) {
7 QT += quick1
8 } else {
9 QT += declarative
10 }
7 11 DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
8 12 INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
9 13
10 14 CONFIG(debug, debug|release) {
11 15 mac: TARGET = $$join(TARGET,,,_debug)
12 16 win32: TARGET = $$join(TARGET,,,d)
13 17 }
14 18
15 19 SOURCES += \
16 20 plugin.cpp \
17 21 declarativechart.cpp \
18 22 declarativexypoint.cpp \
19 23 declarativexyseries.cpp \
20 24 declarativelineseries.cpp \
21 25 declarativesplineseries.cpp \
22 26 declarativeareaseries.cpp \
23 27 declarativescatterseries.cpp \
24 28 declarativepieseries.cpp \
25 29 declarativebarseries.cpp \
26 30 declarativecategoryaxis.cpp \
27 31 declarativemargins.cpp
28 32
29 33 HEADERS += \
30 34 declarativechart.h \
31 35 declarativexypoint.h \
32 36 declarativexyseries.h \
33 37 declarativelineseries.h \
34 38 declarativesplineseries.h \
35 39 declarativeareaseries.h \
36 40 declarativescatterseries.h \
37 41 declarativepieseries.h \
38 42 declarativebarseries.h \
39 43 declarativecategoryaxis.h \
40 44 declarativemargins.h
41 45
42 46 TARGETPATH = QtCommercial/Chart
43 47 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
44 48 qmldir.files += $$PWD/qmldir
45 49 qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
46 50 INSTALLS += target qmldir
47 51
48 52 FILE = $$PWD/qmldir
49 53 win32:{FILE = $$replace(FILE, "/","\\")}
50 54 QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_QML_PLUGIN_DIR
Show file before | Show file after | Hide comments
@@ -1,5 +1,9
1 1 !include( ../auto.pri ) {
2 2 error( "Couldn't find the auto.pri file!" )
3 3 }
4 4 SOURCES += tst_qml.cpp
5 QT += declarative
5 greaterThan(QT_MAJOR_VERSION, 4) {
6 QT += quick1
7 } else {
8 QT += declarative
9 }
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
Show file before | Show file after | Hide comments
@@ -1,13 +1,17
1 QT += declarative
1 greaterThan(QT_MAJOR_VERSION, 4) {
2 QT += quick1
3 } else {
4 QT += declarative
5 }
2 6
3 7 SOURCES += $$PWD/qmlapplicationviewer.cpp
4 8 HEADERS += $$PWD/qmlapplicationviewer.h
5 9 INCLUDEPATH += $$PWD
6 10
7 11 # Include JS debugger library if QMLJSDEBUGGER_PATH is set
8 12 !isEmpty(QMLJSDEBUGGER_PATH) {
9 13 include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
10 14 } else {
11 15 DEFINES -= QMLJSDEBUGGER
12 16 }
13 17
General Comments 0
You need to be logged in to leave comments. Login now