X-Git-Url: http://git.maemo.org/git/?p=mverbiste;a=blobdiff_plain;f=mverbiste.pro;h=df50c4c6693de07c36d1163a61f63220f7c4aedf;hp=0fce4f5ffb68ad57008e07d726f94bf25f62ed6f;hb=fc65a0926de9cbfb2f55dd167860170ecc11a3c5;hpb=b852b4dfc8d0b85d85c00963eb9b23e12b1b86cf;ds=inline

diff --git a/mverbiste.pro b/mverbiste.pro
index 0fce4f5..df50c4c 100644
--- a/mverbiste.pro
+++ b/mverbiste.pro
@@ -2,7 +2,8 @@
 # by adapting the examples below.
 # file1.source = myfile
 # dir1.source = mydir
-DEPLOYMENTFOLDERS = # file1 dir1
+DEPLOYMENTFOLDERS = xmldata # file1 dir1
+xmldata.source = data
 
 symbian:TARGET.UID3 = 0xE214283E
 
@@ -26,12 +27,14 @@ SOURCES += main.cpp mainwindow.cpp \
     verbiste/Trie.cpp \
     verbiste/misc-types.cpp \
     verbiste/FrenchVerbDictionary.cpp \
-    verbiste/c-api.cpp
+    verbiste/c-api.cpp \
+    gui/conjugation.cpp
 HEADERS += mainwindow.h \
     verbiste/Trie.h \
     verbiste/misc-types.h \
     verbiste/FrenchVerbDictionary.h \
-    verbiste/c-api.h
+    verbiste/c-api.h \
+    gui/conjugation.h
 FORMS += mainwindow.ui
 
 # Please do not modify the following two lines. Required for deployment.
@@ -55,15 +58,20 @@ OTHER_FILES += \
     verbiste/verbiste.dox \
     verbiste/Makefile.in \
     verbiste/Makefile.am \
-    data/verbs-it.xml \
-    data/verbs-fr.xml \
-    data/verbs-el.xml \
-    data/conjugation-it.xml \
-    data/conjugation-fr.xml \
-    data/conjugation-el.xml \
-    data/check-data.pl
+    gui/Makefile.in \
+    gui/Makefile.am
 
 # To build verbiste
 unix: CONFIG += link_pkgconfig
 unix: PKGCONFIG += libxml-2.0
-QMAKE_CXXFLAGS += -DLIBDATADIR=\\\"data\\\" -DICONV_CONST= -DVERBSFRXML=\\\"data/verbs-fr.xml\\\"
+
+DEFINES += ICONV_CONST=
+
+CONFIG(simulator) {    # Build to run on simulator. This needs the
+    # argument CONFIG+=simulator in the config of "Qt Simulator" target.
+    DEFINES += LIBDATADIR=\\\"$$PWD/data\\\"
+}
+else {
+    # installPrefix must be explicitly exported from deployment.pri first
+    DEFINES += LIBDATADIR=\\\"$${installPrefix}/data\\\"
+}