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 2dc6ad8adf
)
This commit is contained in:
parent
daef188711
commit
5a2fc03ef4
@ -1,20 +1,19 @@
|
|||||||
INCLUDEPATH += $$SHARED_FOLDER
|
INCLUDEPATH += $$PWD
|
||||||
|
|
||||||
build_all:!build_pass {
|
contains(QT_CONFIG, opengl)|contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2) {
|
||||||
CONFIG -= build_all
|
DEFINES += QT_OPENGL_SUPPORT
|
||||||
CONFIG += release
|
QT += opengl widgets
|
||||||
}
|
|
||||||
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
|
|
||||||
}
|
}
|
||||||
|
|
||||||
hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
|
SOURCES += \
|
||||||
hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
|
$$PWD/arthurstyle.cpp\
|
||||||
!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared
|
$$PWD/arthurwidgets.cpp \
|
||||||
|
$$PWD/hoverpoints.cpp
|
||||||
|
|
||||||
|
HEADERS += \
|
||||||
|
$$PWD/arthurstyle.h \
|
||||||
|
$$PWD/arthurwidgets.h \
|
||||||
|
$$PWD/hoverpoints.h
|
||||||
|
|
||||||
|
RESOURCES += $$PWD/shared.qrc
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user