##// END OF EJS Templates
minor. missing line option
Michal Klocek -
r999:748ed6762b03
parent child
Show More
@@ -1,50 +1,51
1
1
2 #check if shadow build
2 #check if shadow build
3 !contains($${PWD}, $${OUT_PWD}){
3 !contains($${PWD}, $${OUT_PWD}){
4 search = "$$PWD:::"
4 search = "$$PWD:::"
5 temp = $$split(search,"/")
5 temp = $$split(search,"/")
6 temp = $$last(temp)
6 temp = $$last(temp)
7 path = $$replace(search,$$temp,'')
7 path = $$replace(search,$$temp,'')
8 temp = $$split(OUT_PWD,$$path)
8 temp = $$split(OUT_PWD,$$path)
9 temp = $$split(temp,'/')
9 temp = $$split(temp,'/')
10 temp = $$first(temp)
10 temp = $$first(temp)
11 path = "$${path}$${temp}"
11 path = "$${path}$${temp}"
12 SHADOW=$$path
12 SHADOW=$$path
13 }else{
13 }else{
14 SHADOW=$$PWD
14 SHADOW=$$PWD
15 CONFIG-=development_build
15 CONFIG-=development_build
16 }
16 }
17
17
18 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
18 CHART_BUILD_PUBLIC_HEADER_DIR = $$SHADOW/include
19 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
19 CHART_BUILD_PRIVATE_HEADER_DIR = $$CHART_BUILD_PUBLIC_HEADER_DIR/private
20 CHART_BUILD_LIB_DIR = $$SHADOW/lib
20 CHART_BUILD_LIB_DIR = $$SHADOW/lib
21 CHART_BUILD_DIR = $$SHADOW/build
21 CHART_BUILD_DIR = $$SHADOW/build
22 CHART_BUILD_BIN_DIR = $$SHADOW/bin
22 CHART_BUILD_BIN_DIR = $$SHADOW/bin
23 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
23 CHART_BUILD_PLUGIN_DIR = $$CHART_BUILD_LIB_DIR/QtCommercial/Chart
24 CHART_BUILD_DOC_DIR = $$SHADOW/doc
24 CHART_BUILD_DOC_DIR = $$SHADOW/doc
25
25
26
26
27 # hack to fix windows builds
27 # hack to fix windows builds
28 win32:{
28 win32:{
29 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
29 CHART_BUILD_PUBLIC_HEADER_DIR = $$replace(CHART_BUILD_PUBLIC_HEADER_DIR, "/","\\")
30 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
30 CHART_BUILD_PRIVATE_HEADER_DIR = $$replace(CHART_BUILD_PRIVATE_HEADER_DIR, "/","\\")
31 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
31 CHART_BUILD_LIB_DIR = $$replace(CHART_BUILD_LIB_DIR, "/","\\")
32 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
32 CHART_BUILD_BUILD_DIR = $$replace(CHART_BUILD_BUILD_DIR, "/","\\")
33 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
33 CHART_BUILD_BIN_DIR = $$replace(CHART_BUILD_BIN_DIR, "/","\\")
34 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
34 CHART_BUILD_PLUGIN_DIR = $$replace(CHART_BUILD_PLUGIN_DIR, "/","\\")
35 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
35 CHART_BUILD_DOC_DIR = $$replace(CHART_BUILD_DOC_DIR, "/","\\")
36 }
36 }
37
37
38 mac: {
38 mac: {
39 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
39 # TODO: The following qmake flags are a work-around to make QtCommercial Charts compile on
40 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
40 # QtCommercial 4.8. On the other hand Charts builds successfully with Qt open source 4.8
41 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
41 # without these definitions, so this is probably a configuration issue on QtCommercial 4.8;
42 # it should probably define the minimum OSX version to be 10.5...
42 # it should probably define the minimum OSX version to be 10.5...
43 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
43 QMAKE_CXXFLAGS *= -mmacosx-version-min=10.5
44 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
44 QMAKE_LFLAGS *= -mmacosx-version-min=10.5
45 }
45 }
46
46
47 development_build: {
47 development_build: {
48 DEFINES+=DEVELOPMENT_BUILD
48 DEFINES+=DEVELOPMENT_BUILD
49 CONFIG+=local_build
49 CONFIG+=local_build
50 CONFIG+=debug
50 } No newline at end of file
51 }
General Comments 0
You need to be logged in to leave comments. Login now