##// END OF EJS Templates
Updated build scripts, now everything builds.
Jeandet Alexis -
r9:2b3d939ebb38 default
parent child
Show More
@@ -1,7 +1,7
1 1 TEMPLATE = subdirs
2 2
3 3 CONFIG += ordered
4 SUBDIRS = src extensions #tests examples
4 SUBDIRS = src extensions tests examples
5 5
6 6 contains(QT_MAJOR_VERSION, 5) {
7 7 SUBDIRS += generator_50
@@ -96,3 +96,11 contains(CONFIG,BUILDING_QTALL){
96 96
97 97
98 98
99 contains(CONFIG,BUILDING_EXAMPLES){
100 message("BUILDING_EXAMPLES")
101 LIBS += -L$${DESTDIR}
102 LIBS += -lPythonQt_QtAll$${DEBUG_EXT}
103 LIBS += -lPythonQt$${DEBUG_EXT}
104 INCLUDEPATH += $${PWD}/../src \
105 $${PWD}/../extensions/PythonQt_QtAll
106 }
@@ -11,8 +11,7 contains(QT_MAJOR_VERSION, 5) {
11 11 }
12 12
13 13
14 include ( ../../build/common.prf )
15 CONFIG+=BUILDING_QTALL
14 CONFIG+=BUILDING_EXAMPLES
16 15 include ( ../../build/pythonqt.prf )
17 16
18 17 SOURCES += \
@@ -9,11 +9,8 contains(QT_MAJOR_VERSION, 5) {
9 9
10 10 mac:CONFIG-= app_bundle
11 11
12 include ( ../../build/common.prf )
13 CONFIG+=BUILDING_QTALL
12 CONFIG+=BUILDING_EXAMPLES
14 13 include ( ../../build/pythonqt.prf )
15 include ( ../../build/PythonQt_QtAll.prf )
16
17 14
18 15 HEADERS += \
19 16 SimpleConsole.h \
@@ -13,8 +13,7 contains(QT_MAJOR_VERSION, 5) {
13 13 QT += widgets
14 14 }
15 15
16 include ( ../../build/common.prf )
17 CONFIG+=BUILDING_QTALL
16 CONFIG+=BUILDING_EXAMPLES
18 17 include ( ../../build/pythonqt.prf )
19 18
20 19 HEADERS += \
@@ -13,9 +13,9 contains(QT_MAJOR_VERSION, 5) {
13 13 QT += widgets
14 14 }
15 15
16 include ( ../../build/common.prf )
17 include ( ../../build/PythonQt.prf )
18
16 CONFIG+=BUILDING_EXAMPLES
17 include ( ../../build/pythonqt.prf )
18
19 19
20 20 HEADERS += \
21 21 CustomObject.h
@@ -9,9 +9,9 TEMPLATE = app
9 9
10 10 DESTDIR = ../../lib
11 11
12 include ( ../../build/common.prf )
13 CONFIG+=BUILDING_QTALL
14 include ( ../../build/pythonqt.prf )
12 CONFIG+=BUILDING_EXAMPLES
13 include ( ../../build/pythonqt.prf )
14
15 15
16 16 contains(QT_MAJOR_VERSION, 5) {
17 17 QT += widgets
@@ -15,10 +15,11 contains(QT_MAJOR_VERSION, 5) {
15 15 QT += widgets
16 16 }
17 17
18 include ( ../../build/common.prf )
19 CONFIG+=BUILDING_QTALL
18 CONFIG+=BUILDING_EXAMPLES
20 19 include ( ../../build/pythonqt.prf )
21 20
21
22
22 23 SOURCES += \
23 24 main.cpp
24 25
@@ -16,10 +16,9 contains(QT_MAJOR_VERSION, 5) {
16 16 }
17 17
18 18
19 include ( ../../build/common.prf )
20 CONFIG+=BUILDING_QTALL
19 CONFIG+=BUILDING_EXAMPLES
21 20 include ( ../../build/pythonqt.prf )
22 include ( ../../build/PythonQt_QtAll.prf )
21
23 22
24 23 SOURCES += \
25 24 main.cpp
@@ -15,10 +15,9 contains(QT_MAJOR_VERSION, 5) {
15 15 QT += widgets
16 16 }
17 17
18 include ( ../../build/common.prf )
19 CONFIG+=BUILDING_QTALL
20 include ( ../../build/pythonqt.prf )
21 include ( ../../build/PythonQt_QtAll.prf )
18 CONFIG+=BUILDING_EXAMPLES
19 include ( ../../build/pythonqt.prf )
20
22 21
23 22 SOURCES += \
24 23 main.cpp
@@ -15,10 +15,9 contains(QT_MAJOR_VERSION, 5) {
15 15
16 16 mac:CONFIG-= app_bundle
17 17
18 include ( ../../build/common.prf )
19 CONFIG+=BUILDING_QTALL
18 CONFIG+=BUILDING_EXAMPLES
20 19 include ( ../../build/pythonqt.prf )
21 include ( ../../build/PythonQt_QtAll.prf )
20
22 21
23 22 HEADERS += \
24 23 PyExampleObject.h
@@ -13,9 +13,9 mac {
13 13
14 14 QT += testlib
15 15
16 include ( ../build/common.prf )
17 16 CONFIG+=BUILDING_QTALL
18 17 include ( ../build/pythonqt.prf )
18 INCLUDEPATH += ../src
19 19
20 20 contains(QT_MAJOR_VERSION, 5) {
21 21 QT += widgets
General Comments 0
You need to be logged in to leave comments. Login now