X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=dorian.pro;h=7c4f1ebfeaed3432cc01b9580a6d1cbcc8e4fcf8;hb=f2571fe854dcae8a8cd8f9216e0f78b51dd0a1a4;hp=cab93784dcefde79022f120693c2ebe71b4f6d9c;hpb=9de78cad98c82243b02dba8b3772645b0df6858c;p=dorian

diff --git a/dorian.pro b/dorian.pro
index cab9378..7c4f1eb 100644
--- a/dorian.pro
+++ b/dorian.pro
@@ -1,4 +1,4 @@
-QT += webkit xml sql
+QT += webkit xml sql network
 
 INCLUDEPATH += $$PWD \
     $$PWD/model \
@@ -32,7 +32,14 @@ SOURCES += \
     widgets/progress.cpp \
     widgets/adopterwindow.cpp \
     platform.cpp \
-    model/bookdb.cpp
+    model/bookdb.cpp \
+    searchdialog.cpp \
+    search.cpp \
+    widgets/flickable.cpp \
+    widgets/listview.cpp \
+    searchresultsdialog.cpp \
+    searchresultinfodialog.cpp \
+    widgets/progressdialog.cpp
 
 HEADERS += \
     mainwindow.h \
@@ -67,7 +74,13 @@ HEADERS += \
     widgets/listview.h \
     model/xmlhandler.h \
     platform.h \
-    model/bookdb.h
+    model/bookdb.h \
+    searchdialog.h \
+    search.h \
+    widgets/flickable.h \
+    searchresultsdialog.h \
+    searchresultinfodialog.h \
+    widgets/progressdialog.h
 
 RESOURCES += \
     dorian.qrc
@@ -97,10 +110,12 @@ OTHER_FILES += \
     pkg/symbian/book.svg
 
 DEFINES += \
-    USE_FILE32API \
-    DORIAN_TEST_MODEL
+    USE_FILE32API
 
-include(model/modeltest/modeltest.pri)
+!symbian {
+    DEFINES += DORIAN_TEST_MODEL
+    include(model/modeltest/modeltest.pri)
+}
 
 unix {
     symbian {
@@ -108,19 +123,31 @@ unix {
         LIBS += -lz
     }
 }
+
 win32 {
     DEFINES += ZLIB_WINAPI
     INCLUDEPATH += $$PWD/model/zlib
     LIBS += pkg/win32/zlibstat.lib
 }
+
 symbian {
-    ICON = $$PWD/pkg/symbian/book.svgt
+    TARGET = Dorian
     TARGET.UID3 = 0xEA633557
-    # TARGET.CAPABILITY = ...
-    # FIXME: Add OpenC ZLIB?
-    INCLUDEPATH += C:/NokiaQtSDK/Symbian/SDK/src/3rdparty/zlib \
-        c:/Qt/4.7.0/src/3rdparty/zlib
+    TARGET.CAPABILITY = NetworkServices ReadUserData WriteUserData
+    TARGET.EPOCHEAPSIZE = 0x080000 0x4000000
+    ICON = $$PWD/pkg/symbian/book.svg
+    packageheader = "$${LITERAL_HASH}{\"Dorian\"}, (0xEA633557), 0, 3, 4"
+    vendorinfo = \
+        "%{\"Nokia Betalabs \"}" \
+        ":\"Nokia Betalabs \""
+    my_deployment.pkg_prerules = packageheader vendorinfo
+    DEPLOYMENT += my_deployment
+
+    INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
+    HEADERS += widgets/flickcharm.h
+    SOURCES += widgets/flickcharm.cpp
 }
+
 maemo5 {
     QT += maemo5 dbus
     isEmpty(PREFIX) {
@@ -145,6 +172,3 @@ maemo5 {
     iconscalable.path = $$DATADIR/icons/hicolor/scalable/hildon
     iconscalable.files += pkg/maemo/icon-scalable/dorian.png
 }
-macx {
-    CONFIG += x86
-}