##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » USERS » JEANDET » qtcharts
RSS

Clone from http://code.qt.io/qt/qtcharts.git

Adds release debug direcotires to bin lib
Michal Klocek -
r1974:81d990977b44
parent child
Show More
Side by Side Unified
Context file:
r1974:81d990977b44 Loading diff...:
Show file before | Show file after | Hide comments
@@ -36,9 +36,24 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
36 36 CHART_BUILD_LIB_DIR = $$SHADOW/lib
37 37 CHART_BUILD_DIR = $$SHADOW/build
38 38 CHART_BUILD_BIN_DIR = $$SHADOW/bin
39 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR/QtCommercial/Chart
39 CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_BIN_DIR
40 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
40 41 CHART_BUILD_DOC_DIR = $$SHADOW/doc
41 42
43 CONFIG(release,debug|release){
44 CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/release
45 CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/release
46 CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/release/QtCommercial/Chart
47 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
48 }
49
50
51 CONFIG(debug,debug|release){
52 CHART_BUILD_LIB_DIR = $$CHART_BUILD_LIB_DIR/debug
53 CHART_BUILD_BIN_DIR = $$CHART_BUILD_BIN_DIR/debug
54 CHART_BUILD_QML_PLUGIN_DIR = $$CHART_BUILD_QML_PLUGIN_DIR/debug/QtCommercial/Chart
55 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR
56 }
42 57 # Use own folders for debug and release builds
43 58
44 59 CONFIG(debug, debug|release):CHART_BUILD_DIR = $$join(CHART_BUILD_DIR,,,/debug)
@@ -50,7 +65,8 win32:{
50 65 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
51 66 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
52 67 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
53 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
68 CHART_BUILD_QML_PLUGIN_DIR = $$replace(CHART_BUILD_QML_PLUGIN_DIR, "/","\\")
69 CHART_BUILD_DESIGNER_PLUGIN_DIR = $$replace(CHART_BUILD_DESIGNER_PLUGIN_DIR, "/","\\")
54 70 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
55 71 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
56 72 }
Show file before | Show file after | Hide comments
@@ -1,9 +1,10
1 TARGET = qtcommercialchartqml
2 QT += declarative
3
4 1 !include( ../plugins.pri ) {
5 2 error( "Couldn't find the plugins.pri file!" )
6 3 }
4
5 TARGET = qtcommercialchartqml
6 QT += declarative
7 DESTDIR = $$CHART_BUILD_QML_PLUGIN_DIR
7 8 INCLUDEPATH += $$CHART_BUILD_PRIVATE_HEADER_DIR
8 9
9 10 CONFIG(debug, debug|release) {
@@ -46,4 +47,4 INSTALLS += target qmldir
46 47
47 48 FILE = $$PWD/qmldir
48 49 win32:{FILE = $$replace(FILE, "/","\\")}
49 QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_PLUGIN_DIR
50 QMAKE_POST_LINK += $$QMAKE_COPY $$FILE $$CHART_BUILD_QML_PLUGIN_DIR
Show file before | Show file after | Hide comments
@@ -1,9 +1,9
1 TARGET=qtcommercialchartdesigner
2
3 1 !include( ../plugins.pri ) {
4 2 error( "Couldn't find the plugins.pri file!" )
5 3 }
6 4
5 TARGET=qtcommercialchartdesigner
6 DESTDIR = $$CHART_BUILD_DESIGNER_PLUGIN_DIR
7 7 CONFIG += designer
8 8 HEADERS = qchartsplugin.h
9 9 SOURCES = qchartsplugin.cpp
Show file before | Show file after | Hide comments
@@ -5,8 +5,6
5 5 TEMPLATE = lib
6 6
7 7 CONFIG+= plugin
8
9 DESTDIR = $$CHART_BUILD_PLUGIN_DIR
10 8 OBJECTS_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
11 9 MOC_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
12 10 UI_DIR = $$CHART_BUILD_DIR/plugins/$$TARGET
General Comments 0
You need to be logged in to leave comments. Login now