Undo bad fix on Symbian.

[dorian] / dorian.pro

diff --git a/dorian.pro b/dorian.pro
index 538cdcc..a69ea89 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -1,4 +1,4 @@
-QT += webkit xml\r
+QT += webkit xml sql network\r
 \r
 INCLUDEPATH += $$PWD \\r
     $$PWD/model \\r
@@ -24,13 +24,23 @@ SOURCES += \
     bookmarkinfodialog.cpp \\r
     widgets/dyalog.cpp \\r
     chaptersdialog.cpp \\r
-    widgets/fullscreenwindow.cpp \\r
+    fullscreenwindow.cpp \\r
     trace.cpp \\r
     widgets/toolbuttonbox.cpp \\r
     model/bookfinder.cpp \\r
     widgets/listwindow.cpp \\r
     widgets/progress.cpp \\r
-    widgets/adopterwindow.cpp\r
+    adopterwindow.cpp \\r
+    platform.cpp \\r
+    model/bookdb.cpp \\r
+    searchdialog.cpp \\r
+    search.cpp \\r
+    widgets/flickable.cpp \\r
+    searchresultsdialog.cpp \\r
+    searchresultinfodialog.cpp \\r
+    widgets/progressdialog.cpp \\r
+    widgets/splash.cpp \\r
+    widgets/mainbase.cpp\r
 \r
 HEADERS += \\r
     mainwindow.h \\r
@@ -55,14 +65,24 @@ HEADERS += \
     bookmarkinfodialog.h \\r
     widgets/dyalog.h \\r
     chaptersdialog.h \\r
-    widgets/fullscreenwindow.h \\r
+    fullscreenwindow.h \\r
     trace.h \\r
     widgets/toolbuttonbox.h \\r
     model/bookfinder.h \\r
     widgets/listwindow.h \\r
     widgets/progress.h \\r
-    widgets/adopterwindow.h \\r
-    widgets/listview.h\r
+    adopterwindow.h \\r
+    model/xmlhandler.h \\r
+    platform.h \\r
+    model/bookdb.h \\r
+    searchdialog.h \\r
+    search.h \\r
+    widgets/flickable.h \\r
+    searchresultsdialog.h \\r
+    searchresultinfodialog.h \\r
+    widgets/progressdialog.h \\r
+    widgets/splash.h \\r
+    widgets/mainbase.h\r
 \r
 RESOURCES += \\r
     dorian.qrc\r
@@ -89,13 +109,16 @@ OTHER_FILES += \
     pkg/maemo/autobuild.sh \\r
     pkg/maemo/autobuild-scratchbox.sh \\r
     LICENSE.txt \\r
-    pkg/symbian/book.svg\r
+    pkg/symbian/book.svg \\r
+    pkg/symbian/clean.bat\r
 \r
 DEFINES += \\r
-    USE_FILE32API \\r
-    DORIAN_TEST_MODEL\r
+    USE_FILE32API\r
 \r
-include(model/modeltest/modeltest.pri)\r
+!symbian {\r
+    DEFINES += DORIAN_TEST_MODEL\r
+    include(model/modeltest/modeltest.pri)\r
+}\r
 \r
 unix {\r
     symbian {\r
@@ -103,19 +126,45 @@ unix {
         LIBS += -lz\r
     }\r
 }\r
+\r
 win32 {\r
     DEFINES += ZLIB_WINAPI\r
     INCLUDEPATH += $$PWD/model/zlib\r
     LIBS += pkg/win32/zlibstat.lib\r
 }\r
+\r
 symbian {\r
-    ICON = $$PWD/pkg/symbian/book.svgt\r
-    TARGET.UID3 = 0xEA633557\r
-    # TARGET.CAPABILITY = ...\r
-    # FIXME: Add OpenC ZLIB?\r
-    INCLUDEPATH += C:/NokiaQtSDK/Symbian/SDK/src/3rdparty/zlib \\r
-        c:/Qt/4.7.0/src/3rdparty/zlib\r
+    TARGET = Dorian\r
+    TARGET.UID3 = 0xA89FC85B\r
+    TARGET.CAPABILITY = UserEnvironment NetworkServices ReadUserData \\r
+        WriteUserData\r
+    TARGET.EPOCHEAPSIZE = 0x100000 0x4000000\r
+    ICON = $$PWD/pkg/symbian/book.svg\r
+\r
+    # FIXME: Package header for Qt 4.6.2:\r
+    packageheader = \\r
+        "$${LITERAL_HASH}{\"Dorian\"},(0xA89FC85B),0,4,5" \\r
+        "[0x101F7961],0,0,0,{\"S60ProductID\"}" \\r
+        "[0x102032BE],0,0,0,{\"S60ProductID\"}" \\r
+        "[0x102752AE],0,0,0,{\"S60ProductID\"}" \\r
+        "[0x1028315F],0,0,0,{\"S60ProductID\"}"\r
+    default_deployment.pkg_prerules = packageheader\r
+\r
+    # FIXME: Package header for Qt 4.6.3 or later:\r
+    # packageheader = "$${LITERAL_HASH}{\"Dorian\"},(0xA89FC85B),0,4,5"\r
+    # my_deployment.pkg_prerules = packageheader\r
+    # DEPLOYMENT += my_deployment\r
+\r
+    INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib\r
+    HEADERS += \\r
+        widgets/flickcharm.h \\r
+        widgets/mediakeysobserver.h\r
+    SOURCES += \\r
+        widgets/flickcharm.cpp \\r
+        widgets/mediakeysobserver.cpp\r
+    LIBS += -lremconinterfacebase -lremconcoreapi -lcone -leikcore -lavkon\r
 }\r
+\r
 maemo5 {\r
     QT += maemo5 dbus\r
     isEmpty(PREFIX) {\r
@@ -140,6 +189,3 @@ maemo5 {
     iconscalable.path = $$DATADIR/icons/hicolor/scalable/hildon\r
     iconscalable.files += pkg/maemo/icon-scalable/dorian.png\r
 }\r
-macx {\r
-    CONFIG += x86\r
-}\r