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

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

Fix build paths to correct ones in build direcotry
Michal Klocek -
r1198:b49f1593848a
parent child
Show More
Side by Side Unified
Context file:
r1198:b49f1593848a Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,12 +1,12
1 !include( ../config.pri ) {
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
2 error( "Couldn't find the config.pri file!" )
3 }
3 }
4
4
5 DESTDIR = $$CHART_BUILD_BIN_DIR
5 DESTDIR = $$CHART_BUILD_BIN_DIR
6 OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
6 OBJECTS_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
7 MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
7 MOC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
8 UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
8 UI_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
9 RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
9 RCC_DIR = $$CHART_BUILD_DIR/demos/$$TARGET
10
10
11 TEMPLATE = app
11 TEMPLATE = app
12 QT += core gui No newline at end of file
12 QT += core gui
Show file before | Show file after | Hide comments
@@ -1,12 +1,12
1 !include( ../config.pri ) {
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
2 error( "Couldn't find the config.pri file!" )
3 }
3 }
4
4
5 DESTDIR = $$CHART_BUILD_BIN_DIR
5 DESTDIR = $$CHART_BUILD_BIN_DIR
6 OBJECTS_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
6 OBJECTS_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
7 MOC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
7 MOC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
8 UI_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
8 UI_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
9 RCC_DIR = $$CHART_BUILD_DIR/bin/$$TARGET
9 RCC_DIR = $$CHART_BUILD_DIR/examples/$$TARGET
10
10
11 TEMPLATE = app
11 TEMPLATE = app
12 QT += core gui No newline at end of file
12 QT += core gui
Show file before | Show file after | Hide comments
@@ -1,9 +1,14
1 !include( ../test.pri ) {
1 !include( ../test.pri ) {
2 error( "Couldn't find the test.pri file!" )
2 error( "Couldn't find the test.pri file!" )
3 }
3 }
4
4
5 CONFIG += qtestlib
5 CONFIG += qtestlib
6 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
6 !contains(TARGET, ^tst_.*):TARGET = $$join(TARGET,,"tst_")
7
7
8 INCLUDEPATH += ../inc
8 INCLUDEPATH += ../inc
9 HEADERS += ../inc/tst_definitions.h
9 HEADERS += ../inc/tst_definitions.h
10
11 OBJECTS_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
12 MOC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
13 UI_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
14 RCC_DIR = $$CHART_BUILD_DIR/tests/auto/$$TARGET
Show file before | Show file after | Hide comments
@@ -1,11 +1,11
1 !include( ../config.pri ) {
1 !include( ../config.pri ) {
2 error( "Couldn't find the config.pri file!" )
2 error( "Couldn't find the config.pri file!" )
3 }
3 }
4
4
5 TEMPLATE = app
5 TEMPLATE = app
6
6
7 DESTDIR = $$CHART_BUILD_BIN_DIR
7 DESTDIR = $$CHART_BUILD_BIN_DIR
8 OBJECTS_DIR = $$CHART_BUILD_DIR/$$TARGET
8 OBJECTS_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
9 MOC_DIR = $$CHART_BUILD_DIR/$$TARGET
9 MOC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
10 UI_DIR = $$CHART_BUILD_DIR/$$TARGET
10 UI_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
11 RCC_DIR = $$CHART_BUILD_DIR/$$TARGET
11 RCC_DIR = $$CHART_BUILD_DIR/tests/$$TARGET
General Comments 0
You need to be logged in to leave comments. Login now