@@ -7,15 +7,14 SUBDIRS = src qmlplugin examples demos test | |||||
7 |
|
7 | |||
8 | development_build: message('Development build') |
|
8 | development_build: message('Development build') | |
9 |
|
9 | |||
10 | local_build:{ |
|
10 | !system_build:{ | |
11 | message('Configured for local build against local libs...') |
|
11 | message('Configured for local build against local libs...') | |
12 |
message('You can run "make" to build qchart library, examples |
|
12 | message('You can run "make" to build qchart library, examples, demos and plugin...') | |
|
13 | message('You can run "make install" to install qchart in qt sdk...') | |||
13 | } else { |
|
14 | } else { | |
14 | message('Running build aginst system libs...') |
|
15 | message('Running build aginst system libs...') | |
15 | message('Building only charts library...') |
|
16 | message('Building only charts library...') | |
16 | message('You can run "make install" to build and install charts.') |
|
|||
17 | message('Afterwards you can run "cd examples; qmake ; make " to build examples.') |
|
17 | message('Afterwards you can run "cd examples; qmake ; make " to build examples.') | |
18 | message('Run qmake CONFIG+=local_build' to build everything at once.) |
|
|||
19 | SUBDIRS = src |
|
18 | SUBDIRS = src | |
20 | } |
|
19 | } | |
21 |
|
20 |
@@ -1,5 +1,8 | |||||
1 |
|
1 | |||
2 | #check if shadow build |
|
2 | LIBRARY_NAME = QtCommercialChart | |
|
3 | ||||
|
4 | ##################### SHADOW CONFIG ################################################# | |||
|
5 | ||||
3 | !contains($${PWD}, $${OUT_PWD}){ |
|
6 | !contains($${PWD}, $${OUT_PWD}){ | |
4 | search = "$$PWD:::" |
|
7 | search = "$$PWD:::" | |
5 | temp = $$split(search,"/") |
|
8 | temp = $$split(search,"/") | |
@@ -15,24 +18,24 | |||||
15 | CONFIG-=development_build |
|
18 | CONFIG-=development_build | |
16 | } |
|
19 | } | |
17 |
|
20 | |||
|
21 | ##################### BUILD PATHS ################################################## | |||
|
22 | ||||
18 | CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include |
|
23 | CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include | |
19 | CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private |
|
24 | CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private | |
20 | CHART_BUILD_LIB_DIR = $$SHADOW/lib |
|
25 | CHART_BUILD_LIB_DIR = $$SHADOW/lib | |
21 | CHART_BUILD_DIR = $$SHADOW/build |
|
26 | CHART_BUILD_DIR = $$SHADOW/build | |
22 | CHART_BUILD_BIN_DIR = $$SHADOW/bin |
|
27 | CHART_BUILD_BIN_DIR = $$SHADOW/bin | |
23 |
CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_ |
|
28 | CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart | |
24 | CHART_BUILD_DOC_DIR = $$SHADOW/doc |
|
29 | CHART_BUILD_DOC_DIR = $$SHADOW/doc | |
25 |
|
30 | |||
26 |
|
||||
27 | # hack to fix windows builds |
|
|||
28 | win32:{ |
|
31 | win32:{ | |
29 | CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\") |
|
32 | CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\") | |
30 | CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\") |
|
33 | CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\") | |
31 | CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\") |
|
|||
32 | CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") |
|
34 | CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\") | |
33 | CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") |
|
35 | CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\") | |
34 | CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\") |
|
36 | CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\") | |
35 | CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\") |
|
37 | CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\") | |
|
38 | CHART_BUILD_LIB_DIR = CHART_BUILD_BIN_DIR | |||
36 | } |
|
39 | } | |
37 |
|
40 | |||
38 | mac: { |
|
41 | mac: { | |
@@ -44,8 +47,69 mac: { | |||||
44 | QMAKE_LFLAGS *= -mmacosx-version-min=10.5 |
|
47 | QMAKE_LFLAGS *= -mmacosx-version-min=10.5 | |
45 | } |
|
48 | } | |
46 |
|
49 | |||
|
50 | ##################### DEVELOPMENT BUILD ################################################### | |||
|
51 | ||||
47 | development_build: { |
|
52 | development_build: { | |
48 | DEFINES+=DEVELOPMENT_BUILD |
|
53 | DEFINES+=DEVELOPMENT_BUILD | |
49 | CONFIG+=local_build |
|
|||
50 | CONFIG+=debug_and_release |
|
54 | CONFIG+=debug_and_release | |
51 | } |
|
55 | } | |
|
56 | ||||
|
57 | ||||
|
58 | ##################### BUILD CONFIG ######################################################## | |||
|
59 | ||||
|
60 | !system_build:{ | |||
|
61 | ||||
|
62 | INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR | |||
|
63 | ||||
|
64 | !win32: { | |||
|
65 | LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR | |||
|
66 | }else{ | |||
|
67 | win32-msvc*: { | |||
|
68 | # hack fix for error: | |||
|
69 | # "LINK : fatal error LNK1146: no argument specified with option '/LIBPATH:'" | |||
|
70 | QMAKE_LIBDIR += $$CHART_BUILD_LIB_DIR | |||
|
71 | }else{ | |||
|
72 | LIBS += -L $$CHART_BUILD_LIB_DIR | |||
|
73 | } | |||
|
74 | } | |||
|
75 | ||||
|
76 | CONFIG(debug, debug|release) { | |||
|
77 | mac: LIBRARY_NAME = $$join(LIBRARY_NAME,,,_debug) | |||
|
78 | win32: LIBRARY_NAME = $$join(LIBRARY_NAME,,,d) | |||
|
79 | } | |||
|
80 | ||||
|
81 | LIBS += -l$$LIBRARY_NAME | |||
|
82 | ||||
|
83 | ||||
|
84 | mac: { | |||
|
85 | # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX | |||
|
86 | CHARTS_LIB_NAME = libQtCommercialChart.1.dylib | |||
|
87 | CONFIG(debug, debug|release) { | |||
|
88 | CHARTS_LIB_NAME = libQtCommercialChartd.1.dylib | |||
|
89 | } | |||
|
90 | BIN_TARGET_PATH = "" | |||
|
91 | exists ($$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |||
|
92 | BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/"$$TARGET".app/Contents/MacOS/"$$TARGET | |||
|
93 | } | |||
|
94 | exists ($$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET) { | |||
|
95 | # Executable in test folder | |||
|
96 | BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/"$$TARGET".app/Contents/MacOS/"$$TARGET | |||
|
97 | } | |||
|
98 | exists ($$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET) { | |||
|
99 | # Executable in test folder with custom target "tst_NNN" | |||
|
100 | BIN_TARGET_PATH = $$CHART_BUILD_BIN_DIR"/test/tst_"$$TARGET".app/Contents/MacOS/tst_"$$TARGET | |||
|
101 | } | |||
|
102 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { | |||
|
103 | # Plugin | |||
|
104 | BIN_TARGET_PATH = $$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib" | |||
|
105 | } | |||
|
106 | !isEmpty (BIN_TARGET_PATH) { | |||
|
107 | QMAKE_POST_LINK += install_name_tool -change $$CHARTS_LIB_NAME $$CHART_BUILD_LIB_DIR"/"$$CHARTS_LIB_NAME $$BIN_TARGET_PATH | |||
|
108 | } | |||
|
109 | } | |||
|
110 | ||||
|
111 | }else { | |||
|
112 | ||||
|
113 | CONFIG += qtcommercialchart | |||
|
114 | ||||
|
115 | } No newline at end of file |
@@ -2,10 +2,6 | |||||
2 | error( "Couldn't find the config.pri file!" ) |
|
2 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../build.pri ) { |
|
|||
6 | error( "Couldn't find the build.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | DESTDIR = $$CHART_BUILD_BIN_DIR |
|
5 | DESTDIR = $$CHART_BUILD_BIN_DIR | |
10 | OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET |
|
6 | OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET | |
11 | MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET |
|
7 | MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET |
@@ -2,10 +2,6 | |||||
2 | error( "Couldn't find the config.pri file!" ) |
|
2 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../build.pri ) { |
|
|||
6 | error( "Couldn't find the build.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TEMPLATE = subdirs |
|
5 | TEMPLATE = subdirs | |
10 | SUBDIRS += chartthemes \ |
|
6 | SUBDIRS += chartthemes \ | |
11 | piechartcustomization \ |
|
7 | piechartcustomization \ |
@@ -1,10 +1,3 | |||||
1 | # checksum 0x368d version 0x60010 |
|
|||
2 | # This file was generated by the Qt Quick Application wizard of Qt Creator. |
|
|||
3 | # The code below adds the QmlApplicationViewer to the project and handles the |
|
|||
4 | # activation of QML debugging. |
|
|||
5 | # It is recommended not to modify this file, since newer versions of Qt Creator |
|
|||
6 | # may offer an updated version of it. |
|
|||
7 |
|
||||
8 | QT += declarative |
|
1 | QT += declarative | |
9 |
|
2 | |||
10 | SOURCES += $$PWD/qmlapplicationviewer.cpp |
|
3 | SOURCES += $$PWD/qmlapplicationviewer.cpp | |
@@ -18,129 +11,3 INCLUDEPATH += $$PWD | |||||
18 | DEFINES -= QMLJSDEBUGGER |
|
11 | DEFINES -= QMLJSDEBUGGER | |
19 | } |
|
12 | } | |
20 |
|
13 | |||
21 | contains(CONFIG,qdeclarative-boostable):contains(MEEGO_EDITION,harmattan) { |
|
|||
22 | DEFINES += HARMATTAN_BOOSTER |
|
|||
23 | } |
|
|||
24 | # This file was generated by an application wizard of Qt Creator. |
|
|||
25 | # The code below handles deployment to Symbian and Maemo, aswell as copying |
|
|||
26 | # of the application data to shadow build directories on desktop. |
|
|||
27 | # It is recommended not to modify this file, since newer versions of Qt Creator |
|
|||
28 | # may offer an updated version of it. |
|
|||
29 |
|
||||
30 | defineTest(qtcAddDeployment) { |
|
|||
31 | for(deploymentfolder, DEPLOYMENTFOLDERS) { |
|
|||
32 | item = item$${deploymentfolder} |
|
|||
33 | itemsources = $${item}.sources |
|
|||
34 | $$itemsources = $$eval($${deploymentfolder}.source) |
|
|||
35 | itempath = $${item}.path |
|
|||
36 | $$itempath= $$eval($${deploymentfolder}.target) |
|
|||
37 | export($$itemsources) |
|
|||
38 | export($$itempath) |
|
|||
39 | DEPLOYMENT += $$item |
|
|||
40 | } |
|
|||
41 |
|
||||
42 | MAINPROFILEPWD = $$PWD |
|
|||
43 |
|
||||
44 | symbian { |
|
|||
45 | isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg |
|
|||
46 | isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000 |
|
|||
47 | } else:win32 { |
|
|||
48 | copyCommand = |
|
|||
49 | for(deploymentfolder, DEPLOYMENTFOLDERS) { |
|
|||
50 | source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) |
|
|||
51 | source = $$replace(source, /, \\) |
|
|||
52 | sourcePathSegments = $$split(source, \\) |
|
|||
53 | target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments) |
|
|||
54 | target = $$replace(target, /, \\) |
|
|||
55 | !isEqual(source,$$target) { |
|
|||
56 | !isEmpty(copyCommand):copyCommand += && |
|
|||
57 | isEqual(QMAKE_DIR_SEP, \\) { |
|
|||
58 | copyCommand += $(COPY_DIR) \"$$source\" \"$$target\" |
|
|||
59 | } else { |
|
|||
60 | source = $$replace(source, \\\\, /) |
|
|||
61 | target = $$OUT_PWD/$$eval($${deploymentfolder}.target) |
|
|||
62 | target = $$replace(target, \\\\, /) |
|
|||
63 | copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\" |
|
|||
64 | } |
|
|||
65 | } |
|
|||
66 | } |
|
|||
67 | !isEmpty(copyCommand) { |
|
|||
68 | copyCommand = @echo Copying application data... && $$copyCommand |
|
|||
69 | copydeploymentfolders.commands = $$copyCommand |
|
|||
70 | first.depends = $(first) copydeploymentfolders |
|
|||
71 | export(first.depends) |
|
|||
72 | export(copydeploymentfolders.commands) |
|
|||
73 | QMAKE_EXTRA_TARGETS += first copydeploymentfolders |
|
|||
74 | } |
|
|||
75 | } else:unix { |
|
|||
76 | maemo5 { |
|
|||
77 | desktopfile.files = $${TARGET}.desktop |
|
|||
78 | desktopfile.path = /usr/share/applications/hildon |
|
|||
79 | icon.files = $${TARGET}64.png |
|
|||
80 | icon.path = /usr/share/icons/hicolor/64x64/apps |
|
|||
81 | } else:!isEmpty(MEEGO_VERSION_MAJOR) { |
|
|||
82 | desktopfile.files = $${TARGET}_harmattan.desktop |
|
|||
83 | desktopfile.path = /usr/share/applications |
|
|||
84 | icon.files = $${TARGET}80.png |
|
|||
85 | icon.path = /usr/share/icons/hicolor/80x80/apps |
|
|||
86 | } else { # Assumed to be a Desktop Unix |
|
|||
87 | copyCommand = |
|
|||
88 | for(deploymentfolder, DEPLOYMENTFOLDERS) { |
|
|||
89 | source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source) |
|
|||
90 | source = $$replace(source, \\\\, /) |
|
|||
91 | macx { |
|
|||
92 | target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target) |
|
|||
93 | } else { |
|
|||
94 | target = $$OUT_PWD/$$eval($${deploymentfolder}.target) |
|
|||
95 | } |
|
|||
96 | target = $$replace(target, \\\\, /) |
|
|||
97 | sourcePathSegments = $$split(source, /) |
|
|||
98 | targetFullPath = $$target/$$last(sourcePathSegments) |
|
|||
99 | !isEqual(source,$$targetFullPath) { |
|
|||
100 | !isEmpty(copyCommand):copyCommand += && |
|
|||
101 | copyCommand += $(MKDIR) \"$$target\" |
|
|||
102 | copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\" |
|
|||
103 | } |
|
|||
104 | } |
|
|||
105 | !isEmpty(copyCommand) { |
|
|||
106 | copyCommand = @echo Copying application data... && $$copyCommand |
|
|||
107 | copydeploymentfolders.commands = $$copyCommand |
|
|||
108 | first.depends = $(first) copydeploymentfolders |
|
|||
109 | export(first.depends) |
|
|||
110 | export(copydeploymentfolders.commands) |
|
|||
111 | QMAKE_EXTRA_TARGETS += first copydeploymentfolders |
|
|||
112 | } |
|
|||
113 | } |
|
|||
114 | installPrefix = /opt/$${TARGET} |
|
|||
115 | for(deploymentfolder, DEPLOYMENTFOLDERS) { |
|
|||
116 | item = item$${deploymentfolder} |
|
|||
117 | itemfiles = $${item}.files |
|
|||
118 | $$itemfiles = $$eval($${deploymentfolder}.source) |
|
|||
119 | itempath = $${item}.path |
|
|||
120 | $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target) |
|
|||
121 | export($$itemfiles) |
|
|||
122 | export($$itempath) |
|
|||
123 | INSTALLS += $$item |
|
|||
124 | } |
|
|||
125 |
|
||||
126 | !isEmpty(desktopfile.path) { |
|
|||
127 | export(icon.files) |
|
|||
128 | export(icon.path) |
|
|||
129 | export(desktopfile.files) |
|
|||
130 | export(desktopfile.path) |
|
|||
131 | INSTALLS += icon desktopfile |
|
|||
132 | } |
|
|||
133 |
|
||||
134 | target.path = $${installPrefix}/bin |
|
|||
135 | export(target.path) |
|
|||
136 | INSTALLS += target |
|
|||
137 | } |
|
|||
138 |
|
||||
139 | export (ICON) |
|
|||
140 | export (INSTALLS) |
|
|||
141 | export (DEPLOYMENT) |
|
|||
142 | export (TARGET.EPOCHEAPSIZE) |
|
|||
143 | export (TARGET.CAPABILITY) |
|
|||
144 | export (LIBS) |
|
|||
145 | export (QMAKE_EXTRA_TARGETS) |
|
|||
146 | } |
|
@@ -2,47 +2,8 | |||||
2 | error( "Couldn't find the demos.pri file!" ) |
|
2 | error( "Couldn't find the demos.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | integrated_build:{ |
|
5 | RESOURCES += resources.qrc | |
6 | message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR) |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | RESOURCES += \ |
|
|||
10 | resources.qrc |
|
|||
11 |
|
||||
12 | # Add more folders to ship with the application, here |
|
|||
13 | folder_01.source = qml/qmlchart |
|
|||
14 | folder_01.target = qml |
|
|||
15 | DEPLOYMENTFOLDERS = folder_01 |
|
|||
16 |
|
||||
17 | # Additional import path used to resolve QML modules in Creator's code model |
|
|||
18 | QML_IMPORT_PATH = |
|
|||
19 |
|
||||
20 | symbian:TARGET.UID3 = 0xE421236E |
|
|||
21 |
|
||||
22 | # Smart Installer package's UID |
|
|||
23 | # This UID is from the protected range and therefore the package will |
|
|||
24 | # fail to install if self-signed. By default qmake uses the unprotected |
|
|||
25 | # range value if unprotected UID is defined for the application and |
|
|||
26 | # 0x2002CCCF value if protected UID is given to the application |
|
|||
27 | #symbian:DEPLOYMENT.installer_header = 0x2002CCCF |
|
|||
28 |
|
||||
29 | # Allow network access on Symbian |
|
|||
30 | symbian:TARGET.CAPABILITY += NetworkServices |
|
|||
31 |
|
||||
32 | # If your application uses the Qt Mobility libraries, uncomment the following |
|
|||
33 | # lines and add the respective components to the MOBILITY variable. |
|
|||
34 | # CONFIG += mobility |
|
|||
35 | # MOBILITY += |
|
|||
36 |
|
||||
37 | # Speed up launching on MeeGo/Harmattan when using applauncherd daemon |
|
|||
38 | # CONFIG += qdeclarative-boostable |
|
|||
39 |
|
||||
40 | # Add dependency to Symbian components |
|
|||
41 | # CONFIG += qt-components |
|
|||
42 |
|
||||
43 | # The .cpp file which was generated for your project. Feel free to hack it. |
|
|||
44 | SOURCES += main.cpp |
|
6 | SOURCES += main.cpp | |
45 |
|
7 | |||
46 | # Please do not modify the following two lines. Required for deployment. |
|
|||
47 | include(qmlapplicationviewer/qmlapplicationviewer.pri) |
|
8 | include(qmlapplicationviewer/qmlapplicationviewer.pri) | |
48 | qtcAddDeployment() |
|
9 |
@@ -2,10 +2,6 | |||||
2 | error( "Couldn't find the config.pri file!" ) |
|
2 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../build.pri ) { |
|
|||
6 | error( "Couldn't find the build.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | DESTDIR = $$CHART_BUILD_BIN_DIR |
|
5 | DESTDIR = $$CHART_BUILD_BIN_DIR | |
10 | OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET |
|
6 | OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET | |
11 | MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET |
|
7 | MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET |
@@ -2,10 +2,6 | |||||
2 | error( "Couldn't find the config.pri file!" ) |
|
2 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../build.pri ) { |
|
|||
6 | error( "Couldn't find the build.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TEMPLATE = subdirs |
|
5 | TEMPLATE = subdirs | |
10 | SUBDIRS += \ |
|
6 | SUBDIRS += \ | |
11 | areachart \ |
|
7 | areachart \ |
@@ -4,10 +4,7 CONFIG += qt plugin | |||||
4 | QT += declarative |
|
4 | QT += declarative | |
5 |
|
5 | |||
6 | !include( ../config.pri ) { |
|
6 | !include( ../config.pri ) { | |
7 |
error( "Couldn't find the co |
|
7 | error( "Couldn't find the config.pri file!" ) | |
8 | } |
|
|||
9 | !include( ../build.pri ) { |
|
|||
10 | error( "Couldn't find the build.pri file !") |
|
|||
11 | } |
|
8 | } | |
12 |
|
9 | |||
13 | DESTDIR = $$CHART_BUILD_PLUGIN_DIR |
|
10 | DESTDIR = $$CHART_BUILD_PLUGIN_DIR | |
@@ -47,5 +44,17 TARGETPATH = QtCommercial/Chart | |||||
47 | target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH |
|
44 | target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH | |
48 | qmldir.files += $$PWD/qmldir |
|
45 | qmldir.files += $$PWD/qmldir | |
49 | qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH |
|
46 | qmldir.path += $$[QT_INSTALL_IMPORTS]/$$TARGETPATH | |
50 |
|
||||
51 | INSTALLS += target qmldir |
|
47 | INSTALLS += target qmldir | |
|
48 | ||||
|
49 | !mac { | |||
|
50 | FILE = $$PWD/qmldir | |||
|
51 | win32:{FILE = $$replace(FILE, "/","\\")} | |||
|
52 | QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR | |||
|
53 | }else{ | |||
|
54 | # Hack to make qml plugins available as internal build versions | |||
|
55 | exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") { | |||
|
56 | QMAKE_POST_LINK += " & $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR" | |||
|
57 | } | |||
|
58 | } | |||
|
59 | ||||
|
60 |
@@ -1,12 +1,19 | |||||
1 | !include( ../config.pri ):error( Couldn't find the config.pri file! ) |
|
1 | !include( ../config.pri ):error( Couldn't find the config.pri file! ) | |
2 | TARGET = QtCommercialChart |
|
2 | ||
|
3 | TARGET = $$LIBRARY_NAME | |||
3 | DESTDIR = $$CHART_BUILD_LIB_DIR |
|
4 | DESTDIR = $$CHART_BUILD_LIB_DIR | |
4 | TEMPLATE = lib |
|
5 | TEMPLATE = lib | |
5 |
QT |
|
6 | QT = core gui | |
6 | gui |
|
7 | ||
7 | win32-msvc*: LIBS += User32.lib |
|
8 | win32-msvc*: LIBS += User32.lib | |
8 | CONFIG += debug_and_release |
|
9 | ||
9 |
CONFIG(debug, debug|release) |
|
10 | CONFIG(debug, debug|release) { | |
|
11 | mac: TARGET = $$join(TARGET,,,_debug) | |||
|
12 | win32: TARGET = $$join(TARGET,,d) | |||
|
13 | } | |||
|
14 | ||||
|
15 | LIBS -= -l$$LIBRARY_NAME | |||
|
16 | ||||
10 | SOURCES += \ |
|
17 | SOURCES += \ | |
11 | $$PWD/chartdataset.cpp \ |
|
18 | $$PWD/chartdataset.cpp \ | |
12 | $$PWD/chartpresenter.cpp \ |
|
19 | $$PWD/chartpresenter.cpp \ |
@@ -1,9 +1,6 | |||||
1 | !include( ../config.pri ) { |
|
1 | !include( ../config.pri ) { | |
2 | error( "Couldn't find the config.pri file!" ) |
|
2 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
3 | } | |
4 | !include( ../build.pri ) { |
|
|||
5 | error( "Couldn't find the build.pri file !") |
|
|||
6 | } |
|
|||
7 |
|
4 | |||
8 | TEMPLATE = app |
|
5 | TEMPLATE = app | |
9 |
|
6 |
@@ -2,10 +2,6 | |||||
2 | error( "Couldn't find the config.pri file!" ) |
|
2 | error( "Couldn't find the config.pri file!" ) | |
3 | } |
|
3 | } | |
4 |
|
4 | |||
5 | !include( ../build.pri ) { |
|
|||
6 | error( "Couldn't find the build.pri file !") |
|
|||
7 | } |
|
|||
8 |
|
||||
9 | TEMPLATE = subdirs |
|
5 | TEMPLATE = subdirs | |
10 | SUBDIRS += \ |
|
6 | SUBDIRS += \ | |
11 | chartwidgettest \ |
|
7 | chartwidgettest \ |
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