Remove warning and automagic for "missing QT += quick"
This reverts commit 613183ff8c101fe544814259197d897b3540bc85 ("Automatically add QtQuick module if only QtDeclarative is specified"). The QtQuick module has been around for a while now, and the need to port to it has been duly announced. After this commit, projects that use the QtQuick 2 API (QQuickItem and friends) will explicitly have to add QT += quick. Change-Id: Ie5e6d438431a0c736e214c28c0d1ba1189b4ee06 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
This commit is contained in:
parent
ce2428c608
commit
f99c1b5f1c
@ -1,14 +1,5 @@
|
||||
CONFIG *= moc thread
|
||||
|
||||
contains(QT, declarative)|contains(QT, declarative-private):!contains(DEFINES, QT_BUILD_QUICK_LIB):!contains(QT, quick):!contains(QT, quick-private) {
|
||||
warning("This project is using the declarative module, but not the quick module.")
|
||||
warning("If you're using QtQuick-specific APIs (QQuickItem, SceneGraph et al), you should add")
|
||||
warning(" QT += quick")
|
||||
warning("to your project's .pro file.")
|
||||
contains(QT, declarative-private):QT += quick-private
|
||||
else:QT += quick
|
||||
}
|
||||
|
||||
#handle defines
|
||||
win32 {
|
||||
qt_static:DEFINES += QT_NODLL
|
||||
|
Loading…
x
Reference in New Issue
Block a user