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-18 10:27:54 +0100 |
| commit | 5a2fc03ef40d9b2a8384abffe3f1cb9d943b9acc (patch) | |
| tree | 8a48a987082b2bdf3e154f016214df7563b15b2d /examples | |
| parent | daef188711e4c7459eb8d399778d1766979e80e0 (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>
(cherry picked from commit 2dc6ad8adf7f98d55aca5def8ee3f9c12934fb7b)
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 |