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

[mdictionary] / trunk / src / base / base.pro

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index 2a02ca7..f48ede5 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -33,7 +33,8 @@ SOURCES += gui/main.cpp\
     gui/DictTypeSelectDialog.cpp \
     backbone/History.cpp \
     gui/HistoryListDialog.cpp \
-    backbone/Bookmarks.cpp
+    backbone/Bookmarks.cpp \
+    gui/WordListItem.cpp
 
 HEADERS  += gui/MainWindow.h \
     gui/SearchBarWidget.h \
@@ -52,6 +53,7 @@ HEADERS  += gui/MainWindow.h \
     gui/HistoryListDialog.h \
     ../includes/GUIInterface.h \
     backbone/Bookmarks.h \
+    gui/WordListItem.h \
     backbone/BookmarkTranslations.h
 
 FORMS    += gui/MainWindow.ui
@@ -75,9 +77,15 @@ unix {
 
   target.path =$$BINDIR
 
+maemo5 {
   desktop.path = $$DATADIR/applications/hildon
-  desktop.files += ../../../data/other/$${TARGET}.desktop
-
   icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
+}
+
+unix {
+  desktop.path = $$DATADIR/applications
+  icon64.path = $$DATADIR/icons
+}
+  desktop.files += ../../../data/other/$${TARGET}.desktop
   icon64.files += ../../../data/icons/64x64/$${TARGET}.png
 }