From e59d06ba001fa403e306a32806fc5af70fbe9e29 Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Date: Wed, 18 Apr 2012 13:54:50 +0200
Subject: [PATCH] Fix compilation with Qt 5.
Account for api_changes.
Change-Id: I9ac9738be9364bbb291c4870c5df1c24818065b8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
---
src/libs/extensionsystem/pluginmanager.cpp | 10 +++++++---
src/libs/qmleditorwidgets/easingpane/easingpane.pri | 6 +++++-
src/plugins/texteditor/codecselector.cpp | 5 -----
src/plugins/texteditor/codecselector.h | 3 +--
4 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp
index e3164f04121..cd311c9858b 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 22dfd0f76da..1002ad27947 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 b9a254461d6..f74ea535713 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 c654a54c62c..2b114dfe227 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);
--
GitLab