diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index e3164f0412102ea45b28969216c0352756fd68ba..cd311c9858bbb8dd6bc8f9d0abee377058b5109b 100644
--- a/src/libs/extensionsystem/pluginmanager.cpp
+++ b/src/libs/extensionsystem/pluginmanager.cpp
@@ -675,9 +675,13 @@ void PluginManager::startTests()
         methods.append("arg0");
         // We only want slots starting with "test"
         for (int i = mo->methodOffset(); i < mo->methodCount(); ++i) {
-            if (QByteArray(mo->method(i).signature()).startsWith("test") &&
-                !QByteArray(mo->method(i).signature()).endsWith("_data()")) {
-                QString method = QString::fromLatin1(mo->method(i).signature());
+#if QT_VERSION >= 0x050000
+            const QByteArray signature = mo->method(i).methodSignature();
+#else
+            const QByteArray signature = mo->method(i).signature();
+#endif
+            if (signature.startsWith("test") && !signature.endsWith("_data()")) {
+                const QString method = QString::fromLatin1(signature);
                 methods.append(method.left(method.size()-2));
             }
         }
diff --git a/src/libs/qmleditorwidgets/easingpane/easingpane.pri b/src/libs/qmleditorwidgets/easingpane/easingpane.pri
index 22dfd0f76da458ceb48b4331d00193364db50e43..1002ad2794761312a4ee99038ecea5fa889447a3 100644
--- a/src/libs/qmleditorwidgets/easingpane/easingpane.pri
+++ b/src/libs/qmleditorwidgets/easingpane/easingpane.pri
@@ -6,6 +6,10 @@ SOURCES += $$PWD/easinggraph.cpp \
 HEADERS += $$PWD/easinggraph.h \
     $$PWD/easingcontextpane.h
 
-QT += declarative
+greaterThan(QT_MAJOR_VERSION, 4) {
+    QT += quick1
+} else {
+    QT += declarative
+}
 RESOURCES += $$PWD/easingpane.qrc
 FORMS += $$PWD/easingcontextpane.ui
diff --git a/src/plugins/texteditor/codecselector.cpp b/src/plugins/texteditor/codecselector.cpp
index b9a254461d659ec1c03c147b473ef2914d133c02..f74ea535713293f57c28fae164f42c55619b43c6 100644
--- a/src/plugins/texteditor/codecselector.cpp
+++ b/src/plugins/texteditor/codecselector.cpp
@@ -158,11 +158,6 @@ QTextCodec *CodecSelector::selectedCodec() const
     return 0;
 }
 
-CodecSelector::Result CodecSelector::exec()
-{
-    return (Result) QDialog::exec();
-}
-
 void CodecSelector::buttonClicked(QAbstractButton *button)
 {
     Result result =  Cancel;
diff --git a/src/plugins/texteditor/codecselector.h b/src/plugins/texteditor/codecselector.h
index c654a54c62c1af864f68f1dbb1fff8156396a07c..2b114dfe227d13691962ca5eea87379257d72bab 100644
--- a/src/plugins/texteditor/codecselector.h
+++ b/src/plugins/texteditor/codecselector.h
@@ -55,12 +55,11 @@ public:
 
     QTextCodec *selectedCodec() const;
 
+    // Enumeration returned from QDialog::exec()
     enum Result {
         Cancel, Reload, Save
     };
 
-    Result exec();
-
 private slots:
     void updateButtons();
     void buttonClicked(QAbstractButton *button);