Set version to v1.1

[mverbiste] / mverbiste.pro

diff --git a/mverbiste.pro b/mverbiste.pro
index 0fce4f5..9c87f54 100644 (file)
--- a/mverbiste.pro
+++ b/mverbiste.pro
@@ -2,7 +2,9 @@
 # by adapting the examples below.
 # file1.source = myfile
 # dir1.source = mydir
-DEPLOYMENTFOLDERS = # file1 dir1
+DEPLOYMENTFOLDERS = xmldata icon # file1 dir1
+xmldata.source = data
+icon.source = icons
 
 symbian:TARGET.UID3 = 0xE214283E
 
@@ -26,12 +28,16 @@ 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 \
+    about.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 \
+    about.h
 FORMS += mainwindow.ui
 
 # Please do not modify the following two lines. Required for deployment.
@@ -51,19 +57,23 @@ OTHER_FILES += \
     qtc_packaging/debian_fremantle/copyright \
     qtc_packaging/debian_fremantle/control \
     qtc_packaging/debian_fremantle/compat \
-    qtc_packaging/debian_fremantle/changelog \
-    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
+    qtc_packaging/debian_fremantle/changelog
 
 # To build verbiste
 unix: CONFIG += link_pkgconfig
 unix: PKGCONFIG += libxml-2.0
-QMAKE_CXXFLAGS += -DLIBDATADIR=\\\"data\\\" -DICONV_CONST= -DVERBSFRXML=\\\"data/verbs-fr.xml\\\"
+
+DEFINES += VERSTR=\\\"1.1\\\"
+
+# For verbiste
+DEFINES += ICONV_CONST=
+
+simulator {    # Build to run on simulator.
+    DEFINES += LIBDATADIR=\\\"$$PWD/data\\\"
+    DEFINES +=ICONFILE=\\\"$$PWD/icons/mverbiste160.png\\\"
+}
+else {
+    # installPrefix must be explicitly exported from deployment.pri first
+    DEFINES += LIBDATADIR=\\\"$${installPrefix}/data\\\"
+    DEFINES +=ICONFILE=\\\"$${installPrefix}/icons/mverbiste160.png\\\"
+}