Merge branch 'qml' of ssh://drop.maemo.org/git/mdictionary into qml

[mdictionary] / src / mdictionary / mdictionary.pro

diff --git a/src/mdictionary/mdictionary.pro b/src/mdictionary/mdictionary.pro
index 74cf8a8..1bb8dae 100644 (file)
--- a/src/mdictionary/mdictionary.pro
+++ b/src/mdictionary/mdictionary.pro
@@ -129,7 +129,11 @@ unix {
     shared.files += ../../data/xsl/mask.png
 
     #css
-    meego {
+    meego_css {
+        css.path = $$DATA_DIR/css
+        css.files += ../../data/css_meego/style.css
+    }
+    else:meego {
         css.path = $$DATA_DIR/css
         css.files += ../../data/css_meego/style.css
     }
@@ -143,7 +147,19 @@ unix {
     }
 
     #css images
-    meego {
+    meego_css {
+        css_images.path = $$DATA_DIR/css/images
+        css_images.files += ../../data/css_meego/images/header-background.png
+        css_images.files += ../../data/css_meego/images/header-border.png
+        css_images.files += ../../data/css_meego/images/shadow-grey-bg.png
+        css_images.files += ../../data/css_meego/images/shadow-white-bg.png
+        css_images.files += ../../data/css_meego/images/tab-background.png
+        css_images.files += ../../data/css_meego/images/key-background.png
+        css_images.files += ../../data/css_meego/images/shadow-transparent-bg.png
+        css_images.files += ../../data/css_meego/images/splash2.png
+        css_images.files += ../../data/css_meego/images/people.png
+    }
+    else:meego {
        css_images.path = $$DATA_DIR/css/images
         css_images.files += ../../data/css_meego/images/header-background.png
         css_images.files += ../../data/css_meego/images/header-border.png
@@ -151,8 +167,9 @@ unix {
         css_images.files += ../../data/css_meego/images/shadow-white-bg.png
         css_images.files += ../../data/css_meego/images/tab-background.png
         css_images.files += ../../data/css_meego/images/key-background.png
-        css_images.files += ../../data/css_meego/images/shadow-transparent-bg. png
+        css_images.files += ../../data/css_meego/images/shadow-transparent-bg.png
         css_images.files += ../../data/css_meego/images/splash2.png
+        css_images.files += ../../data/css_meego/images/people.png
     }
     else:maemo5 {
         css.path = $$DATA_DIR/css