feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QtSupport et al: Move QtVersionFactory to *QtVersion implementation

Browse Source 
At most a dozen lines each left.

Change-Id: Ifbf34f814266ba7bee83d3fee9db831eb450dfc4
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2019-02-14 12:29:00 +01:00
parent 631b982aaa
commit 06cc09a30f
44 changed files with 167 additions and 553 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/android/android.pro
View File

@@ -19,7 +19,6 @@ HEADERS += \
androidrunner.h \
androidrunnerworker.h \
androiddebugsupport.h \
androidqtversionfactory.h \
androidqtversion.h \
androidcreatekeystorecertificate.h \
javaparser.h \
@@ -67,7 +66,6 @@ SOURCES += \
androidrunner.cpp \
androidrunnerworker.cpp \
androiddebugsupport.cpp \
androidqtversionfactory.cpp \
androidqtversion.cpp \
androidcreatekeystorecertificate.cpp \
javaparser.cpp \

2
src/plugins/android/android.qbs
View File

@@ -75,8 +75,6 @@ Project {
"androidqmltoolingsupport.h",
"androidqtversion.cpp",
"androidqtversion.h",
"androidqtversionfactory.cpp",
"androidqtversionfactory.h",
"androidrunconfiguration.cpp",
"androidrunconfiguration.h",
"androidrunenvironmentaspect.h",

2
src/plugins/android/androidplugin.cpp
View File

@@ -37,7 +37,7 @@
#include "androidpackageinstallationstep.h"
#include "androidpotentialkit.h"
#include "androidqmltoolingsupport.h"
#include "androidqtversionfactory.h"
#include "androidqtversion.h"
#include "androidrunconfiguration.h"
#include "androidruncontrol.h"
#include "androidsettingspage.h"

23
src/plugins/android/androidqtversion.cpp
View File

@@ -42,9 +42,11 @@
#include <proparser/profileevaluator.h>
using namespace Android::Internal;
using namespace ProjectExplorer;
namespace Android {
namespace Internal {
AndroidQtVersion::AndroidQtVersion()
: QtSupport::BaseQtVersion()
{
@@ -154,3 +156,22 @@ QSet<Core::Id> AndroidQtVersion::targetDeviceTypes() const
{
return {Constants::ANDROID_DEVICE_TYPE};
}
// Factory
AndroidQtVersionFactory::AndroidQtVersionFactory()
{
setQtVersionCreator([] { return new AndroidQtVersion; });
setSupportedType(Constants::ANDROIDQT);
setPriority(90);
setRestrictionChecker([](const SetupData &setup) {
return !setup.config.contains("android-no-sdk")
&& (setup.config.contains("android")
|| setup.platforms.contains("android"));
});
}
} // Internal
} // Android

7
src/plugins/android/androidqtversion.h
View File

@@ -26,6 +26,7 @@
#pragma once
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtversionfactory.h>
#include <QCoreApplication>
@@ -62,5 +63,11 @@ private:
mutable int m_minNdk = -1;
};
class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
AndroidQtVersionFactory();
};
} // namespace Internal
} // namespace Android

47
src/plugins/android/androidqtversionfactory.cpp
View File

@@ -1,47 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "androidqtversionfactory.h"
#include "androidqtversion.h"
#include "androidconstants.h"
namespace Android {
namespace Internal {
AndroidQtVersionFactory::AndroidQtVersionFactory()
{
setQtVersionCreator([] { return new AndroidQtVersion; });
setSupportedType(Constants::ANDROIDQT);
setPriority(90);
setRestrictionChecker([](const SetupData &setup) {
return !setup.config.contains("android-no-sdk")
&& (setup.config.contains("android")
|| setup.platforms.contains("android"));
});
}
} // Internal
} // Android

40
src/plugins/android/androidqtversionfactory.h
View File

@@ -1,40 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 BogDan Vatra <bog_dan_ro@yahoo.com>
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include <qtsupport/qtversionfactory.h>
namespace Android {
namespace Internal {
class AndroidQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
AndroidQtVersionFactory();
};
} // namespace Internal
} // namespace Android

2
src/plugins/ios/ios.pro
View File

@@ -15,7 +15,6 @@ HEADERS += \
iossettingswidget.h \
iosrunner.h \
iosdsymbuildstep.h \
iosqtversionfactory.h \
iosqtversion.h \
iosplugin.h \
iosdevicefactory.h \
@@ -42,7 +41,6 @@ SOURCES += \
iossettingswidget.cpp \
iosrunner.cpp \
iosdsymbuildstep.cpp \
iosqtversionfactory.cpp \
iosqtversion.cpp \
iosplugin.cpp \
iosdevicefactory.cpp \

2
src/plugins/ios/ios.qbs
View File

@@ -47,8 +47,6 @@ QtcPlugin {
"iosprobe.h",
"iosqtversion.cpp",
"iosqtversion.h",
"iosqtversionfactory.cpp",
"iosqtversionfactory.h",
"iosrunconfiguration.cpp",
"iosrunconfiguration.h",
"iosrunner.cpp",

2
src/plugins/ios/iosplugin.cpp
View File

@@ -32,7 +32,7 @@
#include "iosdeploystep.h"
#include "iosdevicefactory.h"
#include "iosdsymbuildstep.h"
#include "iosqtversionfactory.h"
#include "iosqtversion.h"
#include "iosrunner.h"
#include "iossettingspage.h"
#include "iossimulator.h"

13
src/plugins/ios/iosqtversion.cpp
View File

@@ -108,3 +108,16 @@ QSet<Core::Id> IosQtVersion::targetDeviceTypes() const
// iOS Qt version supports ios devices as well as simulator.
return {Constants::IOS_DEVICE_TYPE, Constants::IOS_SIMULATOR_TYPE};
}
// Factory
IosQtVersionFactory::IosQtVersionFactory()
{
setQtVersionCreator([] { return new IosQtVersion; });
setSupportedType(Constants::IOSQT);
setPriority(90);
setRestrictionChecker([](const SetupData &setup) {
return setup.platforms.contains("ios");
});
}

7
src/plugins/ios/iosqtversion.h
View File

@@ -26,6 +26,7 @@
#pragma once
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtversionfactory.h>
#include <QCoreApplication>
@@ -54,5 +55,11 @@ public:
QString description() const override;
};
class IosQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
IosQtVersionFactory();
};
} // namespace Internal
} // namespace Ios

45
src/plugins/ios/iosqtversionfactory.cpp
View File

@@ -1,45 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "iosqtversionfactory.h"
#include "iosqtversion.h"
#include "iosconstants.h"
namespace Ios {
namespace Internal {
IosQtVersionFactory::IosQtVersionFactory()
{
setQtVersionCreator([] { return new IosQtVersion; });
setSupportedType(Constants::IOSQT);
setPriority(90);
setRestrictionChecker([](const SetupData &setup) {
return setup.platforms.contains("ios");
});
}
} // Internal
} // Ios

40
src/plugins/ios/iosqtversionfactory.h
View File

@@ -1,40 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include <qtsupport/qtversionfactory.h>
namespace Ios {
namespace Internal {
class IosQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
IosQtVersionFactory();
};
} // namespace Internal
} // namespace Ios

2
src/plugins/qnx/qnx.pro
View File

@@ -10,7 +10,6 @@ SOURCES += qnxplugin.cpp \
qnxrunconfiguration.cpp \
qnxanalyzesupport.cpp \
qnxdebugsupport.cpp \
qnxqtversionfactory.cpp \
qnxqtversion.cpp \
qnxdevice.cpp \
qnxdevicetester.cpp \
@@ -35,7 +34,6 @@ HEADERS += qnxplugin.h\
qnxrunconfiguration.h \
qnxanalyzesupport.h \
qnxdebugsupport.h \
qnxqtversionfactory.h \
qnxqtversion.h \
qnxdevice.h \
qnxdevicetester.h \

2
src/plugins/qnx/qnx.qbs
View File

@@ -57,8 +57,6 @@ QtcPlugin {
"qnxplugin.h",
"qnxqtversion.cpp",
"qnxqtversion.h",
"qnxqtversionfactory.cpp",
"qnxqtversionfactory.h",
"qnxrunconfiguration.cpp",
"qnxrunconfiguration.h",
"qnxutils.cpp",

1
src/plugins/qnx/qnxplugin.cpp
View File

@@ -32,7 +32,6 @@
#include "qnxdevice.h"
#include "qnxdevicefactory.h"
#include "qnxqtversion.h"
#include "qnxqtversionfactory.h"
#include "qnxrunconfiguration.h"
#include "qnxsettingspage.h"
#include "qnxtoolchain.h"

11
src/plugins/qnx/qnxqtversion.cpp
View File

@@ -199,5 +199,16 @@ QList<Utils::EnvironmentItem> QnxQtVersion::environment() const
return QnxUtils::qnxEnvironment(sdpPath());
}
// Factory
QnxQtVersionFactory::QnxQtVersionFactory()
{
setQtVersionCreator([] { return new QnxQtVersion; });
setSupportedType(Constants::QNX_QNX_QT);
setPriority(50);
setRestrictionChecker([](const SetupData &setup) { return setup.isQnx; });
}
} // namespace Internal
} // namespace Qnx

7
src/plugins/qnx/qnxqtversion.h
View File

@@ -29,6 +29,7 @@
#include "qnxqtversion.h"
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtversionfactory.h>
#include <utils/environment.h>
@@ -85,5 +86,11 @@ private:
mutable QList<Utils::EnvironmentItem> m_qnxEnv;
};
class QnxQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
QnxQtVersionFactory();
};
} // namespace Internal
} // namespace Qnx

41
src/plugins/qnx/qnxqtversionfactory.cpp
View File

@@ -1,41 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 BlackBerry Limited. All rights reserved.
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "qnxqtversionfactory.h"
#include "qnxconstants.h"
#include "qnxqtversion.h"
using namespace Qnx;
using namespace Qnx::Internal;
QnxQtVersionFactory::QnxQtVersionFactory()
{
setQtVersionCreator([] { return new QnxQtVersion; });
setSupportedType(Constants::QNX_QNX_QT);
setPriority(50);
setRestrictionChecker([](const SetupData &setup) { return setup.isQnx; });
}

40
src/plugins/qnx/qnxqtversionfactory.h
View File

@@ -1,40 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 BlackBerry Limited. All rights reserved.
** Contact: KDAB (info@kdab.com)
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include <qtsupport/qtversionfactory.h>
namespace Qnx {
namespace Internal {
class QnxQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
QnxQtVersionFactory();
};
} // namespace Internal
} // namespace Qnx

17
src/plugins/qtsupport/desktopqtversion.cpp
View File

@@ -38,7 +38,7 @@
#include <QCoreApplication>
#include <QFileInfo>
using namespace QtSupport;
namespace QtSupport {
DesktopQtVersion::DesktopQtVersion()
: BaseQtVersion()
@@ -119,3 +119,18 @@ QString DesktopQtVersion::qmlsceneCommand() const
DesktopQtVersion::DesktopQtVersion(const DesktopQtVersion &other) = default;
namespace Internal {
// Factory
DesktopQtVersionFactory::DesktopQtVersionFactory()
{
setQtVersionCreator([] { return new DesktopQtVersion; });
setSupportedType(QtSupport::Constants::DESKTOPQT);
setPriority(0); // Lowest of all, we want to be the fallback
// No further restrictions. We are the fallback :) so we don't care what kind of qt it is.
}
} // Internal
} // QtSupport

11
src/plugins/qtsupport/desktopqtversion.h
View File

@@ -25,6 +25,8 @@
#pragma once
#include <qtsupport/qtversionfactory.h>
#include "baseqtversion.h"
namespace QtSupport {
@@ -58,4 +60,13 @@ private:
mutable QString m_qmlsceneCommand;
};
namespace Internal {
class DesktopQtVersionFactory : public QtVersionFactory
{
public:
DesktopQtVersionFactory();
};
} // Internal
} // QtSupport

39
src/plugins/qtsupport/desktopqtversionfactory.cpp
View File

@@ -1,39 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "desktopqtversionfactory.h"
#include "desktopqtversion.h"
#include <qtsupport/qtsupportconstants.h>
using namespace QtSupport;
using namespace QtSupport::Internal;
DesktopQtVersionFactory::DesktopQtVersionFactory()
{
setQtVersionCreator([] { return new DesktopQtVersion; });
setSupportedType(Constants::DESKTOPQT);
setPriority(0); // Lowest of all, we want to be the fallback
// No further restrictions. We are the fallback :) so we don't care what kind of qt it is.
}

40
src/plugins/qtsupport/desktopqtversionfactory.h
View File

@@ -1,40 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include "qtversionfactory.h"
namespace QtSupport {
namespace Internal {
class DesktopQtVersionFactory : public QtVersionFactory
{
public:
DesktopQtVersionFactory();
};
} // Internal
} // QtSupport

2
src/plugins/qtsupport/qtsupport.pro
View File

@@ -28,7 +28,6 @@ HEADERS += \
exampleslistmodel.h \
screenshotcropper.h \
qtconfigwidget.h \
desktopqtversionfactory.h \
desktopqtversion.h \
uicgenerator.h \
qscxmlcgenerator.h
@@ -53,7 +52,6 @@ SOURCES += \
exampleslistmodel.cpp \
screenshotcropper.cpp \
qtconfigwidget.cpp \
desktopqtversionfactory.cpp \
desktopqtversion.cpp \
uicgenerator.cpp \
qscxmlcgenerator.cpp

4
src/plugins/qtsupport/qtsupport.qbs
View File

@@ -104,8 +104,8 @@ Project {
Group {
name: "QtVersion"
files: [
"desktopqtversion.cpp", "desktopqtversion.h",
"desktopqtversionfactory.cpp", "desktopqtversionfactory.h",
"desktopqtversion.cpp",
"desktopqtversion.h",
]
}

5
src/plugins/qtsupport/qtsupportplugin.cpp
View File

@@ -27,14 +27,17 @@
#include "codegenerator.h"
#include "codegensettingspage.h"
#include "desktopqtversionfactory.h"
#include "desktopqtversion.h"
#include "gettingstartedwelcomepage.h"
#include "qtkitinformation.h"
#include "qtoptionspage.h"
#include "qtsupportconstants.h"
#include "qtversionfactory.h"
#include "qtversionmanager.h"
#include "uicgenerator.h"
#include "qscxmlcgenerator.h"
#include "desktopqtversion.h"
#include "profilereader.h"
#include <coreplugin/icore.h>

20
src/plugins/remotelinux/embeddedlinuxqtversion.cpp
View File

@@ -60,5 +60,25 @@ QSet<Core::Id> EmbeddedLinuxQtVersion::targetDeviceTypes() const
return {Constants::GenericLinuxOsType};
}
// Factory
EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
{
setQtVersionCreator([] { return new EmbeddedLinuxQtVersion; });
setSupportedType(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
setPriority(10);
setRestrictionChecker([](const SetupData &) {
EmbeddedLinuxQtVersion tempVersion;
QList<ProjectExplorer::Abi> abis = tempVersion.qtAbis();
// Note: This fails for e.g. intel/meego cross builds on x86 linux machines.
return abis.count() == 1
&& abis.at(0).os() == ProjectExplorer::Abi::LinuxOS
&& !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0));
});
}
} // namespace Internal
} // namespace RemoteLinux

7
src/plugins/remotelinux/embeddedlinuxqtversion.h
View File

@@ -26,6 +26,7 @@
#pragma once
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtversionfactory.h>
namespace RemoteLinux {
namespace Internal {
@@ -46,5 +47,11 @@ public:
QSet<Core::Id> targetDeviceTypes() const override;
};
class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
EmbeddedLinuxQtVersionFactory();
};
} // namespace Internal
} // namespace RemoteLinux

52
src/plugins/remotelinux/embeddedlinuxqtversionfactory.cpp
View File

@@ -1,52 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "embeddedlinuxqtversionfactory.h"
#include "embeddedlinuxqtversion.h"
#include "remotelinux_constants.h"
namespace RemoteLinux {
namespace Internal {
EmbeddedLinuxQtVersionFactory::EmbeddedLinuxQtVersionFactory()
{
setQtVersionCreator([] { return new EmbeddedLinuxQtVersion; });
setSupportedType(RemoteLinux::Constants::EMBEDDED_LINUX_QT);
setPriority(10);
setRestrictionChecker([](const SetupData &) {
EmbeddedLinuxQtVersion tempVersion;
QList<ProjectExplorer::Abi> abis = tempVersion.qtAbis();
// Note: This fails for e.g. intel/meego cross builds on x86 linux machines.
return abis.count() == 1
&& abis.at(0).os() == ProjectExplorer::Abi::LinuxOS
&& !ProjectExplorer::Abi::hostAbi().isCompatibleWith(abis.at(0));
});
}
} // namespace Internal
} // namespace RemoteLinux

40
src/plugins/remotelinux/embeddedlinuxqtversionfactory.h
View File

@@ -1,40 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include <qtsupport/qtversionfactory.h>
namespace RemoteLinux {
namespace Internal {
class EmbeddedLinuxQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
EmbeddedLinuxQtVersionFactory();
};
} // Internal
} // RemoteLinux

2
src/plugins/remotelinux/remotelinux.pro
View File

@@ -4,7 +4,6 @@ include(../../qtcreatorplugin.pri)
HEADERS += \
embeddedlinuxqtversion.h \
embeddedlinuxqtversionfactory.h \
remotelinuxenvironmentaspect.h \
remotelinuxenvironmentaspectwidget.h \
remotelinuxplugin.h \
@@ -49,7 +48,6 @@ HEADERS += \
SOURCES += \
embeddedlinuxqtversion.cpp \
embeddedlinuxqtversionfactory.cpp \
remotelinuxenvironmentaspect.cpp \
remotelinuxenvironmentaspectwidget.cpp \
remotelinuxplugin.cpp \

2
src/plugins/remotelinux/remotelinux.qbs
View File

@@ -29,8 +29,6 @@ Project {
"deploymenttimeinfo.h",
"embeddedlinuxqtversion.cpp",
"embeddedlinuxqtversion.h",
"embeddedlinuxqtversionfactory.cpp",
"embeddedlinuxqtversionfactory.h",
"genericdirectuploadservice.cpp",
"genericdirectuploadservice.h",
"genericdirectuploadstep.cpp",

2
src/plugins/remotelinux/remotelinuxplugin.cpp
View File

@@ -25,7 +25,7 @@
#include "remotelinuxplugin.h"
#include "embeddedlinuxqtversionfactory.h"
#include "embeddedlinuxqtversion.h"
#include "genericlinuxdeviceconfigurationfactory.h"
#include "remotelinux_constants.h"
#include "remotelinuxqmltoolingsupport.h"

2
src/plugins/winrt/winrt.pro
View File

@@ -10,7 +10,6 @@ HEADERS += \
winrtphoneqtversion.h \
winrtplugin.h \
winrtqtversion.h \
winrtqtversionfactory.h \
winrtrunconfiguration.h \
winrtruncontrol.h \
winrtrunnerhelper.h
@@ -24,7 +23,6 @@ SOURCES += \
winrtphoneqtversion.cpp \
winrtplugin.cpp \
winrtqtversion.cpp \
winrtqtversionfactory.cpp \
winrtrunconfiguration.cpp \
winrtruncontrol.cpp \
winrtrunnerhelper.cpp

2
src/plugins/winrt/winrt.qbs
View File

@@ -29,8 +29,6 @@ QtcPlugin {
"winrtplugin.h",
"winrtqtversion.cpp",
"winrtqtversion.h",
"winrtqtversionfactory.cpp",
"winrtqtversionfactory.h",
"winrtrunconfiguration.cpp",
"winrtrunconfiguration.h",
"winrtruncontrol.cpp",

11
src/plugins/winrt/winrtphoneqtversion.cpp
View File

@@ -55,5 +55,16 @@ QSet<Core::Id> WinRtPhoneQtVersion::targetDeviceTypes() const
return {Constants::WINRT_DEVICE_TYPE_PHONE, Constants::WINRT_DEVICE_TYPE_EMULATOR};
}
// Factory
WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()
{
setQtVersionCreator([] { return new WinRtPhoneQtVersion; });
setSupportedType(Constants::WINRT_WINPHONEQT);
setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winphone"); });
setPriority(10);
}
} // Internal
} // WinRt

6
src/plugins/winrt/winrtphoneqtversion.h
View File

@@ -42,5 +42,11 @@ public:
QSet<Core::Id> targetDeviceTypes() const override;
};
class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
WinRtPhoneQtVersionFactory();
};
} // Internal
} // WinRt

3
src/plugins/winrt/winrtplugin.cpp
View File

@@ -28,7 +28,8 @@
#include "winrtdevice.h"
#include "winrtdevicefactory.h"
#include "winrtdeployconfiguration.h"
#include "winrtqtversionfactory.h"
#include "winrtqtversion.h"
#include "winrtphoneqtversion.h"
#include "winrtrunconfiguration.h"
#include "winrtruncontrol.h"
#include "winrtdebugsupport.h"

11
src/plugins/winrt/winrtqtversion.cpp
View File

@@ -68,5 +68,16 @@ QSet<Core::Id> WinRtQtVersion::targetDeviceTypes() const
return {Constants::WINRT_DEVICE_TYPE_LOCAL, Constants::WINRT_DEVICE_TYPE_EMULATOR};
}
// Factory
WinRtQtVersionFactory::WinRtQtVersionFactory()
{
setQtVersionCreator([] { return new WinRtQtVersion; });
setSupportedType(Constants::WINRT_WINRTQT);
setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winrt"); });
setPriority(10);
}
} // Internal
} // WinRt

7
src/plugins/winrt/winrtqtversion.h
View File

@@ -26,6 +26,7 @@
#pragma once
#include <qtsupport/baseqtversion.h>
#include <qtsupport/qtversionfactory.h>
namespace WinRt {
namespace Internal {
@@ -45,5 +46,11 @@ public:
QSet<Core::Id> targetDeviceTypes() const override;
};
class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
WinRtQtVersionFactory();
};
} // Internal
} // WinRt

51
src/plugins/winrt/winrtqtversionfactory.cpp
View File

@@ -1,51 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#include "winrtqtversionfactory.h"
#include "winrtconstants.h"
#include "winrtphoneqtversion.h"
namespace WinRt {
namespace Internal {
WinRtQtVersionFactory::WinRtQtVersionFactory()
{
setQtVersionCreator([] { return new WinRtQtVersion; });
setSupportedType(Constants::WINRT_WINRTQT);
setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winrt"); });
setPriority(10);
}
WinRtPhoneQtVersionFactory::WinRtPhoneQtVersionFactory()
{
setQtVersionCreator([] { return new WinRtPhoneQtVersion; });
setSupportedType(Constants::WINRT_WINPHONEQT);
setRestrictionChecker([](const SetupData &setup) { return setup.platforms.contains("winphone"); });
setPriority(10);
}
} // Internal
} // WinRt

46
src/plugins/winrt/winrtqtversionfactory.h
View File

@@ -1,46 +0,0 @@
/****************************************************************************
**
** Copyright (C) 2016 The Qt Company Ltd.
** Contact: https://www.qt.io/licensing/
**
** This file is part of Qt Creator.
**
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see https://www.qt.io/terms-conditions. For further
** information use the contact form at https://www.qt.io/contact-us.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 3 as published by the Free Software
** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT
** included in the packaging of this file. Please review the following
** information to ensure the GNU General Public License requirements will
** be met: https://www.gnu.org/licenses/gpl-3.0.html.
**
****************************************************************************/
#pragma once
#include <qtsupport/qtversionfactory.h>
namespace WinRt {
namespace Internal {
class WinRtQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
WinRtQtVersionFactory();
};
class WinRtPhoneQtVersionFactory : public QtSupport::QtVersionFactory
{
public:
WinRtPhoneQtVersionFactory();
};
} // Internal
} // WinRt