From 35dd4cbd3d09fbcc11804995b65dd8dea03da5ee Mon Sep 17 00:00:00 2001 From: Kent Hansen Date: Thu, 10 May 2012 15:41:29 +0200 Subject: Remove QtDeclarative compatibility module When the QtDeclarative module was renamed to QtQml, a compatibility module was introduced to avoid disrupting downstream projects. Time has passed, and it's now appropriate to remove this module. Existing projects that haven't ported can still use the bin/rename-qtdeclarative-symbols.sh script to ease the porting. Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea Reviewed-by: Friedemann Kleint Reviewed-by: Matthew Vogt Reviewed-by: Lars Knoll Reviewed-by: Donald Carr --- src/compatibility/compatibility.pro | 33 --------------------------------- src/src.pro | 2 -- 2 files changed, 35 deletions(-) delete mode 100644 src/compatibility/compatibility.pro (limited to 'src') diff --git a/src/compatibility/compatibility.pro b/src/compatibility/compatibility.pro deleted file mode 100644 index 0996839fa8..0000000000 --- a/src/compatibility/compatibility.pro +++ /dev/null @@ -1,33 +0,0 @@ -TARGET = QtDeclarative -TEMPLATE = subdirs - -MODULE_PRI = ../../modules/qt_declarative.pri - -QT = qml - -pritarget.path = $$[QT_HOST_DATA]/mkspecs/modules -pritarget.files = $$MODULE_PRI -INSTALLS += pritarget - -#load up the headers info -CONFIG += qt_install_headers -HEADERS_PRI = ../../include/QtDeclarative/headers.pri -include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI) - -INSTALL_HEADERS = $$SYNCQT.HEADER_FILES - -flat_headers.files = $$INSTALL_HEADERS -flat_headers.path = $$[QT_INSTALL_HEADERS]/Qt -INSTALLS += flat_headers - -class_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET -class_headers.files = $$SYNCQT.HEADER_CLASSES -INSTALLS += class_headers - -targ_headers.files = $$INSTALL_HEADERS -targ_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET -INSTALLS += targ_headers - -private_headers.files = $$SYNCQT.PRIVATE_HEADER_FILES -private_headers.path = $$[QT_INSTALL_HEADERS]/$$TARGET/$${QT.declarative.VERSION}/$$TARGET/private -INSTALLS += private_headers diff --git a/src/src.pro b/src/src.pro index 7631910c3c..a591ffc9a0 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,5 +6,3 @@ contains(QT_CONFIG, qmltest): SUBDIRS += qmltest SUBDIRS += imports SUBDIRS += qmldevtools - -SUBDIRS += compatibility -- cgit v1.2.3