summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/plugins/android/androidqtversionfactory.cpp3
-rw-r--r--src/plugins/android/androidqtversionfactory.h2
-rw-r--r--src/plugins/ios/iosqtversionfactory.cpp3
-rw-r--r--src/plugins/ios/iosqtversionfactory.h2
-rw-r--r--src/plugins/qnx/qnxqtversionfactory.cpp3
-rw-r--r--src/plugins/qnx/qnxqtversionfactory.h3
-rw-r--r--src/plugins/qtsupport/desktopqtversionfactory.cpp3
-rw-r--r--src/plugins/qtsupport/desktopqtversionfactory.h2
-rw-r--r--src/plugins/qtsupport/qtsupportconstants.h2
-rw-r--r--src/plugins/qtsupport/qtversionfactory.cpp9
-rw-r--r--src/plugins/qtsupport/qtversionfactory.h10
-rw-r--r--src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp3
-rw-r--r--src/plugins/remotelinux/embeddedlinuxqtversionfactory.h2
-rw-r--r--src/plugins/winrt/winrtqtversionfactory.cpp6
-rw-r--r--src/plugins/winrt/winrtqtversionfactory.h4
15 files changed, 24 insertions, 33 deletions
diff --git a/src/plugins/android/androidqtversionfactory.cpp b/src/plugins/android/androidqtversionfactory.cpp
index bf30be935c..b3e5863601 100644
--- a/src/plugins/android/androidqtversionfactory.cpp
+++ b/src/plugins/android/androidqtversionfactory.cpp
@@ -33,8 +33,7 @@
namespace Android {
namespace Internal {
-AndroidQtVersionFactory::AndroidQtVersionFactory(QObject *parent)
- : QtSupport::QtVersionFactory(parent)
+AndroidQtVersionFactory::AndroidQtVersionFactory()
{
setQtVersionCreator([] { return new AndroidQtVersion; });
setSupportedType(Constants::ANDROIDQT);
diff --git a/src/plugins/android/androidqtversionfactory.h b/src/plugins/android/androidqtversionfactory.h
index 47e6ec9e14..789db4c290 100644
--- a/src/plugins/android/androidqtversionfactory.h
+++ b/src/plugins/android/androidqtversionfactory.h
@@ -33,7 +33,7 @@ namespace Internal {
class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
- explicit AndroidQtVersionFactory(QObject *parent = nullptr);
+ AndroidQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override;
diff --git a/src/plugins/ios/iosqtversionfactory.cpp b/src/plugins/ios/iosqtversionfactory.cpp
index d03eee1e14..99ca2b51ad 100644
--- a/src/plugins/ios/iosqtversionfactory.cpp
+++ b/src/plugins/ios/iosqtversionfactory.cpp
@@ -32,8 +32,7 @@
namespace Ios {
namespace Internal {
-IosQtVersionFactory::IosQtVersionFactory(QObject *parent)
- : QtSupport::QtVersionFactory(parent)
+IosQtVersionFactory::IosQtVersionFactory()
{
setQtVersionCreator([] { return new IosQtVersion; });
setSupportedType(Constants::IOSQT);
diff --git a/src/plugins/ios/iosqtversionfactory.h b/src/plugins/ios/iosqtversionfactory.h
index 1e00360817..230fd28f4f 100644
--- a/src/plugins/ios/iosqtversionfactory.h
+++ b/src/plugins/ios/iosqtversionfactory.h
@@ -33,7 +33,7 @@ namespace Internal {
class IosQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
- explicit IosQtVersionFactory(QObject *parent = nullptr);
+ IosQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false,
diff --git a/src/plugins/qnx/qnxqtversionfactory.cpp b/src/plugins/qnx/qnxqtversionfactory.cpp
index 37b3b2098c..5d2a23d7e7 100644
--- a/src/plugins/qnx/qnxqtversionfactory.cpp
+++ b/src/plugins/qnx/qnxqtversionfactory.cpp
@@ -33,8 +33,7 @@
using namespace Qnx;
using namespace Qnx::Internal;
-QnxQtVersionFactory::QnxQtVersionFactory(QObject *parent) :
- QtSupport::QtVersionFactory(parent)
+QnxQtVersionFactory::QnxQtVersionFactory()
{
setQtVersionCreator([] { return new QnxQtVersion; });
setSupportedType(Constants::QNX_QNX_QT);
diff --git a/src/plugins/qnx/qnxqtversionfactory.h b/src/plugins/qnx/qnxqtversionfactory.h
index 382f46dc50..8c842af9ed 100644
--- a/src/plugins/qnx/qnxqtversionfactory.h
+++ b/src/plugins/qnx/qnxqtversionfactory.h
@@ -32,9 +32,8 @@ namespace Internal {
class QnxQtVersionFactory : public QtSupport::QtVersionFactory
{
- Q_OBJECT
public:
- explicit QnxQtVersionFactory(QObject *parent = nullptr);
+ QnxQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath,
ProFileEvaluator *evaluator,
diff --git a/src/plugins/qtsupport/desktopqtversionfactory.cpp b/src/plugins/qtsupport/desktopqtversionfactory.cpp
index 324c9704f7..5f27d5c250 100644
--- a/src/plugins/qtsupport/desktopqtversionfactory.cpp
+++ b/src/plugins/qtsupport/desktopqtversionfactory.cpp
@@ -30,8 +30,7 @@
using namespace QtSupport;
using namespace QtSupport::Internal;
-DesktopQtVersionFactory::DesktopQtVersionFactory(QObject *parent)
- : QtVersionFactory(parent)
+DesktopQtVersionFactory::DesktopQtVersionFactory()
{
setQtVersionCreator([] { return new DesktopQtVersion; });
setSupportedType(Constants::DESKTOPQT);
diff --git a/src/plugins/qtsupport/desktopqtversionfactory.h b/src/plugins/qtsupport/desktopqtversionfactory.h
index 60de0d5a3d..c650019fcb 100644
--- a/src/plugins/qtsupport/desktopqtversionfactory.h
+++ b/src/plugins/qtsupport/desktopqtversionfactory.h
@@ -33,7 +33,7 @@ namespace Internal {
class DesktopQtVersionFactory : public QtVersionFactory
{
public:
- explicit DesktopQtVersionFactory(QObject *parent = nullptr);
+ DesktopQtVersionFactory();
BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false, const QString &autoDetectionSource = QString()) override;
diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h
index 202378ef2e..a674dea1a7 100644
--- a/src/plugins/qtsupport/qtsupportconstants.h
+++ b/src/plugins/qtsupport/qtsupportconstants.h
@@ -25,6 +25,8 @@
#pragma once
+#include <QtGlobal>
+
namespace QtSupport {
namespace Constants {
diff --git a/src/plugins/qtsupport/qtversionfactory.cpp b/src/plugins/qtsupport/qtversionfactory.cpp
index ad16aa0ebd..2337adaeec 100644
--- a/src/plugins/qtsupport/qtversionfactory.cpp
+++ b/src/plugins/qtsupport/qtversionfactory.cpp
@@ -42,8 +42,7 @@ using namespace QtSupport::Internal;
static QList<QtVersionFactory *> g_qtVersionFactories;
-QtVersionFactory::QtVersionFactory(QObject *parent) :
- QObject(parent)
+QtVersionFactory::QtVersionFactory()
{
g_qtVersionFactories.append(this);
}
@@ -106,8 +105,10 @@ BaseQtVersion *QtVersionFactory::createQtVersionFromQMakePath(const Utils::FileN
}
}
ProFileCacheManager::instance()->decRefCount();
- if (error)
- *error = tr("No factory found for qmake: \"%1\"").arg(qmakePath.toUserOutput());
+ if (error) {
+ *error = QCoreApplication::translate("QtSupport::QtVersionFactory",
+ "No factory found for qmake: \"%1\"").arg(qmakePath.toUserOutput());
+ }
return 0;
}
diff --git a/src/plugins/qtsupport/qtversionfactory.h b/src/plugins/qtsupport/qtversionfactory.h
index 2d4d817870..8ae0926a19 100644
--- a/src/plugins/qtsupport/qtversionfactory.h
+++ b/src/plugins/qtsupport/qtversionfactory.h
@@ -27,11 +27,9 @@
#include "qtsupport_global.h"
-#include <QObject>
#include <QVariantMap>
QT_BEGIN_NAMESPACE
-class QSettings;
class ProFileEvaluator;
QT_END_NAMESPACE
@@ -41,13 +39,11 @@ namespace QtSupport {
class BaseQtVersion;
-class QTSUPPORT_EXPORT QtVersionFactory : public QObject
+class QTSUPPORT_EXPORT QtVersionFactory
{
- Q_OBJECT
-
public:
- explicit QtVersionFactory(QObject *parent = nullptr);
- ~QtVersionFactory() override;
+ QtVersionFactory();
+ virtual ~QtVersionFactory();
static const QList<QtVersionFactory *> allQtVersionFactories();
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
index 44876f915c..74d5d1a1ea 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
+++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
@@ -33,8 +33,7 @@
namespace RemoteLinux {
namespace Internal {
-EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory(QObject *parent)
- : QtSupport::QtVersionFactory(parent)
+EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
{
setQtVersionCreator([] { return new EmbeddedLinuxQtVersion; });
setSupportedType(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
diff --git a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
index 54b6f58946..e73ef8f6e7 100644
--- a/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
+++ b/src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
@@ -33,7 +33,7 @@ namespace Internal {
class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
- explicit EmbeddedLinuxQtVersionFactory(QObject *parent = nullptr);
+ EmbeddedLinuxQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false,
diff --git a/src/plugins/winrt/winrtqtversionfactory.cpp b/src/plugins/winrt/winrtqtversionfactory.cpp
index 0f0adae9b9..c2b08aef8c 100644
--- a/src/plugins/winrt/winrtqtversionfactory.cpp
+++ b/src/plugins/winrt/winrtqtversionfactory.cpp
@@ -33,8 +33,7 @@
namespace WinRt {
namespace Internal {
-WinRtQtVersionFactory::WinRtQtVersionFactory(QObject *parent)
- : QtSupport::QtVersionFactory(parent)
+WinRtQtVersionFactory::WinRtQtVersionFactory()
{
setQtVersionCreator([] { return new WinRtQtVersion; });
setSupportedType(Constants::WINRT_WINRTQT);
@@ -54,8 +53,7 @@ QtSupport::BaseQtVersion *WinRtQtVersionFactory::create(const Utils::FileName &q
-WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory(QObject *parent)
- : QtSupport::QtVersionFactory(parent)
+WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()
{
setQtVersionCreator([] { return new WinRtPhoneQtVersion; });
setSupportedType(Constants::WINRT_WINPHONEQT);
diff --git a/src/plugins/winrt/winrtqtversionfactory.h b/src/plugins/winrt/winrtqtversionfactory.h
index 886738fab0..e3e93dfc23 100644
--- a/src/plugins/winrt/winrtqtversionfactory.h
+++ b/src/plugins/winrt/winrtqtversionfactory.h
@@ -33,7 +33,7 @@ namespace Internal {
class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
- explicit WinRtQtVersionFactory(QObject *parent = nullptr);
+ WinRtQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false, const QString &autoDetectionSource = QString());
@@ -42,7 +42,7 @@ public:
class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
- explicit WinRtPhoneQtVersionFactory(QObject *parent = nullptr);
+ WinRtPhoneQtVersionFactory();
QtSupport::BaseQtVersion *create(const Utils::FileName &qmakePath, ProFileEvaluator *evaluator,
bool isAutoDetected = false, const QString &autoDetectionSource = QString());
View Lorry Controller Status