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

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

Updates development_build option
Michal Klocek -
r998:310fbd27a8f1
parent child
Show More
Show file before | Show file after | Hide comments
@@ -5,6 +5,8
5 TEMPLATE = subdirs
5 TEMPLATE = subdirs
6 SUBDIRS = src qmlplugin examples demos test
6 SUBDIRS = src qmlplugin examples demos test
7
7
8 development_build: message('Development build')
9
8 local_build:{
10 local_build:{
9 message('Configured for local build against local libs...')
11 message('Configured for local build against local libs...')
10 message('You can run "make" to build qchart library, examples and demos...')
12 message('You can run "make" to build qchart library, examples and demos...')
Show file before | Show file after | Hide comments
@@ -10,9 +10,9
10 temp = $$first(temp)
10 temp = $$first(temp)
11 path = "$${path}$${temp}"
11 path = "$${path}$${temp}"
12 SHADOW=$$path
12 SHADOW=$$path
13 CONFIG-=developer_build
14 }else{
13 }else{
15 SHADOW=$$PWD
14 SHADOW=$$PWD
15 CONFIG-=development_build
16 }
16 }
17
17
18 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
18 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
@@ -44,4 +44,7 mac: {
44 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
44 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
45 }
45 }
46
46
47 developer_build: DEFINES+=DEVELOPER_BUILD No newline at end of file
47 development_build: {
48 DEFINES+=DEVELOPMENT_BUILD
49 CONFIG+=local_build
50 } No newline at end of file
Show file before | Show file after | Hide comments
@@ -27,10 +27,10
27 // There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
27 // There is a problem with jom.exe currently. It does not seem to understand QMAKE_EXTRA_TARGETS properly.
28 // This is the case at least with shadow builds.
28 // This is the case at least with shadow builds.
29 // http://qt-project.org/wiki/jom
29 // http://qt-project.org/wiki/jom
30 #undef DEVELOPER_BUILD
30 #undef DEVELOPMENT_BUILD
31 #endif
31 #endif
32
32
33 #ifndef DEVELOPER_BUILD
33 #ifndef DEVELOPMENT_BUILD
34 const char *buildTime = __TIME__" "__DATE__;
34 const char *buildTime = __TIME__" "__DATE__;
35 const char *gitHead = "unknown";
35 const char *gitHead = "unknown";
36 #else
36 #else
Show file before | Show file after | Hide comments
@@ -42,7 +42,7
42 # define QTCOMMERCIALCHART_USE_NAMESPACE
42 # define QTCOMMERCIALCHART_USE_NAMESPACE
43 #endif
43 #endif
44
44
45 #if defined(DEVELOPER_BUILD) && !defined(QT_NO_DEBUG)
45 #if defined(DEVELOPMENT_BUILD) && !defined(QT_NO_DEBUG)
46 #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
46 #define CHART_DEBUG chartDebug(3,__LINE__,__FILE__,__FUNCTION__)
47
47
48
48
Show file before | Show file after | Hide comments
@@ -126,7 +126,7 QMAKE_EXTRA_COMPILERS += install_build_public_headers \
126 # This is the case at least with shadow builds.
126 # This is the case at least with shadow builds.
127 # http://qt-project.org/wiki/jom
127 # http://qt-project.org/wiki/jom
128
128
129 developer_build:!win32-msvc*:{
129 development_build:!win32-msvc*:{
130 chartversion.target = $$PWD/qchartversion_p.h
130 chartversion.target = $$PWD/qchartversion_p.h
131
131
132 unix:{
132 unix:{
General Comments 0
You need to be logged in to leave comments. Login now