X-Git-Url: http://vcs.maemo.org/git/?a=blobdiff_plain;f=dorian.pro;h=c1ca627632ca42942a4ecfd744a7f18991be9744;hb=4f302c4427507fec544f32b9003035e93f32b2e2;hp=5eca6d94568e38f7be02aed9ea7b304bd2d4167f;hpb=986c5df2ad57bad44e8dd02286a2326406ace831;p=dorian

diff --git a/dorian.pro b/dorian.pro
index 5eca6d9..c1ca627 100644
--- a/dorian.pro
+++ b/dorian.pro
@@ -36,10 +36,11 @@ SOURCES += \
     searchdialog.cpp \
     search.cpp \
     widgets/flickable.cpp \
-    widgets/listview.cpp \
     searchresultsdialog.cpp \
     searchresultinfodialog.cpp \
-    widgets/progressdialog.cpp
+    widgets/progressdialog.cpp \
+    widgets/splash.cpp \
+    widgets/mainbase.cpp
 
 HEADERS += \
     mainwindow.h \
@@ -71,7 +72,6 @@ HEADERS += \
     widgets/listwindow.h \
     widgets/progress.h \
     adopterwindow.h \
-    widgets/listview.h \
     model/xmlhandler.h \
     platform.h \
     model/bookdb.h \
@@ -80,7 +80,9 @@ HEADERS += \
     widgets/flickable.h \
     searchresultsdialog.h \
     searchresultinfodialog.h \
-    widgets/progressdialog.h
+    widgets/progressdialog.h \
+    widgets/splash.h \
+    widgets/mainbase.h
 
 RESOURCES += \
     dorian.qrc
@@ -107,7 +109,8 @@ OTHER_FILES += \
     pkg/maemo/autobuild.sh \
     pkg/maemo/autobuild-scratchbox.sh \
     LICENSE.txt \
-    pkg/symbian/book.svg
+    pkg/symbian/book.svg \
+    pkg/symbian/clean.bat
 
 DEFINES += \
     USE_FILE32API
@@ -132,16 +135,25 @@ win32 {
 
 symbian {
     TARGET = Dorian
-    TARGET.UID3 = 0xEA633557
-    TARGET.CAPABILITY = UserEnvironment NetworkServices ReadUserData WriteUserData SwEvent
-    TARGET.EPOCHEAPSIZE = 0x080000 0x4000000
+    TARGET.UID3 = 0xA89FC85B
+    TARGET.CAPABILITY = UserEnvironment NetworkServices ReadUserData \
+        WriteUserData
+    TARGET.EPOCHEAPSIZE = 0x100000 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
+
+    # FIXME: Package header for Qt 4.6.2:
+    packageheader = \
+        "$${LITERAL_HASH}{\"Dorian\"},(0xA89FC85B),0,4,4" \
+        "[0x101F7961],0,0,0,{\"S60ProductID\"}" \
+        "[0x102032BE],0,0,0,{\"S60ProductID\"}" \
+        "[0x102752AE],0,0,0,{\"S60ProductID\"}" \
+        "[0x1028315F],0,0,0,{\"S60ProductID\"}"
+    default_deployment.pkg_prerules = packageheader
+
+    # FIXME: Package header for Qt 4.6.3 or later:
+    # packageheader = "$${LITERAL_HASH}{\"Dorian\"},(0xA89FC85B),0,4,4"
+    # my_deployment.pkg_prerules = packageheader
+    # DEPLOYMENT += my_deployment
 
     INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
     HEADERS += \
@@ -150,7 +162,7 @@ symbian {
     SOURCES += \
         widgets/flickcharm.cpp \
         widgets/mediakeysobserver.cpp
-    LIBS += -lremconinterfacebase -lremconcoreapi
+    LIBS += -lremconinterfacebase -lremconcoreapi -lcone -leikcore -lavkon
 }
 
 maemo5 {