HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r1021:6adbaffea565

Simplfies default configuration

Michal Klocek -

r1021:6adbaffea565

parent child

Context file:

r1021:6adbaffea565

Collapse all files

charts.pro +3 -4

             !include(config.pri) {
                 error('Missing config.pri')
             }
             TEMPLATE = subdirs
             SUBDIRS = src qmlplugin examples demos test
             development_build: message('Development build')
-            local_build:{
+            !system_build:{
                 message('Configured for local build against local libs...')
-                message('You can run "make" to build qchart library, examples and demos...')
+                message('You can run "make" to build qchart library, examples, demos and plugin...')
+                message('You can run "make install" to install qchart in qt sdk...')
             } else {
                 message('Running build aginst system libs...')
                 message('Building only charts library...')
-                message('You can run "make install" to build and install charts.')
                 message('Afterwards you can run "cd examples; qmake ; make " to build examples.')
-                message('Run qmake CONFIG+=local_build' to build everything at once.)
                 SUBDIRS = src
             }
             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
             unix:QMAKE_DISTCLEAN += -r build bin include lib doc/html
             win32:QMAKE_DISTCLEAN += /Q /s build bin include lib doc\\html
             # install feature file
             feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
             feature.files = $$PWD/features/qtcommercialchart.prf
             INSTALLS += feature
             docs.target = docs
             win32:{
                 docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
             }else{
                 docs.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
             }
             docs.depends = FORCE
             QMAKE_EXTRA_TARGETS += docs

config.pri +70 -6

@@ -1,51 +1,115
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,"/")
6	temp = $$last(temp)	9	temp = $$last(temp)
7	path = $$replace(search,$$temp,'')	10	path = $$replace(search,$$temp,'')
8	temp = $$split(OUT_PWD,$$path)	11	temp = $$split(OUT_PWD,$$path)
9	temp = $$split(temp,'/')	12	temp = $$split(temp,'/')
10	temp = $$first(temp)	13	temp = $$first(temp)
11	path = "$${path}$${temp}"	14	path = "$${path}$${temp}"
12	SHADOW=$$path	15	SHADOW=$$path
13	}else{	16	}else{
14	SHADOW=$$PWD	17	SHADOW=$$PWD
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_LIB_DIR/QtCommercial/Chart	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: {
39	# TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on	42	# TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
40	# QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8	43	# QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
41	# without these definitions, so this is probably a configuration issue on QtCommercial 4.8;	44	# without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
42	# it should probably define the minimum OSX version to be 10.5...	45	# it should probably define the minimum OSX version to be 10.5...
43	QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5	46	QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
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
		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
51	} No newline at end of file	115	}

demos/demos.pri 0 -4

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
-            !include( ../build.pri ) {
-             error( "Couldn't find the build.pri file !")
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             TEMPLATE = app
             QT += core gui

demos/demos.pro 0 -4

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
-            !include( ../build.pri ) {
-             error( "Couldn't find the build.pri file !")
             TEMPLATE = subdirs
             SUBDIRS += chartthemes \
                        piechartcustomization \
                        qmlchart \
                        dynamicspline

demos/qmlchart/qmlapplicationviewer/qmlapplicationviewer.pri 0 -133

@@ -1,146 +1,13
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
11	HEADERS += $$PWD/qmlapplicationviewer.h	4	HEADERS += $$PWD/qmlapplicationviewer.h
12	INCLUDEPATH += $$PWD	5	INCLUDEPATH += $$PWD
13		6
14	# Include JS debugger library if QMLJSDEBUGGER_PATH is set	7	# Include JS debugger library if QMLJSDEBUGGER_PATH is set
15	!isEmpty(QMLJSDEBUGGER_PATH) {	8	!isEmpty(QMLJSDEBUGGER_PATH) {
16	include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)	9	include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
17	} else {	10	} else {
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	}

demos/qmlchart/qmlchart.pro +2 -41

@@ -1,48 +1,9
1	!include( ../demos.pri ) {	1	!include( ../demos.pri ) {
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

examples/examples.pri 0 -4

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
-            !include( ../build.pri ) {
-             error( "Couldn't find the build.pri file !")
             DESTDIR = $$CHART_BUILD_BIN_DIR
             OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
             TEMPLATE = app
             QT += core gui

examples/examples.pro 0 -4

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
-            !include( ../build.pri ) {
-             error( "Couldn't find the build.pri file !")
             TEMPLATE = subdirs
             SUBDIRS += \
                        areachart \
                        barchart \
                        customchart \
                        linechart \
                        percentbarchart \
                        piechart \
                        piechartdrilldown \
                        presenterchart \
                        scatterchart \
                        scatterinteractions \
                        splinechart \
                        stackedbarchart \
                        stackedbarchartdrilldown \
                        zoomlinechart \
                        modeldata

qmlplugin/qmlplugin.pro +14 -5

             TEMPLATE = lib
             TARGET = qtcommercialchartqml
             CONFIG += qt plugin
             QT += declarative
             !include( ../config.pri ) {
-                error( "Couldn't find the common.pri file!" )
+                error( "Couldn't find the config.pri file!" )
-            !include( ../build.pri ) {
-                error( "Couldn't find the build.pri file !")
             }
             DESTDIR = $$CHART_BUILD_PLUGIN_DIR
             contains(QT_MAJOR_VERSION, 5) {
                 # TODO: QtQuick2 not supported by the implementation currently
                 DEFINES += QTQUICK2
             }
             OBJECTS_DIR = $$CHART_BUILD_DIR/plugin
             MOC_DIR = $$CHART_BUILD_DIR/plugin
             UI_DIR = $$CHART_BUILD_DIR/plugin
             RCC_DIR = $$CHART_BUILD_DIR/plugin
             SOURCES += \
                 plugin.cpp \
                 declarativechart.cpp \
                 declarativexyseries.cpp \
                 declarativexypoint.cpp \
                 declarativelineseries.cpp \
                 declarativesplineseries.cpp \
                 declarativeareaseries.cpp \
                 declarativescatterseries.cpp \
                 declarativepieseries.cpp \
                 declarativebarseries.cpp
             HEADERS += \
                 declarativechart.h \
                 declarativexyseries.h \
                 declarativexypoint.h \
                 declarativelineseries.h \
                 declarativesplineseries.h \
                 declarativeareaseries.h \
                 declarativescatterseries.h \
                 declarativepieseries.h \
                 declarativebarseries.h
             TARGETPATH = QtCommercial/Chart
             target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             qmldir.files += $$PWD/qmldir
             qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
             INSTALLS += target qmldir
+            !mac {
+                FILE = $$PWD/qmldir
+                win32:{FILE = $$replace(FILE, "/","\\")}
+                QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR
+            }else{
+                 # Hack to make qml plugins available as internal build versions
+                exists($$CHART_BUILD_PLUGIN_DIR"/lib"$$TARGET".dylib") {
+                QMAKE_POST_LINK += " & $$QMAKE_COPY qmldir $$CHART_BUILD_PLUGIN_DIR"
+                }
+            }

src/src.pro +12 -5

             !include( ../config.pri ):error( Couldn't find the config.pri file! )
-            TARGET = QtCommercialChart
+            TARGET = $$LIBRARY_NAME
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
-            QT += core \
+            QT = core gui
-                gui
             win32-msvc*: LIBS += User32.lib
-            CONFIG += debug_and_release
-            CONFIG(debug, debug|release):TARGET = QtCommercialChartd
+            CONFIG(debug, debug|release) {
+                 mac: TARGET = $$join(TARGET,,,_debug)
+                 win32: TARGET = $$join(TARGET,,d)
+            }
+            LIBS -= -l$$LIBRARY_NAME
             SOURCES += \
                 $$PWD/chartdataset.cpp \
                 $$PWD/chartpresenter.cpp \
                 $$PWD/charttheme.cpp \
                 $$PWD/domain.cpp \
                 $$PWD/qchart.cpp \
                 $$PWD/qchartview.cpp \
                 $$PWD/qabstractseries.cpp \
                 $$PWD/chartbackground.cpp \
                 $$PWD/chart.cpp \
                 $$PWD/scroller.cpp
             PRIVATE_HEADERS += \
                 $$PWD/chartdataset_p.h \
                 $$PWD/chartitem_p.h \
                 $$PWD/chartpresenter_p.h \
                 $$PWD/charttheme_p.h \
                 $$PWD/domain_p.h \
                 $$PWD/chartbackground_p.h \
                 $$PWD/chart_p.h \
                 $$PWD/chartconfig_p.h \
                 $$PWD/qchart_p.h \
                 $$PWD/qchartview_p.h \
                 $$PWD/scroller_p.h \
                 $$PWD/qabstractseries_p.h
             PUBLIC_HEADERS += \
                 $$PWD/qchart.h \
                 $$PWD/qchartglobal.h \
                 $$PWD/qabstractseries.h \
                 $$PWD/qchartview.h
             include(animations/animations.pri)
             include(areachart/areachart.pri)
             include(axis/axis.pri)
             include(barchart/barchart.pri)
             include(legend/legend.pri)
             include(linechart/linechart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
             include(themes/themes.pri)
             include(xychart/xychart.pri)
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += ../include .
             OBJECTS_DIR = $$CHART_BUILD_DIR/lib
             MOC_DIR = $$CHART_BUILD_DIR/lib
             UI_DIR = $$CHART_BUILD_DIR/lib
             RCC_DIR = $$CHART_BUILD_DIR/lib
             DEFINES += QTCOMMERCIALCHART_LIBRARY
             #qt public headers
             #this is very primitive and lame parser , TODO: make perl script insted
             !exists($$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal)
             {
                 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
                  win32:{
                     command = "echo $${LITERAL_HASH}include \"qchartglobal.h\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"qchartglobal.h\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/QChartGlobal
                 system($$command)
             }
             for(file, PUBLIC_HEADERS) {
                 name = $$split(file,'/')
                 name = $$last(name)
                 class = "$$cat($$file)"
                 class = $$find(class,class)
                 !isEmpty(class){
                 class = $$split(class,QTCOMMERCIALCHART_EXPORT)
                 class = $$member(class,1)
                 class = $$split(class,' ')
                 class = $$replace(class,' ','')
                 class = $$member(class,0)
                 win32:{
                     command = "echo $${LITERAL_HASH}include \"$$name\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }else{
                     command = "echo \"$${LITERAL_HASH}include \\\"$$name\\\"\" > $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class"
                 }
                 PUBLIC_QT_HEADERS += $$CHART_BUILD_PUBLIC_HEADER_DIR/$$class
                 system($$command)
                 }
             }
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS $$PUBLIC_QT_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target public_headers
             install_build_public_headers.name = build_public_headers
             install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_public_headers.input = PUBLIC_HEADERS
             install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PUBLIC_HEADER_DIR
             install_build_public_headers.CONFIG += target_predeps \
                 no_link
             install_build_private_headers.name = buld_private_headers
             install_build_private_headers.output = $$CHART_BUILD_PRIVATE_HEADER_DIR/${QMAKE_FILE_BASE}.h
             install_build_private_headers.input = PRIVATE_HEADERS
             install_build_private_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
                 $$CHART_BUILD_PRIVATE_HEADER_DIR
             install_build_private_headers.CONFIG += target_predeps \
                 no_link
             QMAKE_EXTRA_COMPILERS += install_build_public_headers \
                 install_build_private_headers \
             # There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
             # This is the case at least with shadow builds.
             # http://qt-project.org/wiki/jom
             development_build:!win32-msvc*:{
                 chartversion.target = $$PWD/qchartversion_p.h
                 unix:{
                     chartversion.commands = @echo \
                         \" $${LITERAL_HASH}ifndef QCHARTVERSION_P_H\\n\
                         $${LITERAL_HASH}define QCHARTVERSION_P_H\\n\
                         const char *buildTime = \\\"`date +'%y%m%d%H%M'`\\\" ; \\n\
                         const char *gitHead = \\\"`git rev-parse HEAD`\\\" ; \\n \
                         $${LITERAL_HASH}endif \"  \
                         > \
                         $$chartversion.target;
                 }else{
                     chartversion.commands = @echo \
                         "const char *buildTime = \"%date%_%time%\" ; \
                          const char *gitHead = \"unknown\" ; " \
                         > \
                         $$chartversion.target
                 }
                 chartversion.depends = $$HEADERS \
                     $$SOURCES
                 PRE_TARGETDEPS += $$chartversion.target
                 QMAKE_CLEAN += $$PWD/qchartversion_p.h
                 QMAKE_EXTRA_TARGETS += chartversion
             }
             unix:QMAKE_DISTCLEAN += -r \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             win32:QMAKE_DISTCLEAN += /Q \
                 $$CHART_BUILD_HEADER_DIR \
                 $$CHART_BUILD_LIB_DIR
             # treat warnings as errors
             win32-msvc*: {
                 QMAKE_CXXFLAGS += /WX
             } else {
                 QMAKE_CXXFLAGS += -Werror
             }

test/test.pri 0 -3

             !include( ../config.pri ) {
                 error( "Couldn't find the config.pri file!" )
             }
-            !include( ../build.pri ) {
-                error( "Couldn't find the build.pri file !")
             TEMPLATE = app
             DESTDIR = $$CHART_BUILD_BIN_DIR/test
             OBJECTS_DIR = $$CHART_BUILD_DIR/test/$$TARGET
             MOC_DIR = $$CHART_BUILD_DIR/test/$$TARGET
             UI_DIR = $$CHART_BUILD_DIR/test/$$TARGET
             RCC_DIR = $$CHART_BUILD_DIR/test/$$TARGET

test/test.pro 0 -4

             !include( ../config.pri ) {
              error( "Couldn't find the config.pri file!" )
             }
-            !include( ../build.pri ) {
-             error( "Couldn't find the build.pri file !")
             TEMPLATE = subdirs
             SUBDIRS += \
                 chartwidgettest \
                 wavechart \
                 gdpbarchart \
                 tablemodelchart
             !win32:{
                 SUBDIRS += auto
             }

build.pri removed 0 -75

NO CONTENT: file was removed

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages