diff --git a/PythonQt.pro b/PythonQt.pro --- a/PythonQt.pro +++ b/PythonQt.pro @@ -1,7 +1,7 @@ TEMPLATE = subdirs CONFIG += ordered -SUBDIRS = src extensions #tests examples +SUBDIRS = src extensions tests examples contains(QT_MAJOR_VERSION, 5) { SUBDIRS += generator_50 diff --git a/build/pythonqt.prf b/build/pythonqt.prf --- a/build/pythonqt.prf +++ b/build/pythonqt.prf @@ -96,3 +96,11 @@ contains(CONFIG,BUILDING_QTALL){ +contains(CONFIG,BUILDING_EXAMPLES){ + message("BUILDING_EXAMPLES") + LIBS += -L$${DESTDIR} + LIBS += -lPythonQt_QtAll$${DEBUG_EXT} + LIBS += -lPythonQt$${DEBUG_EXT} + INCLUDEPATH += $${PWD}/../src \ + $${PWD}/../extensions/PythonQt_QtAll +} diff --git a/examples/CPPPyWrapperExample/CPPPyWrapperExample.pro b/examples/CPPPyWrapperExample/CPPPyWrapperExample.pro --- a/examples/CPPPyWrapperExample/CPPPyWrapperExample.pro +++ b/examples/CPPPyWrapperExample/CPPPyWrapperExample.pro @@ -11,8 +11,7 @@ contains(QT_MAJOR_VERSION, 5) { } -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL +CONFIG+=BUILDING_EXAMPLES include ( ../../build/pythonqt.prf ) SOURCES += \ diff --git a/examples/NicePyConsole/NicePyConsole.pro b/examples/NicePyConsole/NicePyConsole.pro --- a/examples/NicePyConsole/NicePyConsole.pro +++ b/examples/NicePyConsole/NicePyConsole.pro @@ -9,11 +9,8 @@ contains(QT_MAJOR_VERSION, 5) { mac:CONFIG-= app_bundle -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL +CONFIG+=BUILDING_EXAMPLES include ( ../../build/pythonqt.prf ) -include ( ../../build/PythonQt_QtAll.prf ) - HEADERS += \ SimpleConsole.h \ diff --git a/examples/PyCPPWrapperExample/PyCPPWrapperExample.pro b/examples/PyCPPWrapperExample/PyCPPWrapperExample.pro --- a/examples/PyCPPWrapperExample/PyCPPWrapperExample.pro +++ b/examples/PyCPPWrapperExample/PyCPPWrapperExample.pro @@ -13,8 +13,7 @@ contains(QT_MAJOR_VERSION, 5) { QT += widgets } -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL +CONFIG+=BUILDING_EXAMPLES include ( ../../build/pythonqt.prf ) HEADERS += \ diff --git a/examples/PyCustomMetaTypeExample/PyCustomMetaTypeExample.pro b/examples/PyCustomMetaTypeExample/PyCustomMetaTypeExample.pro --- a/examples/PyCustomMetaTypeExample/PyCustomMetaTypeExample.pro +++ b/examples/PyCustomMetaTypeExample/PyCustomMetaTypeExample.pro @@ -13,9 +13,9 @@ contains(QT_MAJOR_VERSION, 5) { QT += widgets } -include ( ../../build/common.prf ) -include ( ../../build/PythonQt.prf ) - +CONFIG+=BUILDING_EXAMPLES +include ( ../../build/pythonqt.prf ) + HEADERS += \ CustomObject.h diff --git a/examples/PyDecoratorsExample/PyDecoratorsExample.pro b/examples/PyDecoratorsExample/PyDecoratorsExample.pro --- a/examples/PyDecoratorsExample/PyDecoratorsExample.pro +++ b/examples/PyDecoratorsExample/PyDecoratorsExample.pro @@ -9,9 +9,9 @@ TEMPLATE = app DESTDIR = ../../lib -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL -include ( ../../build/pythonqt.prf ) +CONFIG+=BUILDING_EXAMPLES +include ( ../../build/pythonqt.prf ) + contains(QT_MAJOR_VERSION, 5) { QT += widgets diff --git a/examples/PyGettingStarted/PyGettingStarted.pro b/examples/PyGettingStarted/PyGettingStarted.pro --- a/examples/PyGettingStarted/PyGettingStarted.pro +++ b/examples/PyGettingStarted/PyGettingStarted.pro @@ -15,10 +15,11 @@ contains(QT_MAJOR_VERSION, 5) { QT += widgets } -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL +CONFIG+=BUILDING_EXAMPLES include ( ../../build/pythonqt.prf ) + + SOURCES += \ main.cpp diff --git a/examples/PyGuiExample/PyGuiExample.pro b/examples/PyGuiExample/PyGuiExample.pro --- a/examples/PyGuiExample/PyGuiExample.pro +++ b/examples/PyGuiExample/PyGuiExample.pro @@ -16,10 +16,9 @@ contains(QT_MAJOR_VERSION, 5) { } -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL +CONFIG+=BUILDING_EXAMPLES include ( ../../build/pythonqt.prf ) -include ( ../../build/PythonQt_QtAll.prf ) + SOURCES += \ main.cpp diff --git a/examples/PyLauncher/PyLauncher.pro b/examples/PyLauncher/PyLauncher.pro --- a/examples/PyLauncher/PyLauncher.pro +++ b/examples/PyLauncher/PyLauncher.pro @@ -15,10 +15,9 @@ contains(QT_MAJOR_VERSION, 5) { QT += widgets } -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL -include ( ../../build/pythonqt.prf ) -include ( ../../build/PythonQt_QtAll.prf ) +CONFIG+=BUILDING_EXAMPLES +include ( ../../build/pythonqt.prf ) + SOURCES += \ main.cpp diff --git a/examples/PyScriptingConsole/PyScriptingConsole.pro b/examples/PyScriptingConsole/PyScriptingConsole.pro --- a/examples/PyScriptingConsole/PyScriptingConsole.pro +++ b/examples/PyScriptingConsole/PyScriptingConsole.pro @@ -15,10 +15,9 @@ contains(QT_MAJOR_VERSION, 5) { mac:CONFIG-= app_bundle -include ( ../../build/common.prf ) -CONFIG+=BUILDING_QTALL +CONFIG+=BUILDING_EXAMPLES include ( ../../build/pythonqt.prf ) -include ( ../../build/PythonQt_QtAll.prf ) + HEADERS += \ PyExampleObject.h diff --git a/tests/tests.pro b/tests/tests.pro --- a/tests/tests.pro +++ b/tests/tests.pro @@ -13,9 +13,9 @@ mac { QT += testlib -include ( ../build/common.prf ) CONFIG+=BUILDING_QTALL include ( ../build/pythonqt.prf ) +INCLUDEPATH += ../src contains(QT_MAJOR_VERSION, 5) { QT += widgets