##// END OF EJS Templates
make doc config windows friendly
Michal Klocek -
r307:c27e02996505
parent child
Show More
@@ -1,27 +1,31
1 !include(common.pri) {
1 !include(common.pri) {
2 error('missing common.pri')
2 error('missing common.pri')
3 }
3 }
4
4
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS += src example test qmlplugin
6 SUBDIRS += src example test qmlplugin
7
7
8 integrated_build:{
8 integrated_build:{
9 message('Configured for integrated build')
9 message('Configured for integrated build')
10 } else {
10 } else {
11 message('Please build example test and qmlplugin after installing library.')
11 message('Please build example test and qmlplugin after installing library.')
12 }
12 }
13
13
14 CONFIG += ordered
14 CONFIG += ordered
15 QMAKE_CXXFLAGS += -g -Wall
15 QMAKE_CXXFLAGS += -g -Wall
16 unix:QMAKE_DISTCLEAN += -r build bin
16 unix:QMAKE_DISTCLEAN += -r build bin doc//html
17 win32:QMAKE_DISTCLEAN += /Q build bin
17 win32:QMAKE_DISTCLEAN += /Q build bin doc\html
18
18
19 # install feature file
19 # install feature file
20 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
20 feature.path = $$[QT_INSTALL_DATA]/mkspecs/features
21 feature.files = $$PWD/features/qtcommercialchart.prf
21 feature.files = $$PWD/features/qtcommercialchart.prf
22 INSTALLS += feature
22 INSTALLS += feature
23
23
24 doc.target = doc
24 doc.target = doc
25 doc.commands = qdoc3 ./doc/qcharts.qdocconf
25 win32:{
26 doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR\\qcharts.qdocconf
27 }else{
28 doc.commands = qdoc3 $$CHART_BUILD_DOC_DIR/qcharts.qdocconf
29 }
26 doc.depends = FORCE
30 doc.depends = FORCE
27 QMAKE_EXTRA_TARGETS += doc
31 QMAKE_EXTRA_TARGETS += doc
@@ -1,27 +1,29
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 CHART_BUILD_PUBLIC_HEADER_DIR = $$PWD/include
4 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
4 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
5 CHART_BUILD_LIB_DIR = $$PWD/lib
5 CHART_BUILD_LIB_DIR = $$PWD/lib
6 CHART_BUILD_DIR = $$PWD/build
6 CHART_BUILD_DIR = $$PWD/build
7 CHART_BUILD_BIN_DIR = $$PWD/bin
7 CHART_BUILD_BIN_DIR = $$PWD/bin
8 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
8 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
9 CHART_BUILD_DOC_DIR = $$PWD/doc
9
10
10 # hack to fix windows builds
11 # hack to fix windows builds
11 win32:{
12 win32:{
12 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
13 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
13 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
14 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
14 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
15 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
15 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
16 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
16 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
17 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
17 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
18 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
19 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
18 }
20 }
19
21
20 mac: {
22 mac: {
21 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
23 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
22 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
24 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
23 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
25 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
24 # it should probably define the minimum OSX version to be 10.5...
26 # it should probably define the minimum OSX version to be 10.5...
25 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
27 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
26 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
28 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
27 }
29 }
General Comments 0
You need to be logged in to leave comments. Login now