Removing deprecated declarative feedback import

Change-Id: Ia3017227dc66b281f7e3cb067458f6655a2aac46
Reviewed-by: Jaakko Korpela <jaakko.korpela@nokia.com>

4 files changed, 9 insertions, 34 deletions

diff --git a/src/imports/feedback/feedback.pro b/src/imports/feedback/feedback.pro
index be573ba..a672b48 100644
--- a/src/imports/feedback/feedback.pro
+++ b/src/imports/feedback/feedback.pro
@@ -1,6 +1,5 @@
 TARGET  = declarative_feedback
 TARGETPATH = QtFeedback
-OLDTARGETPATH = Qt/feedback
 include(qfeedbackimport.pri)
 target.path = $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
 DESTDIR = $$QT.feedback.imports/$$TARGETPATH
@@ -8,9 +7,7 @@ INSTALLS += target
 
 qmldir.files += $$PWD/qmldir
 qmldir.path +=  $$[QT_INSTALL_IMPORTS]/$$TARGETPATH
-oldqmldir.files += $$PWD/old/qmldir
-oldqmldir.path += $$[QT_INSTALL_IMPORTS]/$$OLDTARGETPATH
-INSTALLS += qmldir oldqmldir
+INSTALLS += qmldir
 
 QT += declarative feedback
 
diff --git a/src/imports/feedback/old/qmldir b/src/imports/feedback/old/qmldir
deleted file mode 100644
index 4339a9b..0000000
--- a/src/imports/feedback/old/qmldir
+++ /dev/null
@@ -1 +0,0 @@
-plugin declarative_feedback ../../QtFeedback/
diff --git a/src/imports/feedback/plugin.cpp b/src/imports/feedback/plugin.cpp
index 6041125..5175aca 100644
--- a/src/imports/feedback/plugin.cpp
+++ b/src/imports/feedback/plugin.cpp
@@ -64,26 +64,16 @@ class QDeclarativeFeedbackPlugin : public QDeclarativeExtensionPlugin
 public:
     virtual void registerTypes(const char *uri)
     {
-        const char *currentUri = "QtFeedback";
-        // Support for this will be removed. See: https://bugreports.qt-project.org/browse/QTBUG-24285
-        const char *oldUri = "Qt.feedback";
-        Q_ASSERT(QLatin1String(uri) == currentUri || QLatin1String(uri) == oldUri);
-        Q_UNUSED(uri);
+        Q_ASSERT(QLatin1String(uri) == QLatin1String("QtFeedback"));
 
         int major = 5;
         int minor = 0;
-        qmlRegisterUncreatableType<QDeclarativeFeedbackEffect>(currentUri, major, minor, "Feedback", "this is the feedback namespace");
-        qmlRegisterUncreatableType<QDeclarativeFeedbackEffect>(currentUri, major, minor, "FeedbackEffect", "this is the base feedback effect class");
-        qmlRegisterType<QDeclarativeFeedbackActuator>(currentUri, major, minor, "Actuator");
-        qmlRegisterType<QDeclarativeFileEffect>(currentUri, major, minor, "FileEffect");
-        qmlRegisterType<QDeclarativeHapticsEffect>(currentUri, major, minor, "HapticsEffect");
-        qmlRegisterType<QDeclarativeThemeEffect>(currentUri, major, minor, "ThemeEffect");
-        qmlRegisterUncreatableType<QDeclarativeFeedbackEffect>(oldUri, major, minor, "Feedback", "this is the feedback namespace");
-        qmlRegisterUncreatableType<QDeclarativeFeedbackEffect>(oldUri, major, minor, "FeedbackEffect", "this is the base feedback effect class");
-        qmlRegisterType<QDeclarativeFeedbackActuator>(oldUri, major, minor, "Actuator");
-        qmlRegisterType<QDeclarativeFileEffect>(oldUri, major, minor, "FileEffect");
-        qmlRegisterType<QDeclarativeHapticsEffect>(oldUri, major, minor, "HapticsEffect");
-        qmlRegisterType<QDeclarativeThemeEffect>(oldUri, major, minor, "ThemeEffect");
+        qmlRegisterUncreatableType<QDeclarativeFeedbackEffect>(uri, major, minor, "Feedback", "this is the feedback namespace");
+        qmlRegisterUncreatableType<QDeclarativeFeedbackEffect>(uri, major, minor, "FeedbackEffect", "this is the base feedback effect class");
+        qmlRegisterType<QDeclarativeFeedbackActuator>(uri, major, minor, "Actuator");
+        qmlRegisterType<QDeclarativeFileEffect>(uri, major, minor, "FileEffect");
+        qmlRegisterType<QDeclarativeHapticsEffect>(uri, major, minor, "HapticsEffect");
+        qmlRegisterType<QDeclarativeThemeEffect>(uri, major, minor, "ThemeEffect");
         qmlRegisterModuleApi("QtFeedback.ThemeEffect", major, minor, createDeclarativeThemeEfect);
     }
 };
diff --git a/src/imports/feedback/qfeedbackimport.pri b/src/imports/feedback/qfeedbackimport.pri
index 48b4a02..293b637 100644
--- a/src/imports/feedback/qfeedbackimport.pri
+++ b/src/imports/feedback/qfeedbackimport.pri
@@ -23,18 +23,7 @@ copy2build.CONFIG += no_link
 # `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
 copy2build.CONFIG += no_clean
 
-# Another qmldir copied to the old import path pointing to the plugin in the new import path.
-OLDQMLDIRFILE = $${_PRO_FILE_PWD_}/old/qmldir
-oldcopy2build.input = OLDQMLDIRFILE
-oldcopy2build.output = $$QT.feedback.imports/$$OLDTARGETPATH/qmldir
-!contains(TEMPLATE_PREFIX, vc):oldcopy2build.variable_out = PRE_TARGETDEPS
-oldcopy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
-oldcopy2build.name = COPY ${QMAKE_FILE_IN}
-oldcopy2build.CONFIG += no_link
-# `clean' should leave the build in a runnable state, which means it shouldn't delete qmldir
-oldcopy2build.CONFIG += no_clean
-
-QMAKE_EXTRA_COMPILERS += copy2build oldcopy2build
+QMAKE_EXTRA_COMPILERS += copy2build
 
 TARGET = $$qtLibraryTarget($$TARGET)
 contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols