6 files changed, 12 insertions, 17 deletions

diff --git a/src/corelib/core/mcomponentdata.cpp b/src/corelib/core/mcomponentdata.cpp
index d988a423..63574976 100644
--- a/src/corelib/core/mcomponentdata.cpp
+++ b/src/corelib/core/mcomponentdata.cpp
@@ -157,7 +157,6 @@ MComponentDataPrivate::MComponentDataPrivate()
     windows(),
     feedbackPlayer(0),
     locale(),
-    imglistFilename(),
     appName(),
     binaryName(),
     deviceName(),
@@ -307,7 +306,11 @@ void MComponentDataPrivate::init(int &argc, char **argv, const QString &appIdent
     // Therefore, we can not parse it here.)
     reverseLayout = qApp->layoutDirection() == Qt::RightToLeft;
 
+#ifdef __arm__
+    MTheme::ThemeService themeService = MTheme::RemoteTheme;
+#else
     MTheme::ThemeService themeService = MTheme::AnyTheme;
+#endif
 
 #ifdef HAVE_N900
     //#MS - default commadline: /usr/bin/widgetsgallery -target N900 -fullscreen
@@ -325,10 +328,6 @@ void MComponentDataPrivate::init(int &argc, char **argv, const QString &appIdent
         qInstallMsgHandler(handler);
     }
 
-    if (themeService == MTheme::RemoteTheme && !imglistFilename.isEmpty()) {
-        qFatal("-genimglist switch can't be used with remote theme daemon");
-    }
-
     QFileInfo fileInfo(argv[0]);
     QString themeIdentifier = fileInfo.fileName();
     if (!appIdentifier.isEmpty()) {
@@ -337,7 +336,7 @@ void MComponentDataPrivate::init(int &argc, char **argv, const QString &appIdent
             themeIdentifier = appIdentifier;
         }
     }
-    theme = new MTheme(themeIdentifier, imglistFilename, themeService);
+    theme = new MTheme(themeIdentifier, QString(), themeService);
     deviceProfile = new MDeviceProfile();
 
     QString catalog = appIdentifier;
@@ -491,11 +490,6 @@ void MComponentDataPrivate::parseArguments(int &argc, char **argv,
         else if (s == "-dev") {
             showSize = true;
             showPosition = true;
-        } else if (s == "-genimglist") {
-            if (i < (argc - 1)) {
-                imglistFilename = argv[i+1];
-                i++;
-            }
         } else if (s == "-remote-theme") {
             themeService = MTheme::RemoteTheme;
         } else if (s == "-local-theme") {
@@ -702,7 +696,7 @@ void MComponentData::reinit(int &argc, char **argv, const QString &appIdentifier
     MLocale::setDefault(systemLocale);
 
     if (MTheme::instance()) {
-        MTheme::instance()->d_func()->reinit(d->appName, d->imglistFilename, MTheme::AnyTheme);
+        MTheme::instance()->d_func()->reinit(d->appName);
     }
 
     if (newService) {
diff --git a/src/corelib/core/mcomponentdata_p.h b/src/corelib/core/mcomponentdata_p.h
index 0717a3e4..faa0915b 100644
--- a/src/corelib/core/mcomponentdata_p.h
+++ b/src/corelib/core/mcomponentdata_p.h
@@ -71,7 +71,6 @@ public:
     QList<MWindow *> windows;
     MFeedbackPlayer *feedbackPlayer;
     MLocale locale;
-    QString imglistFilename;
     QString appName;
     QString binaryName;
     QString deviceName;
diff --git a/src/corelib/theme/mremotethemedaemon.cpp b/src/corelib/theme/mremotethemedaemon.cpp
index 75ff5e4d..a826c900 100644
--- a/src/corelib/theme/mremotethemedaemon.cpp
+++ b/src/corelib/theme/mremotethemedaemon.cpp
@@ -124,6 +124,8 @@ bool MRemoteThemeDaemonPrivate::waitForServer(const QString &serverAddress, int
             }
         }
 
+        qCritical() << "Failed to connect to remote themedaemon. Retrying in one second.";
+
         // wait for a while
 #ifndef Q_OS_WIN
         sleep(1);
diff --git a/src/corelib/theme/mtheme.cpp b/src/corelib/theme/mtheme.cpp
index 95c95728..b36638a4 100644
--- a/src/corelib/theme/mtheme.cpp
+++ b/src/corelib/theme/mtheme.cpp
@@ -554,7 +554,7 @@ bool MTheme::hasPendingRequests()
     return instance()->d_ptr->themeDaemon->hasPendingRequests();
 }
 
-void MThemePrivate::reinit(const QString &newApplicationName, const QString &, MTheme::ThemeService)
+void MThemePrivate::reinit(const QString &newApplicationName)
 {
     delete application;
     applicationName = newApplicationName;
diff --git a/src/corelib/theme/mtheme.h b/src/corelib/theme/mtheme.h
index 322e79f2..9ded1f2b 100644
--- a/src/corelib/theme/mtheme.h
+++ b/src/corelib/theme/mtheme.h
@@ -101,8 +101,8 @@ public:
 
 
      \a applicationName is used as the first part of the search path for resources, ensuring that application
-     specific theme resources are prioritized. If \a imglistFilename is passed, MTheme will create a local
-     theme daemon and output the list of used images to the specified file.
+     specific theme resources are prioritized.
+     \a imglistFilename is not in use anymore.
      */
     MTheme(const QString &applicationName, const QString &imglistFilename = QString(), ThemeService themeService = AnyTheme);
 
diff --git a/src/corelib/theme/mtheme_p.h b/src/corelib/theme/mtheme_p.h
index a624bc3e..8c35341f 100644
--- a/src/corelib/theme/mtheme_p.h
+++ b/src/corelib/theme/mtheme_p.h
@@ -165,7 +165,7 @@ public:
     /*!
      * Reinitializes the theme to correspond to the new application name
      */
-    void reinit(const QString &applicationName, const QString &imglistFilename = QString(), MTheme::ThemeService themeService = MTheme::AnyTheme);
+    void reinit(const QString &applicationName);
 
     static void registerStyleContainer(MStyleContainer *container);
     static void unregisterStyleContainer(MStyleContainer *container);