diff options
38 files changed, 49 insertions, 827 deletions
diff --git a/dist/changes-2.6.0 b/dist/changes-2.6.0 index e8943200978..c84dc7dda68 100644 --- a/dist/changes-2.6.0 +++ b/dist/changes-2.6.0 @@ -45,5 +45,8 @@ FakeVim Version control plugins +Madde + * Remove generic MeeGo support due to complete irrelevance + Additional credits go to: diff --git a/src/plugins/madde/madde.pro b/src/plugins/madde/madde.pro index 178e2f3e4bb..b72a2043393 100644 --- a/src/plugins/madde/madde.pro +++ b/src/plugins/madde/madde.pro @@ -49,7 +49,6 @@ HEADERS += \ maddedevicetester.h \ maddedeviceconfigurationfactory.h \ maddedevice.h \ - rpmmanager.h \ maemoapplicationrunnerhelperactions.h SOURCES += \ @@ -93,7 +92,6 @@ SOURCES += \ maddedevicetester.cpp \ maemorunconfiguration.cpp \ maddedevice.cpp \ - rpmmanager.cpp \ maemoapplicationrunnerhelperactions.cpp FORMS += \ diff --git a/src/plugins/madde/madde.qbs b/src/plugins/madde/madde.qbs index 7cac61e3994..9ed834d1dbf 100644 --- a/src/plugins/madde/madde.qbs +++ b/src/plugins/madde/madde.qbs @@ -117,8 +117,6 @@ QtcPlugin { "maddedevice.h", "debianmanager.h", "debianmanager.cpp", - "rpmmanager.h", - "rpmmanager.cpp", "maemoapplicationrunnerhelperactions.h", "maemoapplicationrunnerhelperactions.cpp" ] diff --git a/src/plugins/madde/maddedevice.cpp b/src/plugins/madde/maddedevice.cpp index a6a1425ae8b..0d98d41788e 100644 --- a/src/plugins/madde/maddedevice.cpp +++ b/src/plugins/madde/maddedevice.cpp @@ -125,7 +125,8 @@ QString MaddeDevice::maddeDisplayType(Core::Id type) return tr("Maemo5/Fremantle"); if (type == Core::Id(HarmattanOsType)) return tr("MeeGo 1.2 Harmattan"); - return tr("Other MeeGo OS"); + QTC_ASSERT(false, return QString()); + return QString(); // For crappy compilers. } bool MaddeDevice::allowsRemoteMounts(Core::Id type) @@ -143,11 +144,6 @@ bool MaddeDevice::allowsQmlDebugging(Core::Id type) return type == Core::Id(HarmattanOsType); } -bool MaddeDevice::isDebianBased(Core::Id type) -{ - return type != Core::Id(MeeGoOsType); -} - QSize MaddeDevice::packageManagerIconSize(Core::Id type) { if (type == Core::Id(Maemo5OsType)) diff --git a/src/plugins/madde/maddedevice.h b/src/plugins/madde/maddedevice.h index 0a4f5953087..ad727b338de 100644 --- a/src/plugins/madde/maddedevice.h +++ b/src/plugins/madde/maddedevice.h @@ -60,7 +60,6 @@ public: static bool allowsPackagingDisabling(Core::Id type); static bool allowsQmlDebugging(Core::Id type); - static bool isDebianBased(Core::Id type); static QSize packageManagerIconSize(Core::Id type); private: diff --git a/src/plugins/madde/maddedeviceconfigurationfactory.cpp b/src/plugins/madde/maddedeviceconfigurationfactory.cpp index 6691360b8f1..09fb736757c 100644 --- a/src/plugins/madde/maddedeviceconfigurationfactory.cpp +++ b/src/plugins/madde/maddedeviceconfigurationfactory.cpp @@ -53,7 +53,7 @@ QString MaddeDeviceConfigurationFactory::displayNameForId(Core::Id type) const QList<Core::Id> MaddeDeviceConfigurationFactory::availableCreationIds() const { - return QList<Core::Id>() << Core::Id(Maemo5OsType) << Core::Id(HarmattanOsType) << Core::Id(MeeGoOsType); + return QList<Core::Id>() << Core::Id(Maemo5OsType) << Core::Id(HarmattanOsType); } IDevice::Ptr MaddeDeviceConfigurationFactory::create(Core::Id id) const @@ -67,8 +67,7 @@ IDevice::Ptr MaddeDeviceConfigurationFactory::create(Core::Id id) const bool MaddeDeviceConfigurationFactory::canRestore(const QVariantMap &map) const { const Core::Id type = IDevice::typeFromMap(map); - return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType) - || type == Core::Id(MeeGoOsType); + return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType); } IDevice::Ptr MaddeDeviceConfigurationFactory::restore(const QVariantMap &map) const diff --git a/src/plugins/madde/maddedevicetester.cpp b/src/plugins/madde/maddedevicetester.cpp index 007e9a484b6..3f0f0a74b8a 100644 --- a/src/plugins/madde/maddedevicetester.cpp +++ b/src/plugins/madde/maddedevicetester.cpp @@ -110,14 +110,8 @@ void MaddeDeviceTester::handleGenericTestFinished(TestResult result) connect(m_processRunner, SIGNAL(connectionError()), SLOT(handleConnectionError())); connect(m_processRunner, SIGNAL(processClosed(int)), SLOT(handleProcessFinished(int))); - QString qtInfoCmd; - if (m_deviceConfiguration->type() == Core::Id(MeeGoOsType)) { - qtInfoCmd = QLatin1String("rpm -qa 'libqt*' --queryformat '%{NAME} %{VERSION}\\n'"); - } else { - qtInfoCmd = QLatin1String("dpkg-query -W -f " + const QString qtInfoCmd = QLatin1String("dpkg-query -W -f " "'${Package} ${Version} ${Status}\n' 'libqt*' |grep ' installed$'"); - } - emit progressMessage(tr("Checking for Qt libraries...")); m_state = QtTest; m_processRunner->run(qtInfoCmd.toUtf8(), m_deviceConfiguration->sshParameters()); @@ -234,11 +228,8 @@ QString MaddeDeviceTester::processedQtLibsList() { QString unfilteredLibs = QString::fromUtf8(m_processRunner->readAllStandardOutput()); QString filteredLibs; - QString patternString; - if (m_deviceConfiguration->type() == Core::Id(MeeGoOsType)) - patternString = QLatin1String("(libqt\\S+) ((\\d+)\\.(\\d+)\\.(\\d+))"); - else - patternString = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+"); + const QString patternString + = QLatin1String("(\\S+) (\\S*(\\d+)\\.(\\d+)\\.(\\d+)\\S*) \\S+ \\S+ \\S+"); QRegExp packagePattern(patternString); int index = packagePattern.indexIn(unfilteredLibs); if (index == -1) diff --git a/src/plugins/madde/maddeplugin.cpp b/src/plugins/madde/maddeplugin.cpp index 9647d4bf69f..87093d68992 100644 --- a/src/plugins/madde/maddeplugin.cpp +++ b/src/plugins/madde/maddeplugin.cpp @@ -40,7 +40,6 @@ #include "maemorunfactories.h" #include "maemosettingspages.h" #include "qt4maemodeployconfiguration.h" -#include "rpmmanager.h" #include "maemoqtversionfactory.h" #include <QtPlugin> @@ -74,7 +73,6 @@ bool MaddePlugin::initialize(const QStringList &arguments, QString *error_messag addAutoReleasedObject(new MaddeDeviceConfigurationFactory); new DebianManager(this); - new RpmManager(this); return true; } diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp index 0c475058f47..1d0e7481cc2 100644 --- a/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp +++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.cpp @@ -126,23 +126,6 @@ private: HarmattanPackageInstaller * const m_installer; }; -class MeegoUploadAndInstallPackageAction : public AbstractMaddeUploadAndInstallPackageAction -{ - Q_OBJECT - -public: - MeegoUploadAndInstallPackageAction(AbstractRemoteLinuxDeployStep *step) - : AbstractMaddeUploadAndInstallPackageAction(step), - m_installer(new MaemoRpmPackageInstaller(this)) - { - } - - AbstractRemoteLinuxPackageInstaller *packageInstaller() const { return m_installer; } - -private: - MaemoRpmPackageInstaller * const m_installer; -}; - } // anonymous namespace @@ -196,53 +179,6 @@ QString MaemoUploadAndInstallPackageStep::displayName() return tr("Deploy Debian package via SFTP upload"); } - -MeegoUploadAndInstallPackageStep::MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl) - : AbstractRemoteLinuxDeployStep(bsl, stepId()) -{ - ctor(); -} - -MeegoUploadAndInstallPackageStep::MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl, - MeegoUploadAndInstallPackageStep *other) : AbstractRemoteLinuxDeployStep(bsl, other) -{ - ctor(); -} - -void MeegoUploadAndInstallPackageStep::ctor() -{ - setDefaultDisplayName(displayName()); - m_deployService = new MeegoUploadAndInstallPackageAction(this); -} - -AbstractRemoteLinuxDeployService *MeegoUploadAndInstallPackageStep::deployService() const -{ - return m_deployService; -} - -bool MeegoUploadAndInstallPackageStep::initInternal(QString *error) -{ - const AbstractMaemoPackageCreationStep * const pStep - = deployConfiguration()->earlierBuildStep<MaemoRpmPackageCreationStep>(this); - if (!pStep) { - if (error) - *error = tr("No RPM package creation step found."); - return false; - } - m_deployService->setPackageFilePath(pStep->packageFilePath()); - return deployService()->isDeploymentPossible(error); -} - -Core::Id MeegoUploadAndInstallPackageStep::stepId() -{ - return Core::Id("MaemoUploadAndInstallRpmPackageStep"); -} - -QString MeegoUploadAndInstallPackageStep::displayName() -{ - return tr("Deploy RPM package via SFTP upload"); -} - } // namespace Internal } // namespace Madde diff --git a/src/plugins/madde/maddeuploadandinstallpackagesteps.h b/src/plugins/madde/maddeuploadandinstallpackagesteps.h index 5e0abeaf131..3516ee730c5 100644 --- a/src/plugins/madde/maddeuploadandinstallpackagesteps.h +++ b/src/plugins/madde/maddeuploadandinstallpackagesteps.h @@ -60,27 +60,6 @@ private: RemoteLinux::AbstractUploadAndInstallPackageService *m_deployService; }; -class MeegoUploadAndInstallPackageStep : public RemoteLinux::AbstractRemoteLinuxDeployStep -{ - Q_OBJECT -public: - MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl); - MeegoUploadAndInstallPackageStep(ProjectExplorer::BuildStepList *bsl, - MeegoUploadAndInstallPackageStep *other); - - bool initInternal(QString *error); - - static Core::Id stepId(); - static QString displayName(); - -private: - RemoteLinux::AbstractRemoteLinuxDeployService *deployService() const; - - void ctor(); - - RemoteLinux::AbstractUploadAndInstallPackageService *m_deployService; -}; - } // namespace Internal } // namespace Madde diff --git a/src/plugins/madde/maemoconstants.h b/src/plugins/madde/maemoconstants.h index 20a9413c84e..72ea16bc3f8 100644 --- a/src/plugins/madde/maemoconstants.h +++ b/src/plugins/madde/maemoconstants.h @@ -37,7 +37,6 @@ namespace Internal { const char Maemo5OsType[] = "Maemo5OsType"; const char HarmattanOsType[] = "HarmattanOsType"; -const char MeeGoOsType[] = "MeeGoOsType"; #define PREFIX "Qt4ProjectManager.MaemoRunConfiguration" diff --git a/src/plugins/madde/maemodeploystepfactory.cpp b/src/plugins/madde/maemodeploystepfactory.cpp index 7cfdc227f91..ba923e65dd4 100644 --- a/src/plugins/madde/maemodeploystepfactory.cpp +++ b/src/plugins/madde/maemodeploystepfactory.cpp @@ -84,10 +84,6 @@ QList<Core::Id> MaemoDeployStepFactory::availableCreationIds(BuildStepList *pare << Core::Id(MaemoInstallDebianPackageToSysrootStep::Id) << Core::Id(MaemoUploadAndInstallPackageStep::stepId()) << Core::Id(GenericDirectUploadStep::stepId()); - } else if (platform == QtSupport::Constants::MEEGO_PLATFORM) { - ids << Core::Id(MaemoMakeInstallToSysrootStep::Id) - << Core::Id(MaemoInstallRpmPackageToSysrootStep::Id) - << Core::Id(MeegoUploadAndInstallPackageStep::stepId()); } return ids; @@ -101,12 +97,8 @@ QString MaemoDeployStepFactory::displayNameForId(const Core::Id id) const return MaemoCopyFilesViaMountStep::displayName(); else if (id == MaemoUploadAndInstallPackageStep::stepId()) return MaemoUploadAndInstallPackageStep::displayName(); - else if (id == MeegoUploadAndInstallPackageStep::stepId()) - return MeegoUploadAndInstallPackageStep::displayName(); else if (id == MaemoInstallDebianPackageToSysrootStep::Id) return MaemoInstallDebianPackageToSysrootStep::displayName(); - else if (id == MaemoInstallRpmPackageToSysrootStep::Id) - return MaemoInstallRpmPackageToSysrootStep::displayName(); else if (id == MaemoCopyToSysrootStep::Id) return MaemoCopyToSysrootStep::displayName(); else if (id == MaemoMakeInstallToSysrootStep::Id) @@ -130,8 +122,6 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const Core::Id if (id == MaemoInstallDebianPackageToSysrootStep::Id) { return new MaemoInstallDebianPackageToSysrootStep(parent); - } else if (id == MaemoInstallRpmPackageToSysrootStep::Id) { - return new MaemoInstallRpmPackageToSysrootStep(parent); } else if (id == MaemoCopyToSysrootStep::Id) { return new MaemoCopyToSysrootStep(parent); } else if (id == MaemoMakeInstallToSysrootStep::Id) { @@ -144,9 +134,6 @@ BuildStep *MaemoDeployStepFactory::create(BuildStepList *parent, const Core::Id } else if (id == MaemoUploadAndInstallPackageStep::stepId() || (id == Core::Id(OldMaemoDeployStepId) && deviceType == Core::Id(HarmattanOsType))) { return new MaemoUploadAndInstallPackageStep(parent); - } else if (id == MeegoUploadAndInstallPackageStep::stepId() - || (id == Core::Id(OldMaemoDeployStepId) && deviceType == Core::Id(MeeGoOsType))) { - return new MeegoUploadAndInstallPackageStep(parent); } else if (id == GenericDirectUploadStep::stepId()) { return new GenericDirectUploadStep(parent, id); } else if (id == RemoteLinuxCheckForFreeDiskSpaceStep::stepId()) { @@ -190,15 +177,9 @@ BuildStep *MaemoDeployStepFactory::clone(BuildStepList *parent, BuildStep *produ } else if (product->id() == MaemoUploadAndInstallPackageStep::stepId()) { return new MaemoUploadAndInstallPackageStep(parent, qobject_cast<MaemoUploadAndInstallPackageStep*>(product)); - } else if (product->id() == MeegoUploadAndInstallPackageStep::stepId()) { - return new MeegoUploadAndInstallPackageStep(parent, - qobject_cast<MeegoUploadAndInstallPackageStep*>(product)); } else if (product->id() == MaemoInstallDebianPackageToSysrootStep::Id) { return new MaemoInstallDebianPackageToSysrootStep(parent, qobject_cast<MaemoInstallDebianPackageToSysrootStep *>(product)); - } else if (product->id() == MaemoInstallRpmPackageToSysrootStep::Id) { - return new MaemoInstallRpmPackageToSysrootStep(parent, - qobject_cast<MaemoInstallRpmPackageToSysrootStep *>(product)); } else if (product->id() == MaemoCopyToSysrootStep::Id) { return new MaemoCopyToSysrootStep(parent, qobject_cast<MaemoCopyToSysrootStep *>(product)); diff --git a/src/plugins/madde/maemodeviceconfigwizard.cpp b/src/plugins/madde/maemodeviceconfigwizard.cpp index 09310a7508b..6cb35b2a297 100644 --- a/src/plugins/madde/maemodeviceconfigwizard.cpp +++ b/src/plugins/madde/maemodeviceconfigwizard.cpp @@ -61,10 +61,8 @@ namespace Madde { namespace Internal { namespace { -QString defaultUser(Core::Id deviceType) +QString defaultUser() { - if (deviceType == Core::Id(MeeGoOsType)) - return QLatin1String("meego"); return QLatin1String("developer"); } @@ -448,7 +446,7 @@ private: sshParams.port = m_wizardData.sshPort; sshParams.password = password(); sshParams.timeout = 10; - sshParams.userName = defaultUser(m_wizardData.deviceType); + sshParams.userName = defaultUser(); m_ui->statusLabel->setText(tr("Deploying... ")); m_keyDeployer->deployPublicKey(sshParams, m_wizardData.publicKeyFilePath); } @@ -558,13 +556,12 @@ IDevice::Ptr MaemoDeviceConfigWizard::device() bool doTest; QString freePortsSpec; QSsh::SshConnectionParameters sshParams; - sshParams.userName = defaultUser(d->wizardData.deviceType); + sshParams.userName = defaultUser(); sshParams.host = d->wizardData.hostName; sshParams.port = d->wizardData.sshPort; if (d->wizardData.machineType == IDevice::Emulator) { sshParams.authenticationType = QSsh::SshConnectionParameters::AuthenticationByPassword; - sshParams.password = d->wizardData.deviceType == Core::Id(MeeGoOsType) - ? QLatin1String("meego") : QString(); + sshParams.password = QString(); sshParams.timeout = 30; freePortsSpec = QLatin1String("13219,14168"); doTest = false; diff --git a/src/plugins/madde/maemoglobal.cpp b/src/plugins/madde/maemoglobal.cpp index ab6f8c60022..7511cc8bd74 100644 --- a/src/plugins/madde/maemoglobal.cpp +++ b/src/plugins/madde/maemoglobal.cpp @@ -65,15 +65,13 @@ bool MaemoGlobal::hasMaemoDevice(const Profile *p) return false; const Core::Id type = dev->type(); - return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType) - || type == Core::Id(MeeGoOsType); + return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType); } bool MaemoGlobal::supportsMaemoDevice(const Profile *p) { const Core::Id type = DeviceTypeProfileInformation::deviceTypeId(p); - return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType) - || type == Core::Id(MeeGoOsType); + return type == Core::Id(Maemo5OsType) || type == Core::Id(HarmattanOsType); } bool MaemoGlobal::isValidMaemo5QtVersion(const QString &qmakePath) @@ -86,11 +84,6 @@ bool MaemoGlobal::isValidHarmattanQtVersion(const QString &qmakePath) return isValidMaemoQtVersion(qmakePath, Core::Id(HarmattanOsType)); } -bool MaemoGlobal::isValidMeegoQtVersion(const QString &qmakePath) -{ - return isValidMaemoQtVersion(qmakePath, Core::Id(MeeGoOsType)); -} - bool MaemoGlobal::isValidMaemoQtVersion(const QString &qmakePath, Core::Id deviceType) { if (MaemoGlobal::deviceType(qmakePath) != deviceType) @@ -136,10 +129,8 @@ QString MaemoGlobal::remoteSudo(Core::Id deviceType, const QString &uname) { if (uname == QLatin1String("root")) return QString(); - if (deviceType == Core::Id(Maemo5OsType) || deviceType == Core::Id(HarmattanOsType) - || deviceType == Core::Id(MeeGoOsType)) { + if (deviceType == Core::Id(Maemo5OsType) || deviceType == Core::Id(HarmattanOsType)) return devrootshPath(); - } return QString(); // Using sudo would open a can of worms. } @@ -219,8 +210,6 @@ Core::Id MaemoGlobal::deviceType(const QString &qmakePath) return Core::Id(Maemo5OsType); if (name.startsWith(QLatin1String("harmattan"))) return Core::Id(HarmattanOsType); - if (name.startsWith(QLatin1String("meego"))) - return Core::Id(MeeGoOsType); return Core::Id(RemoteLinux::Constants::GenericLinuxOsType); } diff --git a/src/plugins/madde/maemoglobal.h b/src/plugins/madde/maemoglobal.h index 2681bc43114..f28e36dcfdc 100644 --- a/src/plugins/madde/maemoglobal.h +++ b/src/plugins/madde/maemoglobal.h @@ -81,13 +81,10 @@ class MaemoGlobal { Q_DECLARE_TR_FUNCTIONS(RemoteLinux::Internal::MaemoGlobal) public: - enum PackagingSystem { Dpkg, Rpm, Tar }; - static bool hasMaemoDevice(const ProjectExplorer::Profile *p); static bool supportsMaemoDevice(const ProjectExplorer::Profile *p); static bool isValidMaemo5QtVersion(const QString &qmakePath); static bool isValidHarmattanQtVersion(const QString &qmakePath); - static bool isValidMeegoQtVersion(const QString &qmakePath); static QString homeDirOnDevice(const QString &uname); static QString devrootshPath(); diff --git a/src/plugins/madde/maemoinstalltosysrootstep.cpp b/src/plugins/madde/maemoinstalltosysrootstep.cpp index 37f90449ff8..b482b3a5575 100644 --- a/src/plugins/madde/maemoinstalltosysrootstep.cpp +++ b/src/plugins/madde/maemoinstalltosysrootstep.cpp @@ -106,15 +106,6 @@ public: virtual QString displayName() const { return MaemoInstallDebianPackageToSysrootStep::displayName(); } }; -class MaemoInstallRpmPackageToSysrootWidget : public AbstractMaemoInstallPackageToSysrootWidget -{ - Q_OBJECT -public: - MaemoInstallRpmPackageToSysrootWidget(AbstractMaemoInstallPackageToSysrootStep *step) - : AbstractMaemoInstallPackageToSysrootWidget(step) {} - - virtual QString displayName() const { return MaemoInstallRpmPackageToSysrootStep::displayName(); } -}; class MaemoCopyFilesToSysrootWidget : public BuildStepConfigWidget { @@ -259,37 +250,6 @@ QString MaemoInstallDebianPackageToSysrootStep::displayName() return tr("Install Debian package to sysroot"); } -MaemoInstallRpmPackageToSysrootStep::MaemoInstallRpmPackageToSysrootStep(BuildStepList *bsl) - : AbstractMaemoInstallPackageToSysrootStep(bsl, Id) -{ - setDisplayName(displayName()); -} - -MaemoInstallRpmPackageToSysrootStep::MaemoInstallRpmPackageToSysrootStep(BuildStepList *bsl, - MaemoInstallRpmPackageToSysrootStep *other) - : AbstractMaemoInstallPackageToSysrootStep(bsl, other) -{ - setDisplayName(displayName()); -} - -BuildStepConfigWidget *MaemoInstallRpmPackageToSysrootStep::createConfigWidget() -{ - return new MaemoInstallRpmPackageToSysrootWidget(this); -} - -QStringList MaemoInstallRpmPackageToSysrootStep::madArguments() const -{ - return QStringList() << QLatin1String("xrpm") << QLatin1String("-i"); -} - -const Core::Id MaemoInstallRpmPackageToSysrootStep::Id - = Core::Id("MaemoInstallRpmPackageToSysrootStep"); - -QString MaemoInstallRpmPackageToSysrootStep::displayName() -{ - return tr("Install RPM package to sysroot"); -} - MaemoCopyToSysrootStep::MaemoCopyToSysrootStep(BuildStepList *bsl) : BuildStep(bsl, Id) { diff --git a/src/plugins/madde/maemoinstalltosysrootstep.h b/src/plugins/madde/maemoinstalltosysrootstep.h index 719f023a0d0..4cb5f8f3198 100644 --- a/src/plugins/madde/maemoinstalltosysrootstep.h +++ b/src/plugins/madde/maemoinstalltosysrootstep.h @@ -89,22 +89,6 @@ private: virtual QStringList madArguments() const; }; -class MaemoInstallRpmPackageToSysrootStep : public AbstractMaemoInstallPackageToSysrootStep -{ - Q_OBJECT -public: - explicit MaemoInstallRpmPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl); - MaemoInstallRpmPackageToSysrootStep(ProjectExplorer::BuildStepList *bsl, - MaemoInstallRpmPackageToSysrootStep *other); - - virtual ProjectExplorer::BuildStepConfigWidget *createConfigWidget(); - - static const Core::Id Id; - static QString displayName(); -private: - virtual QStringList madArguments() const; -}; - class MaemoCopyToSysrootStep : public ProjectExplorer::BuildStep { Q_OBJECT diff --git a/src/plugins/madde/maemopackagecreationfactory.cpp b/src/plugins/madde/maemopackagecreationfactory.cpp index 4de832d9185..2860d123d3f 100644 --- a/src/plugins/madde/maemopackagecreationfactory.cpp +++ b/src/plugins/madde/maemopackagecreationfactory.cpp @@ -39,6 +39,7 @@ #include <projectexplorer/profileinformation.h> #include <projectexplorer/projectexplorerconstants.h> #include <projectexplorer/target.h> +#include <utils/qtcassert.h> #include <QCoreApplication> @@ -61,13 +62,8 @@ QList<Core::Id> MaemoPackageCreationFactory::availableCreationIds(ProjectExplore QList<Core::Id> ids; if (!qobject_cast<Qt4MaemoDeployConfiguration *>(parent->parent())) return ids; - Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->target()->profile()); - if (MaddeDevice::isDebianBased(deviceType) - && !parent->contains(MaemoDebianPackageCreationStep::CreatePackageId)) + if (!parent->contains(MaemoDebianPackageCreationStep::CreatePackageId)) ids << MaemoDebianPackageCreationStep::CreatePackageId; - else if (!MaddeDevice::isDebianBased(deviceType) - && !parent->contains(MaemoRpmPackageCreationStep::CreatePackageId)) - ids << MaemoRpmPackageCreationStep::CreatePackageId; return ids; } @@ -76,9 +72,6 @@ QString MaemoPackageCreationFactory::displayNameForId(const Core::Id id) const if (id == MaemoDebianPackageCreationStep::CreatePackageId) { return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory", "Create Debian Package"); - } else if (id == MaemoRpmPackageCreationStep::CreatePackageId) { - return QCoreApplication::translate("RemoteLinux::Internal::MaemoPackageCreationFactory", - "Create RPM Package"); } return QString(); } @@ -93,8 +86,6 @@ BuildStep *MaemoPackageCreationFactory::create(ProjectExplorer::BuildStepList *p Q_ASSERT(canCreate(parent, id)); if (id == MaemoDebianPackageCreationStep::CreatePackageId) return new MaemoDebianPackageCreationStep(parent); - else if (id == MaemoRpmPackageCreationStep::CreatePackageId) - return new MaemoRpmPackageCreationStep(parent); return 0; } @@ -110,19 +101,10 @@ BuildStep *MaemoPackageCreationFactory::restore(ProjectExplorer::BuildStepList * { Q_ASSERT(canRestore(parent, map)); BuildStep * step = 0; - Core::Id deviceType - = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(parent->target()->profile()); const Core::Id id = ProjectExplorer::idFromMap(map); - if (id == MaemoDebianPackageCreationStep::CreatePackageId - || (id == Core::Id(OldCreatePackageId) - && MaddeDevice::isDebianBased(deviceType))) { + if (id == MaemoDebianPackageCreationStep::CreatePackageId) step = new MaemoDebianPackageCreationStep(parent); - } else if (id == MaemoRpmPackageCreationStep::CreatePackageId - || (id == Core::Id(OldCreatePackageId) - && !MaddeDevice::isDebianBased(deviceType))) { - step = new MaemoRpmPackageCreationStep(parent); - } - Q_ASSERT(step); + QTC_ASSERT(step, return 0); if (!step->fromMap(map)) { delete step; @@ -145,10 +127,6 @@ BuildStep *MaemoPackageCreationFactory::clone(ProjectExplorer::BuildStepList *pa = qobject_cast<MaemoDebianPackageCreationStep *>(product)) { return new MaemoDebianPackageCreationStep(parent, debianStep); } - if (MaemoRpmPackageCreationStep * const rpmStep - = qobject_cast<MaemoRpmPackageCreationStep *>(product)) { - return new MaemoRpmPackageCreationStep(parent, rpmStep); - } return 0; } diff --git a/src/plugins/madde/maemopackagecreationstep.cpp b/src/plugins/madde/maemopackagecreationstep.cpp index c4caaf48612..a8c5d755624 100644 --- a/src/plugins/madde/maemopackagecreationstep.cpp +++ b/src/plugins/madde/maemopackagecreationstep.cpp @@ -32,7 +32,6 @@ #include "maemoconstants.h" #include "maemoglobal.h" #include "debianmanager.h" -#include "rpmmanager.h" #include "maemopackagecreationwidget.h" #include <projectexplorer/projectexplorerconstants.h> @@ -479,69 +478,5 @@ bool MaemoDebianPackageCreationStep::adaptRulesFile( return true; } -///////////////// -// MaemoRpmPackageCreationStep -///////////////// - -MaemoRpmPackageCreationStep::MaemoRpmPackageCreationStep(BuildStepList *bsl) - : AbstractMaemoPackageCreationStep(bsl, CreatePackageId) -{ - ctor(); -} - -MaemoRpmPackageCreationStep::MaemoRpmPackageCreationStep(BuildStepList *buildConfig, - MaemoRpmPackageCreationStep *other) - : AbstractMaemoPackageCreationStep(buildConfig, other) -{ - ctor(); -} - -void MaemoRpmPackageCreationStep::ctor() -{ - setDefaultDisplayName(tr("Create RPM Package")); -} - -bool MaemoRpmPackageCreationStep::init() -{ - m_specFile = RpmManager::specFile(target()); - m_packageFileName = RpmManager::packageFileName(m_specFile, target()); - return AbstractMaemoPackageCreationStep::init(); -} - -bool MaemoRpmPackageCreationStep::createPackage(QProcess *buildProc, - const QFutureInterface<bool> &fi) -{ - Q_UNUSED(fi); - const QStringList args = QStringList() << QLatin1String("rrpmbuild") - << QLatin1String("-bb") << m_specFile.toString(); - if (!callPackagingCommand(buildProc, args)) - return false; - QFile::remove(cachedPackageFilePath()); - const QString packageSourceFilePath = rpmBuildDir() + QLatin1Char('/') - + m_packageFileName.toString(); - if (!QFile::rename(packageSourceFilePath, cachedPackageFilePath())) { - raiseError(tr("Packaging failed: Could not move package file from %1 to %2.") - .arg(packageSourceFilePath, cachedPackageFilePath())); - return false; - } - - return true; -} - -bool MaemoRpmPackageCreationStep::isMetaDataNewerThan(const QDateTime &packageDate) const -{ - QTC_ASSERT(!m_specFile.isEmpty(), return false); - const QDateTime specFileChangeDate = m_specFile.toFileInfo().lastModified(); - return packageDate <= specFileChangeDate; -} - -QString MaemoRpmPackageCreationStep::rpmBuildDir() const -{ - return cachedPackageDirectory() + QLatin1String("/rrpmbuild"); -} - -const Core::Id MaemoRpmPackageCreationStep::CreatePackageId - = Core::Id("MaemoRpmPackageCreationStep"); - } // namespace Internal } // namespace Madde diff --git a/src/plugins/madde/maemopackagecreationstep.h b/src/plugins/madde/maemopackagecreationstep.h index 97593327a6b..e56a3ed5bfe 100644 --- a/src/plugins/madde/maemopackagecreationstep.h +++ b/src/plugins/madde/maemopackagecreationstep.h @@ -45,9 +45,6 @@ namespace RemoteLinux { class RemoteLinuxDeployConfiguration; } namespace Madde { namespace Internal { -class AbstractQt4MaemoTarget; -class AbstractDebBasedQt4MaemoTarget; -class AbstractRpmBasedQt4MaemoTarget; class AbstractMaemoPackageCreationStep : public RemoteLinux::AbstractPackagingStep { @@ -130,30 +127,6 @@ private: static const Core::Id CreatePackageId; }; -class MaemoRpmPackageCreationStep : public AbstractMaemoPackageCreationStep -{ - Q_OBJECT - friend class MaemoPackageCreationFactory; -public: - MaemoRpmPackageCreationStep(ProjectExplorer::BuildStepList *bsl); - -private: - bool init(); - virtual bool createPackage(QProcess *buildProc, const QFutureInterface<bool> &fi); - virtual bool isMetaDataNewerThan(const QDateTime &packageDate) const; - - MaemoRpmPackageCreationStep(ProjectExplorer::BuildStepList *buildConfig, - MaemoRpmPackageCreationStep *other); - - void ctor(); - QString rpmBuildDir() const; - - Utils::FileName m_specFile; - Utils::FileName m_packageFileName; - - static const Core::Id CreatePackageId; -}; - } // namespace Internal } // namespace Madde diff --git a/src/plugins/madde/maemopackagecreationwidget.cpp b/src/plugins/madde/maemopackagecreationwidget.cpp index 47aab9cedeb..7d5fba9b53e 100644 --- a/src/plugins/madde/maemopackagecreationwidget.cpp +++ b/src/plugins/madde/maemopackagecreationwidget.cpp @@ -34,7 +34,6 @@ #include "maddedevice.h" #include "maemoglobal.h" #include "maemopackagecreationstep.h" -#include "rpmmanager.h" #include <coreplugin/editormanager/editormanager.h> #include <projectexplorer/profileinformation.h> @@ -53,7 +52,6 @@ using namespace ProjectExplorer; namespace Madde { namespace Internal { -// TODO: Split up into dedicated widgets for Debian and RPM steps. MaemoPackageCreationWidget::MaemoPackageCreationWidget(AbstractMaemoPackageCreationStep *step) : ProjectExplorer::BuildStepConfigWidget(), m_step(step), @@ -74,47 +72,24 @@ void MaemoPackageCreationWidget::initGui() m_ui->shortDescriptionLineEdit->setMaxLength(60); updateVersionInfo(); Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(m_step->target()->profile()); - if (MaddeDevice::isDebianBased(deviceType)) { - const Utils::FileName path = DebianManager::debianDirectory(m_step->target()); - const QSize iconSize = MaddeDevice::packageManagerIconSize(deviceType); - m_ui->packageManagerIconButton->setFixedSize(iconSize); - m_ui->packageManagerIconButton->setToolTip(tr("Size should be %1x%2 pixels") - .arg(iconSize.width()).arg(iconSize.height())); - m_ui->editSpecFileButton->setVisible(false); - updateDebianFileList(path); - handleControlFileUpdate(path); - DebianManager *dm = DebianManager::instance(); - connect(m_ui->packageManagerNameLineEdit, SIGNAL(editingFinished()), + const Utils::FileName path = DebianManager::debianDirectory(m_step->target()); + const QSize iconSize = MaddeDevice::packageManagerIconSize(deviceType); + m_ui->packageManagerIconButton->setFixedSize(iconSize); + m_ui->packageManagerIconButton->setToolTip(tr("Size should be %1x%2 pixels") + .arg(iconSize.width()).arg(iconSize.height())); + m_ui->editSpecFileButton->setVisible(false); + updateDebianFileList(path); + handleControlFileUpdate(path); + DebianManager *dm = DebianManager::instance(); + connect(m_ui->packageManagerNameLineEdit, SIGNAL(editingFinished()), SLOT(setPackageManagerName())); - connect(dm, SIGNAL(debianDirectoryChanged(Utils::FileName)), + connect(dm, SIGNAL(debianDirectoryChanged(Utils::FileName)), SLOT(updateDebianFileList(Utils::FileName))); - connect(dm, SIGNAL(changelogChanged(Utils::FileName)), + connect(dm, SIGNAL(changelogChanged(Utils::FileName)), SLOT(updateVersionInfo())); - connect(dm, SIGNAL(controlChanged(Utils::FileName)), + connect(dm, SIGNAL(controlChanged(Utils::FileName)), SLOT(handleControlFileUpdate(Utils::FileName))); - } else { - const Utils::FileName path = RpmManager::specFile(m_step->target()); - m_ui->packageManagerNameLabel->hide(); - m_ui->packageManagerNameLineEdit->hide(); - m_ui->packageManagerIconLabel->hide(); - m_ui->packageManagerIconButton->hide(); - m_ui->editDebianFileLabel->hide(); - m_ui->debianFilesComboBox->hide(); - m_ui->editDebianFileButton->hide(); - // This is fragile; be careful when editing the UI file. - m_ui->formLayout->removeItem(m_ui->formLayout->itemAt(4, QFormLayout::LabelRole)); - m_ui->formLayout->removeItem(m_ui->formLayout->itemAt(4, QFormLayout::FieldRole)); - m_ui->formLayout->removeItem(m_ui->formLayout->itemAt(5, QFormLayout::LabelRole)); - m_ui->formLayout->removeItem(m_ui->formLayout->itemAt(5, QFormLayout::FieldRole)); - m_ui->formLayout->removeItem(m_ui->formLayout->itemAt(6, QFormLayout::LabelRole)); - m_ui->formLayout->removeItem(m_ui->formLayout->itemAt(6, QFormLayout::FieldRole)); - handleSpecFileUpdate(path); - connect(RpmManager::instance(), SIGNAL(specFileChanged(Utils::FileName)), - SLOT(handleSpecFileUpdate(Utils::FileName))); - connect(m_ui->editSpecFileButton, SIGNAL(clicked()), - SLOT(editSpecFile())); - } connect(m_step, SIGNAL(packageFilePathChanged()), this, SIGNAL(updateSummary())); connect(m_ui->packageNameLineEdit, SIGNAL(editingFinished()), @@ -172,17 +147,6 @@ void MaemoPackageCreationWidget::handleControlFileUpdate(const Utils::FileName & updateSummary(); } -void MaemoPackageCreationWidget::handleSpecFileUpdate(const Utils::FileName &spec) -{ - if (spec != RpmManager::specFile(m_step->target())) - return; - - updatePackageName(); - updateShortDescription(); - updateVersionInfo(); - updateSummary(); -} - void MaemoPackageCreationWidget::updatePackageManagerIcon() { const Utils::FileName path = DebianManager::debianDirectory(m_step->target()); @@ -297,11 +261,6 @@ void MaemoPackageCreationWidget::editDebianFile() editFile(path.toString()); } -void MaemoPackageCreationWidget::editSpecFile() -{ - editFile(RpmManager::specFile(m_step->target()).toString()); -} - void MaemoPackageCreationWidget::editFile(const QString &filePath) { Core::EditorManager::openEditor(filePath, Core::Id(), diff --git a/src/plugins/madde/maemopackagecreationwidget.h b/src/plugins/madde/maemopackagecreationwidget.h index 81504ae18eb..18d8aa182a0 100644 --- a/src/plugins/madde/maemopackagecreationwidget.h +++ b/src/plugins/madde/maemopackagecreationwidget.h @@ -52,13 +52,11 @@ public: private slots: void editDebianFile(); - void editSpecFile(); void versionInfoChanged(); void initGui(); void updateDebianFileList(const Utils::FileName &debianDir); void updateVersionInfo(); void handleControlFileUpdate(const Utils::FileName &debianDir); - void handleSpecFileUpdate(const Utils::FileName &spec); void setPackageManagerIcon(); void setPackageManagerName(); void setPackageName(); diff --git a/src/plugins/madde/maemopackageinstaller.cpp b/src/plugins/madde/maemopackageinstaller.cpp index 38aacde3cdc..bf0ee5805a8 100644 --- a/src/plugins/madde/maemopackageinstaller.cpp +++ b/src/plugins/madde/maemopackageinstaller.cpp @@ -73,28 +73,6 @@ QString MaemoDebianPackageInstaller::errorString() const } -MaemoRpmPackageInstaller::MaemoRpmPackageInstaller(QObject *parent) - : AbstractRemoteLinuxPackageInstaller(parent) -{ -} - -QString MaemoRpmPackageInstaller::installCommandLine(const QString &packageFilePath) const -{ - // rpm -U does not allow to re-install a package with the same version - // number, so we need --replacepkgs. Even then, it inexplicably reports - // a conflict if the files are not identical to the installed version, - // so we need --replacefiles as well. - // TODO: --replacefiles is dangerous. Is there perhaps a way around it - // after all? - return MaemoGlobal::devrootshPath() + QLatin1String(" rpm -Uhv --replacepkgs --replacefiles ") - + packageFilePath; -} - -QString MaemoRpmPackageInstaller::cancelInstallationCommandLine() const -{ - return QLatin1String("pkill rpm"); -} - HarmattanPackageInstaller::HarmattanPackageInstaller(QObject *parent) : AbstractRemoteLinuxPackageInstaller(parent) { diff --git a/src/plugins/madde/maemopackageinstaller.h b/src/plugins/madde/maemopackageinstaller.h index b197b8babf8..2232b48d1af 100644 --- a/src/plugins/madde/maemopackageinstaller.h +++ b/src/plugins/madde/maemopackageinstaller.h @@ -55,18 +55,6 @@ private: }; -class MaemoRpmPackageInstaller : public RemoteLinux::AbstractRemoteLinuxPackageInstaller -{ - Q_OBJECT -public: - MaemoRpmPackageInstaller(QObject *parent); - -private: - QString installCommandLine(const QString &packageFilePath) const; - QString cancelInstallationCommandLine() const; -}; - - class HarmattanPackageInstaller: public RemoteLinux::AbstractRemoteLinuxPackageInstaller { Q_OBJECT diff --git a/src/plugins/madde/maemoqtversion.cpp b/src/plugins/madde/maemoqtversion.cpp index f83333dc410..439cad01923 100644 --- a/src/plugins/madde/maemoqtversion.cpp +++ b/src/plugins/madde/maemoqtversion.cpp @@ -110,10 +110,6 @@ QList<ProjectExplorer::Abi> MaemoQtVersion::detectQtAbis() const ProjectExplorer::Abi::HarmattanLinuxFlavor, ProjectExplorer::Abi::ElfFormat, 32)); - } else if (m_deviceType == Core::Id(MeeGoOsType)) { - result.append(ProjectExplorer::Abi(ProjectExplorer::Abi::ArmArchitecture, ProjectExplorer::Abi::LinuxOS, - ProjectExplorer::Abi::MeegoLinuxFlavor, - ProjectExplorer::Abi::ElfFormat, 32)); } return result; } @@ -124,8 +120,6 @@ QString MaemoQtVersion::description() const return QCoreApplication::translate("QtVersion", "Maemo", "Qt Version is meant for Maemo5"); else if (m_deviceType == Core::Id(HarmattanOsType)) return QCoreApplication::translate("QtVersion", "Harmattan ", "Qt Version is meant for Harmattan"); - else if (m_deviceType == Core::Id(MeeGoOsType)) - return QCoreApplication::translate("QtVersion", "MeeGo", "Qt Version is meant for MeeGo"); return QString(); } @@ -159,8 +153,6 @@ QString MaemoQtVersion::platformName() const { if (m_deviceType == Maemo5OsType) return QLatin1String(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM); - if (m_deviceType == MeeGoOsType) - return QLatin1String(QtSupport::Constants::MEEGO_PLATFORM); return QLatin1String(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM); } @@ -168,8 +160,6 @@ QString MaemoQtVersion::platformDisplayName() const { if (m_deviceType == Maemo5OsType) return QLatin1String(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM_TR); - if (m_deviceType == MeeGoOsType) - return QLatin1String(QtSupport::Constants::MEEGO_PLATFORM_TR); return QLatin1String(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM_TR); } diff --git a/src/plugins/madde/maemoqtversionfactory.cpp b/src/plugins/madde/maemoqtversionfactory.cpp index 4440702c979..41790c78b8b 100644 --- a/src/plugins/madde/maemoqtversionfactory.cpp +++ b/src/plugins/madde/maemoqtversionfactory.cpp @@ -80,9 +80,9 @@ QtSupport::BaseQtVersion *MaemoQtVersionFactory::create(const Utils::FileName &q QString qmakePath = qmakeCommand.toString(); if (MaemoGlobal::isValidMaemo5QtVersion(qmakePath) - || MaemoGlobal::isValidHarmattanQtVersion(qmakePath) - || MaemoGlobal::isValidMeegoQtVersion(qmakePath)) + || MaemoGlobal::isValidHarmattanQtVersion(qmakePath)) { return new MaemoQtVersion(qmakeCommand, isAutoDetected, autoDetectionSource); + } return 0; } diff --git a/src/plugins/madde/maemorunconfiguration.cpp b/src/plugins/madde/maemorunconfiguration.cpp index 32ce32763b8..c5d53309978 100644 --- a/src/plugins/madde/maemorunconfiguration.cpp +++ b/src/plugins/madde/maemorunconfiguration.cpp @@ -123,9 +123,7 @@ QString MaemoRunConfiguration::commandPrefix() const if (!dev) return QString(); - QString prefix = environmentPreparationCommand() + QLatin1Char(';'); - if (dev->type() == Core::Id(MeeGoOsType)) - prefix += QLatin1String("DISPLAY=:0.0 "); + const QString prefix = environmentPreparationCommand() + QLatin1Char(';'); return QString::fromLatin1("%1 %2").arg(prefix, userEnvironmentChangesAsString()); } diff --git a/src/plugins/madde/maemorunfactories.cpp b/src/plugins/madde/maemorunfactories.cpp index 02b084b96b2..1749d15e8a0 100644 --- a/src/plugins/madde/maemorunfactories.cpp +++ b/src/plugins/madde/maemorunfactories.cpp @@ -157,8 +157,7 @@ bool MaemoRunConfigurationFactory::canHandle(Target *t) const if (!qobject_cast<Qt4Project *>(t->project())) return false; Core::Id devType = DeviceTypeProfileInformation::deviceTypeId(t->profile()); - return devType == Core::Id(Maemo5OsType) || devType == Core::Id(HarmattanOsType) - || devType == Core::Id(MeeGoOsType); + return devType == Core::Id(Maemo5OsType) || devType == Core::Id(HarmattanOsType); } QList<RunConfiguration *> MaemoRunConfigurationFactory::runConfigurationsForNode(Target *t, Node *n) diff --git a/src/plugins/madde/qt4maemodeployconfiguration.cpp b/src/plugins/madde/qt4maemodeployconfiguration.cpp index b02ce0cd5ad..52989197d7f 100644 --- a/src/plugins/madde/qt4maemodeployconfiguration.cpp +++ b/src/plugins/madde/qt4maemodeployconfiguration.cpp @@ -37,7 +37,6 @@ #include "maemoglobal.h" #include "maemoinstalltosysrootstep.h" #include "maemopackagecreationstep.h" -#include "rpmmanager.h" #include <coreplugin/icore.h> #include <projectexplorer/buildsteplist.h> @@ -116,11 +115,6 @@ Core::Id Qt4MaemoDeployConfiguration::harmattanId() return Core::Id("DeployToHarmattan"); } -Core::Id Qt4MaemoDeployConfiguration::meegoId() -{ - return Core::Id("DeployToMeego"); -} - DeploymentSettingsAssistant *Qt4MaemoDeployConfiguration::deploymentSettingsAssistant() { return static_cast<DeploymentSettingsAssistant *>(target()->project()->namedSettings(QLatin1String(DEPLOYMENT_ASSISTANT_SETTING)).value<QObject *>()); @@ -134,8 +128,6 @@ QString Qt4MaemoDeployConfiguration::qmakeScope() const return QLatin1String("maemo5"); else if (deviceType == Core::Id(HarmattanOsType)) return QLatin1String("contains(MEEGO_EDITION,harmattan)"); - else if (deviceType == Core::Id(MeeGoOsType)) - return QLatin1String("!isEmpty(MEEGO_VERSION_MAJOR):!contains(MEEGO_EDITION,harmattan)"); return QString("unix"); } @@ -147,9 +139,7 @@ QString Qt4MaemoDeployConfiguration::installPrefix() const return QLatin1String("/opt"); else if (deviceType == Core::Id(HarmattanOsType)) return QLatin1String("/opt"); - else if (deviceType == Core::Id(MeeGoOsType)) - return QLatin1String("/opt"); - return QString("unix"); + return QLatin1String("/usr/local"); } void Qt4MaemoDeployConfiguration::debianDirChanged(const Utils::FileName &dir) @@ -164,11 +154,7 @@ void Qt4MaemoDeployConfiguration::setupPackaging() return; disconnect(target()->project(), SIGNAL(fileListChanged()), this, SLOT(setupPackaging())); - - if (id() == Qt4MaemoDeployConfiguration::meegoId()) - ; - else - setupDebianPackaging(); + setupDebianPackaging(); } void Qt4MaemoDeployConfiguration::setupDebianPackaging() @@ -289,9 +275,6 @@ QList<Core::Id> Qt4MaemoDeployConfigurationFactory::availableCreationIds(Target << Qt4MaemoDeployConfiguration::fremantleWithoutPackagingId(); else if (deviceType == Core::Id(HarmattanOsType)) ids << Qt4MaemoDeployConfiguration::harmattanId(); - else if (deviceType == Core::Id(MeeGoOsType)) - ids << Qt4MaemoDeployConfiguration::meegoId(); - return ids; } @@ -303,8 +286,6 @@ QString Qt4MaemoDeployConfigurationFactory::displayNameForId(const Core::Id id) return tr("Build Debian Package and Install to Maemo5 Device"); else if (id == Qt4MaemoDeployConfiguration::harmattanId()) return tr("Build Debian Package and Install to Harmattan Device"); - else if (id == Qt4MaemoDeployConfiguration::meegoId()) - return tr("Build RPM Package and Install to MeeGo Device"); return QString(); } @@ -335,11 +316,6 @@ DeployConfiguration *Qt4MaemoDeployConfigurationFactory::create(Target *parent, dc->stepList()->insertStep(1, new MaemoInstallDebianPackageToSysrootStep(dc->stepList())); dc->stepList()->insertStep(2, new RemoteLinuxCheckForFreeDiskSpaceStep(dc->stepList())); dc->stepList()->insertStep(3, new MaemoUploadAndInstallPackageStep(dc->stepList())); - } else if (id == Qt4MaemoDeployConfiguration::meegoId()) { - dc->stepList()->insertStep(0, new MaemoRpmPackageCreationStep(dc->stepList())); - dc->stepList()->insertStep(1, new MaemoInstallRpmPackageToSysrootStep(dc->stepList())); - dc->stepList()->insertStep(2, new RemoteLinuxCheckForFreeDiskSpaceStep(dc->stepList())); - dc->stepList()->insertStep(3, new MeegoUploadAndInstallPackageStep(dc->stepList())); } return dc; } @@ -363,8 +339,6 @@ DeployConfiguration *Qt4MaemoDeployConfigurationFactory::restore(Target *parent, id = Qt4MaemoDeployConfiguration::fremantleWithPackagingId(); else if (deviceType == Core::Id(HarmattanOsType)) id = Qt4MaemoDeployConfiguration::harmattanId(); - else if (deviceType == Core::Id(MeeGoOsType)) - id = Qt4MaemoDeployConfiguration::meegoId(); } Qt4MaemoDeployConfiguration * const dc = qobject_cast<Qt4MaemoDeployConfiguration *>(create(parent, id)); diff --git a/src/plugins/madde/qt4maemodeployconfiguration.h b/src/plugins/madde/qt4maemodeployconfiguration.h index efca5c437e7..cc08f0ea357 100644 --- a/src/plugins/madde/qt4maemodeployconfiguration.h +++ b/src/plugins/madde/qt4maemodeployconfiguration.h @@ -76,7 +76,6 @@ public: static Core::Id fremantleWithPackagingId(); static Core::Id fremantleWithoutPackagingId(); static Core::Id harmattanId(); - static Core::Id meegoId(); RemoteLinux::DeploymentSettingsAssistant *deploymentSettingsAssistant(); diff --git a/src/plugins/madde/rpmmanager.cpp b/src/plugins/madde/rpmmanager.cpp deleted file mode 100644 index 628a4d75040..00000000000 --- a/src/plugins/madde/rpmmanager.cpp +++ /dev/null @@ -1,240 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ -** -** -** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ - -#include "rpmmanager.h" - -#include "maddedevice.h" -#include "maemoconstants.h" -#include "maemoglobal.h" -#include "maemopackagecreationstep.h" - -#include <coreplugin/documentmanager.h> -#include <projectexplorer/project.h> -#include <projectexplorer/target.h> -#include <qtsupport/qtprofileinformation.h> -#include <utils/filesystemwatcher.h> -#include <utils/qtcassert.h> - -#include <QBuffer> -#include <QByteArray> -#include <QDateTime> -#include <QDir> -#include <QProcess> - -#include <QMessageBox> - -// ----------------------------------------------------------------------- -// Helpers: -// ----------------------------------------------------------------------- - -namespace { - -const QLatin1String PackagingDirName("qtc_packaging"); -const QByteArray NameTag("Name"); -const QByteArray SummaryTag("Summary"); -const QByteArray VersionTag("Version"); -const QByteArray ReleaseTag("Release"); - -bool adaptTagValue(QByteArray &document, const QByteArray &fieldName, - const QByteArray &newFieldValue, bool caseSensitive) -{ - QByteArray adaptedLine = fieldName + ": " + newFieldValue; - const QByteArray completeTag = fieldName + ':'; - const int lineOffset = caseSensitive ? document.indexOf(completeTag) - : document.toLower().indexOf(completeTag.toLower()); - if (lineOffset == -1) { - document.append(adaptedLine).append('\n'); - return true; - } - - int newlineOffset = document.indexOf('\n', lineOffset); - bool updated = false; - if (newlineOffset == -1) { - newlineOffset = document.length(); - adaptedLine += '\n'; - updated = true; - } - const int replaceCount = newlineOffset - lineOffset; - if (!updated && document.mid(lineOffset, replaceCount) != adaptedLine) - updated = true; - if (updated) - document.replace(lineOffset, replaceCount, adaptedLine); - return updated; -} - -QByteArray valueForTag(const Utils::FileName &spec, const QByteArray &tag, QString *error) -{ - Utils::FileReader reader; - if (!reader.fetch(spec.toString(), error)) - return QByteArray(); - const QByteArray &content = reader.data(); - const QByteArray completeTag = tag.toLower() + ':'; - int index = content.toLower().indexOf(completeTag); - if (index == -1) - return QByteArray(); - index += completeTag.count(); - int endIndex = content.indexOf('\n', index); - if (endIndex == -1) - endIndex = content.count(); - return content.mid(index, endIndex - index).trimmed(); -} - -bool setValueForTag(const Utils::FileName &spec, const QByteArray &tag, const QByteArray &value, QString *error) -{ - Utils::FileReader reader; - if (!reader.fetch(spec.toString(), error)) - return false; - QByteArray content = reader.data(); - if (adaptTagValue(content, tag, value, false)) { - Utils::FileSaver saver(spec.toString()); - saver.write(content); - return saver.finalize(error); - } - return true; -} - -} // namespace - -namespace Madde { -namespace Internal { - -// ----------------------------------------------------------------------- -// RpmManager: -// ----------------------------------------------------------------------- - -RpmManager *RpmManager::m_instance = 0; - -RpmManager::RpmManager(QObject *parent) : - QObject(parent), - m_watcher(new Utils::FileSystemWatcher(this)) -{ - m_instance = this; - - m_watcher->setObjectName("Madde::RpmManager"); - connect(m_watcher, SIGNAL(fileChanged(QString)), - this, SLOT(specFileWasChanged(QString))); -} - -RpmManager::~RpmManager() -{ } - -RpmManager *RpmManager::instance() -{ - return m_instance; -} - -void RpmManager::monitor(const Utils::FileName &spec) -{ - QFileInfo fi = spec.toFileInfo(); - if (!fi.isFile()) - return; - - if (!m_watches.contains(spec)) { - m_watches.insert(spec, 1); - m_watcher->addFile(spec.toString(), Utils::FileSystemWatcher::WatchAllChanges); - } -} - -void RpmManager::ignore(const Utils::FileName &spec) -{ - int count = m_watches.value(spec, 0) - 1; - if (count < 0) - return; - if (count > 0) { - m_watches[spec] = 0; - } else { - m_watches.remove(spec); - m_watcher->removeFile(spec.toString()); - } -} - -QString RpmManager::projectVersion(const Utils::FileName &spec, QString *error) -{ - return QString::fromUtf8(valueForTag(spec, VersionTag, error)); -} - -bool RpmManager::setProjectVersion(const Utils::FileName &spec, const QString &version, QString *error) -{ - return setValueForTag(spec, VersionTag, version.toUtf8(), error); -} - -QString RpmManager::packageName(const Utils::FileName &spec) -{ - return QString::fromUtf8(valueForTag(spec, NameTag, 0)); -} - -bool RpmManager::setPackageName(const Utils::FileName &spec, const QString &packageName) -{ - return setValueForTag(spec, NameTag, packageName.toUtf8(), 0); -} - -QString RpmManager::shortDescription(const Utils::FileName &spec) -{ - return QString::fromUtf8(valueForTag(spec, SummaryTag, 0)); -} - -bool RpmManager::setShortDescription(const Utils::FileName &spec, const QString &description) -{ - return setValueForTag(spec, SummaryTag, description.toUtf8(), 0); -} - -Utils::FileName RpmManager::packageFileName(const Utils::FileName &spec, ProjectExplorer::Target *t) -{ - QtSupport::BaseQtVersion *lqt = QtSupport::QtProfileInformation::qtVersion(t->profile()); - if (!lqt) - return Utils::FileName(); - return Utils::FileName::fromString(packageName(spec) - + QLatin1Char('-') + projectVersion(spec) - + QLatin1Char('-') + QString::fromUtf8(valueForTag(spec, ReleaseTag, 0)) - + QLatin1Char('.') + MaemoGlobal::architecture(lqt->qmakeCommand().toString()) - + QLatin1String(".rpm")); -} - -Utils::FileName RpmManager::specFile(ProjectExplorer::Target *target) -{ - Utils::FileName path = Utils::FileName::fromString(target->project()->projectDirectory()); - path.appendPath(PackagingDirName); - Core::Id deviceType = ProjectExplorer::DeviceTypeProfileInformation::deviceTypeId(target->profile()); - if (deviceType == Core::Id(MeeGoOsType)) - path.appendPath(QLatin1String("meego.spec")); - else - path.clear(); - return path; -} - -void RpmManager::specFileWasChanged(const QString &path) -{ - Utils::FileName fn = Utils::FileName::fromString(path); - QTC_ASSERT(m_watches.contains(fn), return); - emit specFileChanged(fn); -} - -} // namespace Internal -} // namespace Madde diff --git a/src/plugins/madde/rpmmanager.h b/src/plugins/madde/rpmmanager.h deleted file mode 100644 index 957b4c69b7e..00000000000 --- a/src/plugins/madde/rpmmanager.h +++ /dev/null @@ -1,90 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: http://www.qt-project.org/ -** -** -** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -**************************************************************************/ - -#ifndef RPMMANAGER_H -#define RPMMANAGER_H - -#include <coreplugin/id.h> -#include <utils/fileutils.h> - -#include <QObject> -#include <QHash> - -namespace Utils { class FileSystemWatcher; } -namespace ProjectExplorer { class Target; } -namespace Qt4ProjectManager { class Qt4BuildConfiguration; } - -namespace Madde { -namespace Internal { -class MaddePlugin; - -class RpmManager : public QObject -{ - Q_OBJECT -public: - ~RpmManager(); - - static RpmManager *instance(); - - // ref counted: - void monitor(const Utils::FileName &specFile); - void ignore(const Utils::FileName &specFile); - - static QString projectVersion(const Utils::FileName &spec, QString *error = 0); - static bool setProjectVersion(const Utils::FileName &spec, const QString &version, QString *error = 0); - static QString packageName(const Utils::FileName &spec); - static bool setPackageName(const Utils::FileName &spec, const QString &packageName); - static QString shortDescription(const Utils::FileName &spec); - static bool setShortDescription(const Utils::FileName &spec, const QString &description); - - static Utils::FileName packageFileName(const Utils::FileName &spec, ProjectExplorer::Target *t); - - static Utils::FileName specFile(ProjectExplorer::Target *target); - -signals: - void specFileChanged(const Utils::FileName &spec); - -private slots: - void specFileWasChanged(const QString &path); - -private: - explicit RpmManager(QObject *parent = 0); - - Utils::FileSystemWatcher *m_watcher; - QHash<Utils::FileName, int> m_watches; - static RpmManager *m_instance; - - friend class MaddePlugin; -}; - -} // namespace Internal -} // namespace Madde - -#endif // DEBIANMANAGER_H diff --git a/src/plugins/projectexplorer/abi.cpp b/src/plugins/projectexplorer/abi.cpp index 117b3749bea..3590c0addd3 100644 --- a/src/plugins/projectexplorer/abi.cpp +++ b/src/plugins/projectexplorer/abi.cpp @@ -302,7 +302,7 @@ Abi::Abi(const Architecture &a, const OS &o, m_osFlavor = UnknownFlavor; break; case ProjectExplorer::Abi::LinuxOS: - if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MeegoLinuxFlavor) + if (m_osFlavor < GenericLinuxFlavor || m_osFlavor > MaemoLinuxFlavor) m_osFlavor = UnknownFlavor; break; case ProjectExplorer::Abi::BsdOS: @@ -388,8 +388,6 @@ Abi::Abi(const QString &abiString) : m_osFlavor = MaemoLinuxFlavor; else if (abiParts.at(2) == QLatin1String("harmattan") && m_os == LinuxOS) m_osFlavor = HarmattanLinuxFlavor; - else if (abiParts.at(2) == QLatin1String("meego") && m_os == LinuxOS) - m_osFlavor = MeegoLinuxFlavor; else if (abiParts.at(2) == QLatin1String("generic") && m_os == MacOS) m_osFlavor = GenericMacFlavor; else if (abiParts.at(2) == QLatin1String("device") && m_os == SymbianOS) @@ -572,8 +570,6 @@ QString Abi::toString(const OSFlavor &of) return QLatin1String("maemo"); case ProjectExplorer::Abi::HarmattanLinuxFlavor: return QLatin1String("harmattan"); - case ProjectExplorer::Abi::MeegoLinuxFlavor: - return QLatin1String("meego"); case ProjectExplorer::Abi::GenericMacFlavor: return QLatin1String("generic"); case ProjectExplorer::Abi::SymbianDeviceFlavor: @@ -633,8 +629,8 @@ QList<Abi::OSFlavor> Abi::flavorsForOs(const Abi::OS &o) case BsdOS: return result << FreeBsdFlavor << OpenBsdFlavor << NetBsdFlavor; case LinuxOS: - return result << GenericLinuxFlavor << HarmattanLinuxFlavor << MaemoLinuxFlavor << MeegoLinuxFlavor - << AndroidLinuxFlavor; + return result << GenericLinuxFlavor << HarmattanLinuxFlavor << MaemoLinuxFlavor + << AndroidLinuxFlavor;; case MacOS: return result << GenericMacFlavor; case SymbianOS: diff --git a/src/plugins/projectexplorer/abi.h b/src/plugins/projectexplorer/abi.h index 669af8da3f8..09c594389c8 100644 --- a/src/plugins/projectexplorer/abi.h +++ b/src/plugins/projectexplorer/abi.h @@ -77,7 +77,6 @@ public: AndroidLinuxFlavor, HarmattanLinuxFlavor, MaemoLinuxFlavor, - MeegoLinuxFlavor, // Mac GenericMacFlavor, diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp index 2216aa54cbc..91d34a2ed7d 100644 --- a/src/plugins/projectexplorer/gcctoolchain.cpp +++ b/src/plugins/projectexplorer/gcctoolchain.cpp @@ -244,10 +244,6 @@ static QList<ProjectExplorer::Abi> guessGccAbi(const QString &m) if (flavor == Abi::UnknownFlavor) flavor = ProjectExplorer::Abi::FreeBsdFlavor; format = ProjectExplorer::Abi::ElfFormat; - } else if (p == QLatin1String("meego")) { - os = ProjectExplorer::Abi::LinuxOS; - flavor = ProjectExplorer::Abi::MeegoLinuxFlavor; - format = ProjectExplorer::Abi::ElfFormat; } else if (p == QLatin1String("symbianelf")) { os = ProjectExplorer::Abi::SymbianOS; flavor = ProjectExplorer::Abi::SymbianDeviceFlavor; @@ -1093,13 +1089,10 @@ void ProjectExplorerPlugin::testGccAbiGuessing_data() << QString::fromLatin1("x86_64-redhat-linux") << (QStringList() << QLatin1String("x86-linux-generic-elf-64bit") << QLatin1String("x86-linux-generic-elf-32bit")); - QTest::newRow("Linux 7") // Meego - << QString::fromLatin1("armv5tel-meego-linux-gnueabi") - << (QStringList() << QLatin1String("arm-linux-meego-elf-32bit")); - QTest::newRow("Linux 8") + QTest::newRow("Linux 7") << QString::fromLatin1("armv5tl-montavista-linux-gnueabi") << (QStringList() << QLatin1String("arm-linux-generic-elf-32bit")); - QTest::newRow("Linux 9") + QTest::newRow("Linux 8") << QString::fromLatin1("arm-angstrom-linux-gnueabi") << (QStringList() << QLatin1String("arm-linux-generic-elf-32bit")); diff --git a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp index a959803b31f..ecaabb2c351 100644 --- a/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp +++ b/src/plugins/qt4projectmanager/wizards/abstractmobileappwizard.cpp @@ -96,8 +96,7 @@ void AbstractMobileAppWizardDialog::addMobilePages() const bool shouldAddSymbianPage = m_targetsPage || isQtPlatformSelected(QtSupport::Constants::SYMBIAN_PLATFORM); const bool shouldAddMaemoPage = m_targetsPage - || isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM) - || isQtPlatformSelected(QtSupport::Constants::MEEGO_PLATFORM); + || isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM); const bool shouldAddHarmattanPage = m_targetsPage || isQtPlatformSelected(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM); @@ -151,8 +150,6 @@ int AbstractMobileAppWizardDialog::nextId() const // If Symbian target and Qt Quick components for Symbian, skip the mobile options page. else if (isQtPlatformSelected(QtSupport::Constants::SYMBIAN_PLATFORM) && m_ignoreGeneralOptions) return m_symbianOptionsPageId; - else if (isQtPlatformSelected(QtSupport::Constants::MEEGO_PLATFORM)) - return m_maemoOptionsPageId; else if (isQtPlatformSelected(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM)) return m_harmattanOptionsPageId; else @@ -160,16 +157,14 @@ int AbstractMobileAppWizardDialog::nextId() const } else if (currentPage() == m_genericOptionsPage) { if (isQtPlatformSelected(QtSupport::Constants::SYMBIAN_PLATFORM)) return m_symbianOptionsPageId; - else if (isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM) - || isQtPlatformSelected(QtSupport::Constants::MEEGO_PLATFORM)) + else if (isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM)) return m_maemoOptionsPageId; else if (isQtPlatformSelected(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM)) return m_harmattanOptionsPageId; else return idOfNextGenericPage(); } else if (currentPage() == m_symbianOptionsPage) { - if (isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM) - || isQtPlatformSelected(QtSupport::Constants::MEEGO_PLATFORM)) + if (isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM)) return m_maemoOptionsPageId; else if (isQtPlatformSelected(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM)) return m_harmattanOptionsPageId; @@ -204,8 +199,7 @@ void AbstractMobileAppWizardDialog::initializePage(int id) order << m_genericItem; if (isQtPlatformSelected(QtSupport::Constants::SYMBIAN_PLATFORM)) order << m_symbianItem; - if (isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM) - || isQtPlatformSelected(QtSupport::Constants::MEEGO_PLATFORM)) + if (isQtPlatformSelected(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM)) order << m_maemoItem; if (isQtPlatformSelected(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM)) order << m_harmattanItem; diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp index bf54df1165f..21fc31d7928 100644 --- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp +++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp @@ -117,7 +117,6 @@ GuiAppParameters GuiAppWizardDialog::parameters() const rc.isMobileApplication = true; if (isQtPlatformSelected(QLatin1String(QtSupport::Constants::MAEMO_FREMANTLE_PLATFORM)) || isQtPlatformSelected(QLatin1String(QtSupport::Constants::MEEGO_HARMATTAN_PLATFORM)) - || isQtPlatformSelected(QLatin1String(QtSupport::Constants::MEEGO_PLATFORM)) || isQtPlatformSelected(QLatin1String(QtSupport::Constants::ANDROID_PLATFORM))) { rc.widgetWidth = 800; rc.widgetHeight = 480; diff --git a/src/plugins/qtsupport/qtsupportconstants.h b/src/plugins/qtsupport/qtsupportconstants.h index c53a85ef41b..fbe4bf1e882 100644 --- a/src/plugins/qtsupport/qtsupportconstants.h +++ b/src/plugins/qtsupport/qtsupportconstants.h @@ -63,7 +63,6 @@ const char FEATURE_DESKTOP[] = "QtSupport.Wizards.FeatureDesktop"; // Platforms const char MEEGO_HARMATTAN_PLATFORM[] = "MeeGo/Harmattan"; const char MAEMO_FREMANTLE_PLATFORM[] = "Maemo/Fremantle"; -const char MEEGO_PLATFORM[] = "Meego"; const char SYMBIAN_PLATFORM[] = "Symbian"; const char DESKTOP_PLATFORM[] = "Desktop"; const char EMBEDDED_LINUX_PLATFORM[] = "Embedded Linux"; @@ -72,7 +71,6 @@ const char ANDROID_PLATFORM[] = "Android"; const char MEEGO_HARMATTAN_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "MeeGo/Harmattan"); const char MAEMO_FREMANTLE_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "Maemo/Fremantle"); -const char MEEGO_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "Meego"); const char SYMBIAN_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "Symbian"); const char DESKTOP_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "Desktop"); const char EMBEDDED_LINUX_PLATFORM_TR[] = QT_TRANSLATE_NOOP("QtSupport", "Embedded Linux"); |