From 79fed8757e26f946745eec9d8bba8b91aeb1a742 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Mon, 15 Oct 2012 15:58:44 +0200 Subject: Rename the QtQuick1 module back to QtDeclarative Matches the name that this code used to have in Qt 4. - Adapt library, change import path to 'QtDeclarative'. - Update the tests and examples to match the new library name. - Rename qtquick1global{_p}.h to qtdeclarativeglobal.h. - Change exports back to Q_DECLARATIVE_[PRIVATE_]EXPORT, like it was in Qt 4 and matching the library name again. This also changes the include guards in qtdeclarativeglobal{,_p}.h. - Fix occurrence of quick_debug in tools/qml/qml.pro. Change-Id: Ibb1fb2e503f90943a2125e4ac3cc4eca3369ca3f Reviewed-by: hjk Reviewed-by: Friedemann Kleint Reviewed-by: Lars Knoll --- tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro') diff --git a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro index 5b76ece3..63979826 100644 --- a/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro +++ b/tests/auto/declarative/qdeclarativegridview/qdeclarativegridview.pro @@ -2,7 +2,7 @@ CONFIG += testcase TARGET = tst_qdeclarativegridview QT += testlib -contains(QT_CONFIG,quick1): QT += quick1 quick1-private widgets widgets-private gui gui-private core-private script-private +contains(QT_CONFIG,declarative): QT += declarative declarative-private widgets widgets-private gui gui-private core-private script-private macx:CONFIG -= app_bundle SOURCES += tst_qdeclarativegridview.cpp -- cgit v1.2.3