Merge branch 'master' into cache

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

diff --git a/trunk/src/base/base.pro b/trunk/src/base/base.pro
index d504c20..03940d0 100644 (file)
--- a/trunk/src/base/base.pro
+++ b/trunk/src/base/base.pro
@@ -1,28 +1,23 @@
-#-------------------------------------------------
-#
+# -------------------------------------------------
 # Project created by QtCreator 2010-08-03T08:54:27
-#
 #-------------------------------------------------
 
-QT       += core gui xmlpatterns xml
+QT += core \
+    gui \
+    sql \
+    xml \
+    xmlpatterns
+
+maemo5:QT += maemo5
 
-maemo5 {
-    QT += maemo5
-}
 
 TARGET = mdictionary
 TEMPLATE = app
-
 MDICT_BINDIR = $$[MDICT_BINDIR]
-
-isEmpty(MDICT_BINDIR) {
-  MDICT_BINDIR = .
-}
-
+isEmpty(MDICT_BINDIR):MDICT_BINDIR = .
 DESTDIR = $${MDICT_BINDIR}
-
-SOURCES += gui/main.cpp\
-        gui/MainWindow.cpp \
+SOURCES += gui/main.cpp \
+    gui/MainWindow.cpp \
     gui/SearchBarWidget.cpp \
     gui/WordListWidget.cpp \
     gui/TranslationWidget.cpp \
@@ -32,9 +27,16 @@ SOURCES += gui/main.cpp\
     gui/DictManagerWidget.cpp \
     gui/DictTypeSelectDialog.cpp \
     backbone/History.cpp \
-    gui/HistoryListDialog.cpp
+    gui/HistoryListDialog.cpp \
+    gui/WordListProxyStyle.cpp \
+    backbone/Bookmarks.cpp \
+    gui/SettingsWidget.cpp \
+    gui/BookmarksWidget.cpp \
+    gui/WelcomeScreenWidget.cpp \ 
+    gui/AboutWidget.cpp
 
 HEADERS  += gui/MainWindow.h \
+    gui/AboutWidget.h \
     gui/SearchBarWidget.h \
     gui/WordListWidget.h \
     gui/TranslationWidget.h \
@@ -49,40 +51,43 @@ HEADERS  += gui/MainWindow.h \
     gui/TranslationWidgetAutoResizer.h \
     ../includes/History.h \
     gui/HistoryListDialog.h \
-    ../includes/GUIInterface.h
+    ../includes/GUIInterface.h \
+    gui/WordListProxyStyle.h \
+    backbone/Bookmarks.h \
+    backbone/BookmarkTranslations.h \
+    gui/SettingsWidget.h \
+    gui/BookmarksWidget.h \
+    gui/WelcomeScreenWidget.h
 
 FORMS    += gui/MainWindow.ui
-
-unix {
-  #VARIABLES
-  isEmpty(PREFIX) {
-    PREFIX = /usr
-  }
-  BINDIR = $$PREFIX/bin
-  DATADIR =$$PREFIX/share
-
-  DEFINES += DATADIR=\\\"$$DATADIR\\\" PKGDATADIR=\\\"$$PKGDATADIR\\\"
-
-  #MAKE INSTALL
-
-  INSTALLS += target desktop icon64 configs
-
-  configs.path = ~/.mdictionary
-  configs.files += ../../../data/mdictionary.defaults
-
-  target.path =$$BINDIR
-
-maemo5 {
-  desktop.path = $$DATADIR/applications/hildon
-  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
+RESOURCES += gui/gui.qrc
+
+unix { 
+    # VARIABLES
+    isEmpty(PREFIX):PREFIX = /usr
+    BINDIR = $$PREFIX/bin
+    DATADIR = $$PREFIX/share
+    DEFINES += DATADIR=\\\"$$DATADIR\\\" \
+        PKGDATADIR=\\\"$$PKGDATADIR\\\"
+    
+    # MAKE INSTALL
+    INSTALLS += target \
+        desktop \
+        icon64 \
+        configs
+    configs.path = ~/.mdictionary
+    configs.files += ../../../data/mdictionary.defaults
+    target.path = $$BINDIR
+    maemo5 { 
+        desktop.path = $$DATADIR/applications/hildon
+        icon64.path = $$DATADIR/icons/hicolor/64x64/hildon
+    }
+    !maemo5 { 
+        desktop.path = $$DATADIR/applications
+        icon64.path = $$DATADIR/icons
+    }
+    desktop.files += ../../../data/other/$${TARGET}.desktop
+    icon64.files += ../../../data/icons/64x64/$${TARGET}.png
 }
 
 RESOURCES += xslt2.qrc