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

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

Made QmlChart demo instead of a test app
Tero Ahola -
r922:d40a04983d6a
parent child
Show More
Show file before | Show file after | Hide comments
@@ -3,7 +3,7
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS += src examples demos test qmlplugin
6 SUBDIRS += src qmlplugin examples demos test
7
7
8 integrated_build:{
8 integrated_build:{
9 message('Configured for integrated build against local libs...')
9 message('Configured for integrated build against local libs...')
Show file before | Show file after | Hide comments
@@ -1,4 +1,5
1 TEMPLATE = subdirs
1 TEMPLATE = subdirs
2 SUBDIRS += chartthemes \
2 SUBDIRS += chartthemes \
3 piechartcustomization \
3 piechartcustomization \
4 gdpbarchart
4 gdpbarchart \
5 qmlchart
Show file before | Show file after | Hide comments
@@ -1,5 +1,5
1 !include( ../demos.pri ) {
1 !include( ../demos.pri ) {
2 error( "Couldn't find the examples.pri file!" )
2 error( "Couldn't find the demos.pri file!" )
3 }
3 }
4 TARGET = piechartcustomization
4 TARGET = piechartcustomization
5 SOURCES += main.cpp \
5 SOURCES += main.cpp \
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/main.cpp to demos/qmlchart/main.cpp
NO CONTENT: file renamed from test/qmlchart/main.cpp to demos/qmlchart/main.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.cpp
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.h
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
NO CONTENT: file renamed from test/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri to demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri
Show file before | Show file after | Hide comments
@@ -1,5 +1,5
1 !include( ../test.pri ) {
1 !include( ../demos.pri ) {
2 error( "Couldn't find the common.pri file!" )
2 error( "Couldn't find the demos.pri file!" )
3 }
3 }
4
4
5 integrated_build:{
5 integrated_build:{
@@ -46,7 +46,3 SOURCES += main.cpp
46 # Please do not modify the following two lines. Required for deployment.
46 # Please do not modify the following two lines. Required for deployment.
47 include(qmlapplicationviewer/qmlapplicationviewer.pri)
47 include(qmlapplicationviewer/qmlapplicationviewer.pri)
48 qtcAddDeployment()
48 qtcAddDeployment()
49
50 #HEADERS += \
51 # chart.h
52
Show file before | Show file after | Hide comments
1 NO CONTENT: file renamed from test/qmlchart/qmlchart.svg to demos/qmlchart/qmlchart.svg
NO CONTENT: file renamed from test/qmlchart/qmlchart.svg to demos/qmlchart/qmlchart.svg
Show file before | Show file after | Hide comments
@@ -5,6 +5,5
5 <file>qml/qmlchart/View1.qml</file>
5 <file>qml/qmlchart/View1.qml</file>
6 <file>qml/qmlchart/View2.qml</file>
6 <file>qml/qmlchart/View2.qml</file>
7 <file>qml/qmlchart/View3.qml</file>
7 <file>qml/qmlchart/View3.qml</file>
8 <file>qml/qmlchart/View4.qml</file>
9 </qresource>
8 </qresource>
10 </RCC>
9 </RCC>
Show file before | Show file after | Hide comments
@@ -42,31 +42,31 integrated_build:{
42 CONFIG(debug, debug|release) {
42 CONFIG(debug, debug|release) {
43 CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
43 CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib
44 }
44 }
45 TARGET_PATH = ""
45 BIN_TARGET_PATH = ""
46 exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
46 exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
47 TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
47 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET
48 }
48 }
49 exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
49 exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) {
50 # Executable in test folder
50 # Executable in test folder
51 TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
51 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET
52 }
52 }
53 exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
53 exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) {
54 # Executable in test folder with custom target "tst_NNN"
54 # Executable in test folder with custom target "tst_NNN"
55 TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
55 BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET
56 }
56 }
57 exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
57 exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
58 # Plugin
58 # Plugin
59 TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
59 BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib"
60 }
60 }
61 !isEmpty (TARGET_PATH) {
61 !isEmpty (BIN_TARGET_PATH) {
62 QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$TARGET_PATH
62 QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH
63 #message($$QMAKE_POST_LINK)
63 message($$QMAKE_POST_LINK)
64 }
64 } else {
65
65 # Hack to make qml plugins available as internal build versions
66 # Hack to make qml plugins available as internal build versions
66 exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
67 exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
67 QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
68 QMAKE_POST_LINK += "& $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
68 message($$QMAKE_POST_LINK)
69 #message($$QMAKE_POST_LINK)
69 }
70 }
70 }
71 }
71 }
72
72
Show file before | Show file after | Hide comments
@@ -1,8 +1,7
1 TEMPLATE = subdirs
1 TEMPLATE = subdirs
2 SUBDIRS += \
2 SUBDIRS += \
3 chartwidgettest \
3 chartwidgettest \
4 wavechart \
4 wavechart
5 qmlchart
6
5
7 !win32:{
6 !win32:{
8 SUBDIRS += auto
7 SUBDIRS += auto
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed, binary diff hidden
NO CONTENT: file was removed, binary diff hidden
Show file before | Show file after | Hide comments
1 NO CONTENT: file was removed
NO CONTENT: file was removed
General Comments 0
You need to be logged in to leave comments. Login now