HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r708:69e7126c2380

src/themes/themes.pri created 644 +12 0

@@ -0,0 +1,12
	1	INCLUDEPATH += $$PWD
	2	DEPENDPATH += $$PWD
	3
	4	THEMES += \
	5	$$PWD/chartthemedefault_p.h \
	6	$$PWD/chartthemelight_p.h \
	7	$$PWD/chartthemebluecerulean_p.h \
	8	$$PWD/chartthemedark_p.h \
	9	$$PWD/chartthemebrownsand_p.h \
	10	$$PWD/chartthemebluencs_p.h \
	11	$$PWD/chartthemeicy_p.h \
	12	$$PWD/chartthemescientific_p.h No newline at end of file

charts.pro +3 -1

             }else{
                 doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
             }
             doc.depends = FORCE
-            QMAKE_EXTRA_TARGETS += doc
+            QMAKE_EXTRA_TARGETS += docs

common.pri +20 -5

@@ -1,12 +1,27
1	CONFIG+=integrated_build #remove if you want to build against installed libs	1	CONFIG+=integrated_build #remove if you want to build against installed libs
2		2
3	CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include	3	SHADOW = $$find(PWD, $${OUT_PWD})
		4
		5	unix:isEmpty(SHADOW){
		6	search = "$$PWD:::"
		7	temp = $$split(search,"/")
		8	temp = $$last(temp)
		9	path = $$replace(search,$$temp,'')
		10	temp = $$split(OUT_PWD,$$path)
		11	temp = $$split(temp,'/')
		12	temp = $$first(temp)
		13	path = "$${path}$${temp}"
		14	SHADOW=$$path
		15	}
		16
		17	CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
4	CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private	18	CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
5	CHART_BUILD_LIB_DIR = $$~~PWD~~/lib	19	CHART_BUILD_LIB_DIR = $$SHADOW/lib
6	CHART_BUILD_DIR = $$~~PWD~~/build	20	CHART_BUILD_DIR = $$SHADOW/build
7	CHART_BUILD_BIN_DIR = $$~~PWD~~/bin	21	CHART_BUILD_BIN_DIR = $$SHADOW/bin
8	CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart	22	CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
9	CHART_BUILD_DOC_DIR = $$~~PWD~~/doc	23	CHART_BUILD_DOC_DIR = $$SHADOW/doc
		24
10		25
11	# hack to fix windows builds	26	# hack to fix windows builds
12	win32:{	27	win32:{

examples/gdpbarchart/gdpbarchart.pro +1 -1

             !mac {
                 # TODO: QMAKE_POST_LINK does not work on mac; how to copy the data file?
-                QMAKE_POST_LINK += $$QMAKE_COPY gdpData $$CHART_BUILD_BIN_DIR
+                QMAKE_POST_LINK += $$QMAKE_COPY $$PWD/gdpData $$CHART_BUILD_BIN_DIR
             }

src/src.pro +25 -32

@@ -8,32 +8,32 win32-msvc*: LIBS += User32.lib
8	CONFIG += debug_and_release	8	CONFIG += debug_and_release
9	CONFIG(debug, debug\|release):TARGET = QtCommercialChartd	9	CONFIG(debug, debug\|release):TARGET = QtCommercialChartd
10	SOURCES += \	10	SOURCES += \
11	chartdataset.cpp \	11	$$PWD/chartdataset.cpp \
12	chartpresenter.cpp \	12	$$PWD/chartpresenter.cpp \
13	charttheme.cpp \	13	$$PWD/charttheme.cpp \
14	domain.cpp \	14	$$PWD/domain.cpp \
15	qchart.cpp \	15	$$PWD/qchart.cpp \
16	qchartview.cpp \	16	$$PWD/qchartview.cpp \
17	qseries.cpp \	17	$$PWD/qseries.cpp \
18	qlegend.cpp \	18	$$PWD/qlegend.cpp \
19	legendmarker.cpp \	19	$$PWD/legendmarker.cpp \
20	chartbackground.cpp \	20	$$PWD/chartbackground.cpp \
21	chart.cpp	21	$$PWD/chart.cpp
22	PRIVATE_HEADERS += \	22	PRIVATE_HEADERS += \
23	chartdataset_p.h \	23	$$PWD/chartdataset_p.h \
24	chartitem_p.h \	24	$$PWD/chartitem_p.h \
25	chartpresenter_p.h \	25	$$PWD/chartpresenter_p.h \
26	charttheme_p.h \	26	$$PWD/charttheme_p.h \
27	domain_p.h \	27	$$PWD/domain_p.h \
28	legendmarker_p.h \	28	$$PWD/legendmarker_p.h \
29	chartbackground_p.h \	29	$$PWD/chartbackground_p.h \
30	chart_p.h	30	$$PWD/chart_p.h
31	PUBLIC_HEADERS += \	31	PUBLIC_HEADERS += \
32	qchart.h \	32	$$PWD/qchart.h \
33	qchartglobal.h \	33	$$PWD/qchartglobal.h \
34	qseries.h \	34	$$PWD/qseries.h \
35	qchartview.h \	35	$$PWD/qchartview.h \
36	qlegend.h	36	$$PWD/qlegend.h
37		37
38	include(animations/animations.pri)	38	include(animations/animations.pri)
39	include(axis/axis.pri)	39	include(axis/axis.pri)
@@ -44,15 +44,8 include(barchart/barchart.pri)
44	include(piechart/piechart.pri)	44	include(piechart/piechart.pri)
45	include(scatterseries/scatter.pri)	45	include(scatterseries/scatter.pri)
46	include(splinechart/splinechart.pri)	46	include(splinechart/splinechart.pri)
		47	include(themes/themes.pri)
47		48
48	THEMES += themes/chartthemedefault_p.h \
49	themes/chartthemelight_p.h \
50	themes/chartthemebluecerulean_p.h \
51	themes/chartthemedark_p.h \
52	themes/chartthemebrownsand_p.h \
53	themes/chartthemebluencs_p.h \
54	themes/chartthemeicy_p.h \
55	themes/chartthemescientific_p.h
56		49
57	HEADERS += $$PUBLIC_HEADERS	50	HEADERS += $$PUBLIC_HEADERS
58	HEADERS += $$PRIVATE_HEADERS	51	HEADERS += $$PRIVATE_HEADERS

test/auto/chartdataset/chartdataset.pro +1 -1

-            !include( ../test.pri ) {
+            !include( ../../test.pri ) {
              error( "Couldn't find the test.pri file!" )
             }
             SOURCES += tst_chartdataset.cpp

test/auto/domain/domain.pro +1 -1

-            !include( ../test.pri ) {
+            !include( ../../test.pri ) {
              error( "Couldn't find the test.pri file!" )
             }
             SOURCES += tst_domain.cpp

test/chartwidgettest/chartwidgettest.pro +2 -9

-            !include( ../../common.pri ) {
+            !include( ../test.pri ) {
-                error( "Couldn't find the common.pri file!" )
+                error( "Couldn't find the test.pri file!" )
-            !include( ../../integrated.pri ) {
-                error( "Couldn't find the integrated.pri file !")
             }
             TARGET = chartwidgettest
             TEMPLATE = app
-            DESTDIR = $$CHART_BUILD_BIN_DIR
             QT += core gui
             contains(QT_MAJOR_VERSION, 5) {
                 QT += widgets
             }
-            OBJECTS_DIR = tmp
-            MOC_DIR = tmp
             SOURCES += main.cpp \
                 mainwidget.cpp \
                 dataseriedialog.cpp

test/qmlchart/qmlchart.pro +1 -8

-            !include( ../../common.pri ) {
+            !include( ../test.pri ) {
                 error( "Couldn't find the common.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
             integrated_build:{
                 message(Please export QML_IMPORT_PATH=$$CHART_BUILD_LIB_DIR)
             }

test/test.pri ~~test/auto/test.pri~~ renamed +2 -2

-            !include( ../../common.pri ) {
+            !include( ../common.pri ) {
              error( "Couldn't find the common.pri file!" )
             }
-            !include( ../../integrated.pri ) {
+            !include( ../integrated.pri ) {
              error( "Couldn't find the integrated.pri file !")
             }

	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