diff options
| author | hjk <qthjk@ovi.com> | 2012-12-14 14:55:20 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 11:12:49 +0100 |
| commit | 2dc6ad8adf7f98d55aca5def8ee3f9c12934fb7b (patch) | |
| tree | 1f62bdadaf551a3c5db5ee9cbcf69e1478c4f613 /examples | |
| parent | d6f2d8dcb6dbee89fc55bd439ab4a837f4f9fb4c (diff) | |
Fix building of the painting examples that use shared code
Task-number: QTCREATORBUG-8437
Change-Id: I66031184a009f3b26ad4af36b1975204e8fa80dc
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/painting/shared/shared.pri | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/examples/widgets/painting/shared/shared.pri b/examples/widgets/painting/shared/shared.pri index 2d6b3c78f9..6aef1bdd5b 100644 --- a/examples/widgets/painting/shared/shared.pri +++ b/examples/widgets/painting/shared/shared.pri @@ -1,20 +1,19 @@ -INCLUDEPATH += $$SHARED_FOLDER +INCLUDEPATH += $$PWD -build_all:!build_pass { - CONFIG -= build_all - CONFIG += release -} -contains(CONFIG, debug_and_release_target) { - CONFIG(debug, debug|release) { - QMAKE_LIBDIR += $$SHARED_FOLDER/debug - } else { - QMAKE_LIBDIR += $$SHARED_FOLDER/release - } -} else { - QMAKE_LIBDIR += $$SHARED_FOLDER +contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) { + DEFINES += QT_OPENGL_SUPPORT + QT += opengl widgets } -hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a -hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a -!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared +SOURCES += \ + $$PWD/arthurstyle.cpp\ + $$PWD/arthurwidgets.cpp \ + $$PWD/hoverpoints.cpp + +HEADERS += \ + $$PWD/arthurstyle.h \ + $$PWD/arthurwidgets.h \ + $$PWD/hoverpoints.h + +RESOURCES += $$PWD/shared.qrc |