More stagnation.

[dorian] / dorian.pro

diff --git a/dorian.pro b/dorian.pro
index 53529b7..a69ea89 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -24,22 +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
-    widgets/listview.cpp \\r
     searchresultsdialog.cpp \\r
     searchresultinfodialog.cpp \\r
-    widgets/progressdialog.cpp\r
+    widgets/progressdialog.cpp \\r
+    widgets/splash.cpp \\r
+    widgets/mainbase.cpp\r
 \r
 HEADERS += \\r
     mainwindow.h \\r
@@ -64,14 +65,13 @@ 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
@@ -80,7 +80,9 @@ HEADERS += \
     widgets/flickable.h \\r
     searchresultsdialog.h \\r
     searchresultinfodialog.h \\r
-    widgets/progressdialog.h\r
+    widgets/progressdialog.h \\r
+    widgets/splash.h \\r
+    widgets/mainbase.h\r
 \r
 RESOURCES += \\r
     dorian.qrc\r
@@ -107,7 +109,8 @@ 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
@@ -132,16 +135,25 @@ win32 {
 \r
 symbian {\r
     TARGET = Dorian\r
-    TARGET.UID3 = 0xEA633557\r
-    TARGET.CAPABILITY = UserEnvironment NetworkServices ReadUserData WriteUserData SwEvent\r
-    TARGET.EPOCHEAPSIZE = 0x080000 0x4000000\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
-    packageheader = "$${LITERAL_HASH}{\"Dorian\"}, (0xEA633557), 0, 3, 4"\r
-    vendorinfo = \\r
-        "%{\"Nokia Betalabs \"}" \\r
-        ":\"Nokia Betalabs \""\r
-    my_deployment.pkg_prerules = packageheader vendorinfo\r
-    DEPLOYMENT += my_deployment\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
@@ -150,7 +162,7 @@ symbian {
     SOURCES += \\r
         widgets/flickcharm.cpp \\r
         widgets/mediakeysobserver.cpp\r
-    LIBS += -lremconinterfacebase -lremconcoreapi\r
+    LIBS += -lremconinterfacebase -lremconcoreapi -lcone -leikcore -lavkon\r
 }\r
 \r
 maemo5 {\r