diff options
author | Kent Hansen <kent.hansen@nokia.com> | 2012-05-10 15:41:29 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-14 10:12:24 +0200 |
commit | 35dd4cbd3d09fbcc11804995b65dd8dea03da5ee (patch) | |
tree | 08d53d24bd88eb8e010de924d185faa83fd2a972 /src | |
parent | 139c020ed3aebed015e420886d524f50bcc9b52b (diff) |
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 <Friedemann.Kleint@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/compatibility/compatibility.pro | 33 | ||||
-rw-r--r-- | src/src.pro | 2 |
2 files changed, 0 insertions, 35 deletions
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 |