HG_REPOSITORIES/LPP/INSTRUMENTATION/USERS/JEANDET/qtcharts Commit - r193:862e361671e1

Adds private headers handling...

Michal Klocek -

r193:862e361671e1

parent child

Context file:

r193:862e361671e1

Collapse all files

charts.pro +9 -1

             !include(common.pri) {
                 error('missing common.pri')
             }
             TEMPLATE = subdirs
-            SUBDIRS += src qmlplugin example test
+            SUBDIRS += src
+            integrated_build:{
+             message('Configured for integrated build')
+            SUBDIRS += example test qmlplugin
+            }else{
+             message('Please build example test and qmlplugin after installing library.')
+            }
             CONFIG += ordered
             QMAKE_CXXFLAGS += -g -Wall
             unix:QMAKE_DISTCLEAN += -r build bin
             win32:QMAKE_DISTCLEAN += /Q build bin
             # install feature file
             feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
             feature.files = $$PWD/features/qtcommercialchart.prf
             INSTALLS += feature

common.pri +4 -2

             CONFIG+=integrated_build #remove if you want to build against installed libs
-            CHART_BUILD_HEADER_DIR = $$PWD/include
+            CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include
+            CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
             CHART_BUILD_LIB_DIR = $$PWD/lib
             CHART_BUILD_DIR = $$PWD/build
             CHART_BUILD_BIN_DIR = $$PWD/bin
             # hack to fix windows builds
             win32:{
-                CHART_BUILD_HEADER_DIR = $$replace(CHART_BUILD_HEADER_DIR, "/","\\")
+                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, "/","\\")
             }
             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
             }

integrated.pri +3 -2

             integrated_build:{
-                message('Internal build within charts core source tree')
+                message('Running integrated build against local libs...')
-                INCLUDEPATH += $$CHART_BUILD_HEADER_DIR
+                INCLUDEPATH += $$CHART_BUILD_PUBLIC_HEADER_DIR
                 !win32: {
                     LIBS += -L $$CHART_BUILD_LIB_DIR -Wl,-rpath,$$CHART_BUILD_LIB_DIR
                 }else{
                     LIBS += -L $$CHART_BUILD_LIB_DIR
                 }
                 DESTDIR = $$CHART_BUILD_BIN_DIR
                 CONFIG(debug, debug|release) {
                     LIBS += -lQtCommercialChartd
                     #this is ugly hack to work around missing rpath, it simply copies lib
                     win32:{
                         copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                         copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChartd.dll $$CHART_BUILD_BIN_DIR
                         copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChartd.dll
                         PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChartd.dll
                         QMAKE_EXTRA_TARGETS +=copylib
                     }
                 } else {
                     LIBS += -lQtCommercialChart
                     #this is ugly hack to work around missing rpath, it simply copies lib
                     win32: {
                         copylib.target = $$CHART_BUILD_BIN_DIR/QtCommercialChart
                         copylib.commands = $$QMAKE_COPY $$CHART_BUILD_LIB_DIR\\QtCommercialChart.dll $$CHART_BUILD_BIN_DIR
                         copylib.depends = $$CHART_BUILD_LIB_DIR/QtCommercialChart.dll
                         PRE_TARGETDEPS += $$CHART_BUILD_BIN_DIR/QtCommercialChart
                         QMAKE_EXTRA_TARGETS +=copylib
                     }
                 }
                 mac: {
                     # This is a hack to make binaries to use the internal version of the QtCommercial Charts library on OSX
                     QMAKE_POST_LINK += install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/chartwidgettest.app/Contents/MacOS/chartwidgettest
                     QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/barchart.app/Contents/MacOS/barchart
                     QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/colorlineChart.app/Contents/MacOS/colorlineChart
                     QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/lineChart.app/Contents/MacOS/lineChart
                     QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/percentbarchart.app/Contents/MacOS/percentbarchart
                     QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/stackedbarchart.app/Contents/MacOS/stackedbarchart
                     QMAKE_POST_LINK += && install_name_tool -change "libQtCommercialChartd.1.dylib" "@rpath/libQtCommercialChartd.dylib" $$CHART_BUILD_BIN_DIR/zoomLineChart.app/Contents/MacOS/zoomLineChart
                 }
             } else {
+                message('Running build aginst system libs...')
                 CONFIG+=qtcommercialchart
             }

src/src.pro +15 -7

             !include( ../common.pri ):error( Couldn't find the common.pri file! )
             TARGET = QtCommercialChart
             DESTDIR = $$CHART_BUILD_LIB_DIR
             TEMPLATE = lib
             QT += core \
                 gui
             CONFIG += debug_and_release
             CONFIG(debug, debug|release):TARGET = QtCommercialChartd
             SOURCES += barchart/barchartseries.cpp \
                 barchart/bargroup.cpp \
                 barchart/bar.cpp \
                 barchart/stackedbarchartseries.cpp \
                 barchart/stackedbargroup.cpp \
                 barchart/percentbarchartseries.cpp \
                 barchart/percentbargroup.cpp \
                 barchart/barlabel.cpp \
                 barchart/barchartmodel.cpp \
                 barchart/separator.cpp \
                 barchart/bargroupbase.cpp \
                 barchart/qbarset.cpp \
                 barchart/qbarcategory.cpp \
                 linechart/linechartanimationitem.cpp \
                 linechart/linechartitem.cpp \
                 linechart/qlinechartseries.cpp \
                 qscatterseries.cpp \
                 #scatterpresentation.cpp \
                 qchart.cpp \
                 axisitem.cpp \
                 qchartview.cpp \
                 qchartseries.cpp \
                 qchartaxis.cpp \
                 charttheme.cpp \
                 chartdataset.cpp \
                 chartpresenter.cpp \
                 domain.cpp \
                 scatterpresenter.cpp
             PRIVATE_HEADERS += linechart/linechartitem_p.h \
                 linechart/linechartanimationitem_p.h \
                 barchart/barlabel_p.h \
                 barchart/bar_p.h \
                 barchart/separator_p.h \
                 barchart/barchartmodel_p.h \
                 qscatterseries_p.h \
                 #scatterpresentation.h \
                 axisitem_p.h \
                 chartitem_p.h \
                 charttheme_p.h \
                 chartdataset_p.h \
                 chartpresenter_p.h \
                 domain_p.h
             PUBLIC_HEADERS += linechart/qlinechartseries.h \
                 barchart/barchartseries.h \
                 barchart/bargroup.h \
                 barchart/stackedbarchartseries.h \
                 barchart/stackedbargroup.h \
                 barchart/percentbarchartseries.h \
                 barchart/percentbargroup.h \
                 barchart/bargroupbase.h \
                 barchart/qbarset.h \
                 barchart/qbarcategory.h \
                 qchartseries.h \
                 qscatterseries.h \
                 qchart.h \
                 qchartglobal.h \
                 qchartview.h \
                 qchartaxis.h
             include(piechart/piechart.pri)
             THEMES += themes/chartthemeicy_p.h \
                 themes/chartthemegrayscale_p.h \
                 themes/chartthemescientific_p.h \
                 themes/chartthemevanilla_p.h
             HEADERS += $$PUBLIC_HEADERS \
                 scatterpresenter.h
             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
             public_headers.path = $$[QT_INSTALL_HEADERS]/QtCommercialChart
             public_headers.files = $$PUBLIC_HEADERS
             target.path = $$[QT_INSTALL_LIBS]
             INSTALLS += target \
                 public_headers
-            install_build_headers.name = bild_headers
+            install_build_public_headers.name = bild_public_headers
-            install_build_headers.output = $$CHART_BUILD_HEADER_DIR/${QMAKE_FILE_BASE}.h
+            install_build_public_headers.output = $$CHART_BUILD_PUBLIC_HEADER_DIR/${QMAKE_FILE_BASE}.h
-            install_build_headers.input = PUBLIC_HEADERS
+            install_build_public_headers.input = PUBLIC_HEADERS
-            install_build_headers.commands = $$QMAKE_COPY \
+            install_build_public_headers.commands = $$QMAKE_COPY \
                 ${QMAKE_FILE_NAME} \
-                $$CHART_BUILD_HEADER_DIR
+                $$CHART_BUILD_PUBLIC_HEADER_DIR
-            install_build_headers.CONFIG += target_predeps \
+            install_build_public_headers.CONFIG += target_predeps \
                 no_link
-            QMAKE_EXTRA_COMPILERS += install_build_headers
+            install_build_private_headers.name = bild_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

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