--- a/controlpanelplugins/themeplugin/src/cpthemelistmodel.cpp	Fri Jul 23 11:04:51 2010 +0800
+++ b/controlpanelplugins/themeplugin/src/cpthemelistmodel.cpp	Thu Aug 05 11:28:29 2010 +0800
@@ -51,7 +51,7 @@
         mFileWatcher->addPaths(themePaths);
     }
    
-    connect(mFileWatcher, SIGNAL(directoryChanged(QString&)),
+    connect(mFileWatcher, SIGNAL(directoryChanged(QString)),
            this, SLOT(themeListChanged()));
     
     // data for the list which appears after the themes:
@@ -113,14 +113,10 @@
                 case Qt::DisplayRole:
                     retVal = list->at(row).name();
                     break;
-
+#ifdef CP_THEME_PREVIEW_DEFINED
                 case Qt::DecorationRole:
                     retVal = list->at(row).icon();
                     break;
-
-                case Qt::SizeHintRole:
-                    retVal = list->at(row).icon().size();
-                    break;
                     
                 case PortraitPreviewRole:
           	        retVal = list->at(row).portraitPreviewIcon();
@@ -129,7 +125,11 @@
                 case LandscapePreviewRole:
                     retVal = list->at(row).landscapePreviewIcon();
                     break;
-                    
+#endif                    
+                case Qt::SizeHintRole:
+                    retVal = list->at(row).icon().size();
+                    break;
+                                
                 case ItemDataRole:
                     retVal = list->at(row).itemData();
                     break;