Commit 26a5ac98 authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Prefer Q_OS_ANDROID over ANDROID

Preparation for Android toolchain change
parent aa6e87f3
......@@ -149,7 +149,7 @@ QString MarbleDirs::systemPath()
}
#endif // mac bundle
#ifdef ANDROID
#ifdef Q_OS_ANDROID
systempath = "assets:/data";
return systempath;
#endif
......@@ -207,7 +207,7 @@ QString MarbleDirs::pluginSystemPath()
if ( !runTimeMarblePluginPath.isEmpty() )
return runTimeMarblePluginPath;
#ifdef ANDROID
#ifdef Q_OS_ANDROID
return "assets:/plugins";
#endif
......
......@@ -52,7 +52,7 @@ class PluginManagerPrivate
QList<RoutingRunnerPlugin *> m_routingRunnerPlugins;
QList<const ParseRunnerPlugin *> m_parsingRunnerPlugins;
#ifdef ANDROID
#ifdef Q_OS_ANDROID
QStringList m_pluginPaths;
#endif
};
......@@ -66,7 +66,7 @@ PluginManager::PluginManager( QObject *parent ) : QObject( parent ),
d( new PluginManagerPrivate() )
{
//Checking assets:/plugins for uninstalled plugins
#ifdef ANDROID
#ifdef Q_OS_ANDROID
installPluginsFromAssets();
#endif
}
......@@ -213,7 +213,7 @@ void PluginManagerPrivate::loadPlugins()
foreach( const QString &fileName, pluginFileNameList ) {
// mDebug() << fileName << " - " << MarbleDirs::pluginPath( fileName );
QString const path = MarbleDirs::pluginPath( fileName );
#ifdef ANDROID
#ifdef Q_OS_ANDROID
QFileInfo targetFile( path );
if ( !m_pluginPaths.contains( targetFile.canonicalFilePath() ) ) {
// @todo Delete the file here?
......@@ -256,7 +256,7 @@ void PluginManagerPrivate::loadPlugins()
mDebug() << Q_FUNC_INFO << "Time elapsed:" << t.elapsed() << "ms";
}
#ifdef ANDROID
#ifdef Q_OS_ANDROID
void PluginManager::installPluginsFromAssets() const
{
d->m_pluginPaths.clear();
......
......@@ -151,7 +151,7 @@ Q_SIGNALS:
private:
Q_DISABLE_COPY( PluginManager )
#ifdef ANDROID
#ifdef Q_OS_ANDROID
void installPluginsFromAssets() const;
#endif
......
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