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

Adds shadow build support

Michal Klocek -

r708:69e7126c2380

parent child

Context file:

r708:69e7126c2380

Collapse all files

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

             !include(common.pri) {
                 error('missing common.pri')
             }
             TEMPLATE = subdirs
             SUBDIRS += src examples demos test qmlplugin
             integrated_build:{
                 message('Configured for integrated build against local libs...')
             } else {
                 message('Running build aginst system libs...')
                 message('Please build example test and qmlplugin after installing library.')
             }
             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
             doc.target = doc
             win32:{
                 doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
             }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

             CONFIG+=integrated_build #remove if you want to build against installed libs
-            CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include
+            SHADOW = $$find(PWD, $${OUT_PWD})
+            unix:isEmpty(SHADOW){
+                search = "$$PWD:::"
+                temp = $$split(search,"/")
+                temp = $$last(temp)
+                path = $$replace(search,$$temp,'')
+                temp = $$split(OUT_PWD,$$path)
+                temp = $$split(temp,'/')
+                temp = $$first(temp)
+                path = "$${path}$${temp}"
+                SHADOW=$$path
+            }
+            CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
             CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
-            CHART_BUILD_LIB_DIR = $$PWD/lib
+            CHART_BUILD_LIB_DIR = $$SHADOW/lib
-            CHART_BUILD_DIR = $$PWD/build
+            CHART_BUILD_DIR = $$SHADOW/build
-            CHART_BUILD_BIN_DIR = $$PWD/bin
+            CHART_BUILD_BIN_DIR = $$SHADOW/bin
             CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
-            CHART_BUILD_DOC_DIR = $$PWD/doc
+            CHART_BUILD_DOC_DIR = $$SHADOW/doc
             # hack to fix windows builds
             win32:{
                 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
                 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
                 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
                 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
                 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
                 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
                 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
             }
             mac: {
                 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
                 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
                 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
                 # it should probably define the minimum OSX version to be 10.5...
                 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
                 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
             }

examples/gdpbarchart/gdpbarchart.pro +1 -1

             !include( ../examples.pri ) {
              error( "Couldn't find the examples.pri file!" )
             }
             QT+= sql
             TARGET = gdpbarchart
             SOURCES += main.cpp\
                     widget.cpp
             HEADERS  += widget.h
             !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

             !include( ../common.pri ):error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             win32-msvc*: LIBS += User32.lib
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += \
-                chartdataset.cpp \
+                $$PWD/chartdataset.cpp \
-                chartpresenter.cpp \
+                $$PWD/chartpresenter.cpp \
-                charttheme.cpp \
+                $$PWD/charttheme.cpp \
-                domain.cpp \
+                $$PWD/domain.cpp \
-                qchart.cpp \
+                $$PWD/qchart.cpp \
-                qchartview.cpp \
+                $$PWD/qchartview.cpp \
-                qseries.cpp \
+                $$PWD/qseries.cpp \
-                qlegend.cpp \
+                $$PWD/qlegend.cpp \
-                legendmarker.cpp \
+                $$PWD/legendmarker.cpp \
-                chartbackground.cpp \
+                $$PWD/chartbackground.cpp \
-                chart.cpp
+                $$PWD/chart.cpp
             PRIVATE_HEADERS += \
-                chartdataset_p.h \
+                $$PWD/chartdataset_p.h \
-                chartitem_p.h \
+                $$PWD/chartitem_p.h \
-                chartpresenter_p.h \
+                $$PWD/chartpresenter_p.h \
-                charttheme_p.h \
+                $$PWD/charttheme_p.h \
-                domain_p.h \
+                $$PWD/domain_p.h \
-                legendmarker_p.h \
+                $$PWD/legendmarker_p.h \
-                chartbackground_p.h \
+                $$PWD/chartbackground_p.h \
-                chart_p.h
+                $$PWD/chart_p.h
             PUBLIC_HEADERS += \
-                qchart.h \
+                $$PWD/qchart.h \
-                qchartglobal.h \
+                $$PWD/qchartglobal.h \
-                qseries.h \
+                $$PWD/qseries.h \
-                qchartview.h \
+                $$PWD/qchartview.h \
-                qlegend.h
+                $$PWD/qlegend.h
             include(animations/animations.pri)
             include(axis/axis.pri)
             include(xychart/xychart.pri)
             include(linechart/linechart.pri)
             include(areachart/areachart.pri)
             include(barchart/barchart.pri)
             include(piechart/piechart.pri)
             include(scatterseries/scatter.pri)
             include(splinechart/splinechart.pri)
+            include(themes/themes.pri)
-            THEMES += themes/chartthemedefault_p.h \
-                themes/chartthemelight_p.h \
-                themes/chartthemebluecerulean_p.h \
-                themes/chartthemedark_p.h \
-                themes/chartthemebrownsand_p.h \
-                themes/chartthemebluencs_p.h \
-                themes/chartthemeicy_p.h \
-                themes/chartthemescientific_p.h
             HEADERS += $$PUBLIC_HEADERS
             HEADERS += $$PRIVATE_HEADERS
             HEADERS += $$THEMES
             INCLUDEPATH += linechart \
                 barchart \
                 themes \
                 .
             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)
             {
                 system($$QMAKE_MKDIR $$CHART_BUILD_PUBLIC_HEADER_DIR)
             }
             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 \
             chartversion.target = qchartversion_p.h
             chartversion.commands = @echo \
                 "build_time" \
                 > \
                 $$chartversion.target;
             chartversion.depends = $$HEADERS \
                 $$SOURCES
             PRE_TARGETDEPS += qchartversion_p.h
             QMAKE_CLEAN += 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/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
             HEADERS += \
                 mainwidget.h \
                 dataseriedialog.h

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)
             }
             RESOURCES += \
                 resources.qrc
             # Add more folders to ship with the application, here
             folder_01.source = qml/qmlchart
             folder_01.target = qml
             DEPLOYMENTFOLDERS = folder_01
             # Additional import path used to resolve QML modules in Creator's code model
             QML_IMPORT_PATH =
             symbian:TARGET.UID3 = 0xE421236E
             # Smart Installer package's UID
             # This UID is from the protected range and therefore the package will
             # fail to install if self-signed. By default qmake uses the unprotected
             # range value if unprotected UID is defined for the application and
             # 0x2002CCCF value if protected UID is given to the application
             #symbian:DEPLOYMENT.installer_header = 0x2002CCCF
             # Allow network access on Symbian
             symbian:TARGET.CAPABILITY += NetworkServices
             # If your application uses the Qt Mobility libraries, uncomment the following
             # lines and add the respective components to the MOBILITY variable.
             # CONFIG += mobility
             # MOBILITY +=
             # Speed up launching on MeeGo/Harmattan when using applauncherd daemon
             # CONFIG += qdeclarative-boostable
             # Add dependency to Symbian components
             # CONFIG += qt-components
             # The .cpp file which was generated for your project. Feel free to hack it.
             SOURCES += main.cpp
             # Please do not modify the following two lines. Required for deployment.
             include(qmlapplicationviewer/qmlapplicationviewer.pri)
             qtcAddDeployment()
             #HEADERS += \
             #    chart.h

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 !")
             }
             TEMPLATE = app
             CONFIG  += qtestlib
             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
             !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")

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