summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/scriptengine.cpp
diff options
context:
space:
mode:
authorkh1 <karsten.heimrich@digia.com>2014-06-02 09:46:41 +0200
committerKarsten Heimrich <karsten.heimrich@digia.com>2014-06-02 09:57:13 +0200
commite89721bce16d6486e47b5b88d24467face5a11aa (patch)
tree268bad4a296f3dd02c83d1735fd7b76be38623d8 /src/libs/installer/scriptengine.cpp
parentd5b02dd37312ee9a9682caff9fae925c04323e8f (diff)
Cleanup to support Qt5 only.
Change-Id: Ib8f61229ce2f07e52c22a15e10dc817aca860ead Reviewed-by: Niels Weber <niels.weber@digia.com>
Diffstat (limited to 'src/libs/installer/scriptengine.cpp')
-rw-r--r--src/libs/installer/scriptengine.cpp27
1 files changed, 0 insertions, 27 deletions
diff --git a/src/libs/installer/scriptengine.cpp b/src/libs/installer/scriptengine.cpp
index 9908ce29d..e131390b3 100644
--- a/src/libs/installer/scriptengine.cpp
+++ b/src/libs/installer/scriptengine.cpp
@@ -116,15 +116,9 @@ QScriptValue qDesktopServicesDisplayName(QScriptContext *context, QScriptEngine
if (check.isError())
return check;
-#if QT_VERSION < 0x050000
- const QDesktopServices::StandardLocation location =
- static_cast< QDesktopServices::StandardLocation >(context->argument(0).toInt32());
- return QDesktopServices::displayName(location);
-#else
const QStandardPaths::StandardLocation location =
static_cast< QStandardPaths::StandardLocation >(context->argument(0).toInt32());
return QStandardPaths::displayName(location);
-#endif
}
QScriptValue qDesktopServicesStorageLocation(QScriptContext *context, QScriptEngine *engine)
@@ -134,15 +128,9 @@ QScriptValue qDesktopServicesStorageLocation(QScriptContext *context, QScriptEng
if (check.isError())
return check;
-#if QT_VERSION < 0x050000
- const QDesktopServices::StandardLocation location =
- static_cast< QDesktopServices::StandardLocation >(context->argument(0).toInt32());
- return QDesktopServices::storageLocation(location);
-#else
const QStandardPaths::StandardLocation location =
static_cast< QStandardPaths::StandardLocation >(context->argument(0).toInt32());
return QStandardPaths::writableLocation(location);
-#endif
}
QScriptValue qFileDialogGetExistingDirectory(QScriptContext *context, QScriptEngine *engine)
@@ -359,20 +347,6 @@ QScriptValue ScriptEngine::generateMessageBoxObject()
QScriptValue ScriptEngine::generateDesktopServicesObject()
{
QScriptValue desktopServices = newArray();
-#if QT_VERSION < 0x050000
- desktopServices.setProperty(QLatin1String("DesktopLocation"), QDesktopServices::DesktopLocation);
- desktopServices.setProperty(QLatin1String("DesktopLocation"), QDesktopServices::DesktopLocation);
- desktopServices.setProperty(QLatin1String("DocumentsLocation"), QDesktopServices::DocumentsLocation);
- desktopServices.setProperty(QLatin1String("FontsLocation"), QDesktopServices::FontsLocation);
- desktopServices.setProperty(QLatin1String("ApplicationsLocation"), QDesktopServices::ApplicationsLocation);
- desktopServices.setProperty(QLatin1String("MusicLocation"), QDesktopServices::MusicLocation);
- desktopServices.setProperty(QLatin1String("MoviesLocation"), QDesktopServices::MoviesLocation);
- desktopServices.setProperty(QLatin1String("PicturesLocation"), QDesktopServices::PicturesLocation);
- desktopServices.setProperty(QLatin1String("TempLocation"), QDesktopServices::TempLocation);
- desktopServices.setProperty(QLatin1String("HomeLocation"), QDesktopServices::HomeLocation);
- desktopServices.setProperty(QLatin1String("DataLocation"), QDesktopServices::DataLocation);
- desktopServices.setProperty(QLatin1String("CacheLocation"), QDesktopServices::CacheLocation);
-#else
desktopServices.setProperty(QLatin1String("DesktopLocation"), QStandardPaths::DesktopLocation);
desktopServices.setProperty(QLatin1String("DesktopLocation"), QStandardPaths::DesktopLocation);
desktopServices.setProperty(QLatin1String("DocumentsLocation"), QStandardPaths::DocumentsLocation);
@@ -385,7 +359,6 @@ QScriptValue ScriptEngine::generateDesktopServicesObject()
desktopServices.setProperty(QLatin1String("HomeLocation"), QStandardPaths::HomeLocation);
desktopServices.setProperty(QLatin1String("DataLocation"), QStandardPaths::DataLocation);
desktopServices.setProperty(QLatin1String("CacheLocation"), QStandardPaths::CacheLocation);
-#endif
desktopServices.setProperty(QLatin1String("openUrl"),
newFunction(qDesktopServicesOpenUrl));