Commit 75a86a79 authored by Christian Kandeler's avatar Christian Kandeler Committed by Alessandro Portale
Browse files

MeeGo: Make use of new qmake flags.

Change-Id: I0cbb934e2c49c7c99b6fff0b8f92e5802471ef8c
Reviewed-on: http://codereview.qt.nokia.com/1326

Reviewed-by: default avatarQt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: default avatarAlessandro Portale <alessandro.portale@nokia.com>
parent 9216598e
......@@ -55,11 +55,12 @@ symbian {
desktopfile.path = /usr/share/applications/hildon
icon.files = $${TARGET}64.png
icon.path = /usr/share/icons/hicolor/64x64/apps
} else {
} else:!isEmpty(MEEGO_VERSION_MAJOR) {
desktopfile.files = $${TARGET}_harmattan.desktop
desktopfile.path = /usr/share/applications
icon.files = $${TARGET}80.png
icon.path = /usr/share/icons/hicolor/80x80/apps
} else { # Assumed to be a Desktop Unix
copyCommand =
for(deploymentfolder, DEPLOYMENTFOLDERS) {
source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
......@@ -98,13 +99,18 @@ symbian {
export($$itempath)
INSTALLS += $$item
}
!isEmpty(desktopfile.path) {
export(icon.files)
export(icon.path)
export(desktopfile.files)
export(desktopfile.path)
INSTALLS += icon desktopfile
}
target.path = $${installPrefix}/bin
export(icon.files)
export(icon.path)
export(desktopfile.files)
export(desktopfile.path)
export(target.path)
INSTALLS += desktopfile icon target
INSTALLS += target
}
export (ICON)
......
......@@ -59,7 +59,7 @@ const QString AbstractMobileApp::ProFileComment(QLatin1String("#"));
const QString AbstractMobileApp::DeploymentPriFileName(QLatin1String("deployment.pri"));
const QString AbstractMobileApp::FileChecksum(QLatin1String("checksum"));
const QString AbstractMobileApp::FileStubVersion(QLatin1String("version"));
const int AbstractMobileApp::StubVersion = 5;
const int AbstractMobileApp::StubVersion = 6;
AbstractMobileApp::AbstractMobileApp()
: m_orientation(ScreenOrientationAuto)
......
......@@ -340,8 +340,14 @@ QString DeployableFilesPerProFile::proFileScope() const
{
const QtSupport::BaseQtVersion *const qv = qtVersion();
QTC_ASSERT(qv, return QString());
return QLatin1String(MaemoGlobal::osType(qv->qmakeCommand()) == LinuxDeviceConfiguration::Maemo5OsType
? "maemo5" : "unix:!symbian:!maemo5");
const QString osType = MaemoGlobal::osType(qv->qmakeCommand());
if (osType == LinuxDeviceConfiguration::Maemo5OsType)
return QLatin1String("maemo5");
if (osType == LinuxDeviceConfiguration::HarmattanOsType)
return QLatin1String("contains(MEEGO_EDITION,harmattan)");
if (osType == LinuxDeviceConfiguration::MeeGoOsType)
return QLatin1String("!isEmpty(MEEGO_VERSION_MAJOR):!contains(MEEGO_EDITION,harmattan)");
return QLatin1String("unix:!symbian:!maemo5:isEmpty(MEEGO_VERSION_MAJOR)");
}
QString DeployableFilesPerProFile::installPrefix() const
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment