##// END OF EJS Templates
make doc config windows friendly
Michal Klocek -
r307:c27e02996505
parent child
Show More
@@ -13,8 +13,8 integrated_build:{
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
@@ -22,6 +22,10 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
@@ -6,6 +6,7 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:{
@@ -15,6 +16,7 win32:{
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: {
General Comments 0
You need to be logged in to leave comments. Login now