From f99c1b5f1c7924f9594cbb1374bfcf29db49d492 Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 19 Jan 2012 08:35:49 +0100 Subject: 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 Reviewed-by: Denis Dzyubenko Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt.prf | 9 --------- 1 file changed, 9 deletions(-) diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index b0ee214a28..d288930eaf 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -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 -- cgit v1.2.3