More Symbian fixes.

diff --git a/deployment.pri b/deployment.pri
new file mode 100644 (file)
index 0000000..46ea95e
--- /dev/null
+++ b/deployment.pri
@@ -0,0 +1,115 @@
+# checksum 0x9840 version 0x40002
+# This file was generated by an application wizard of Qt Creator.
+# The code below handles deployment to Symbian and Maemo, aswell as copying
+# of the application data to shadow build directories on desktop.
+# It is recommended not to modify this file, since newer versions of Qt Creator
+# may offer an updated version of it.
+
+defineTest(qtcAddDeployment) {
+for(deploymentfolder, DEPLOYMENTFOLDERS) {
+    item = item$${deploymentfolder}
+    itemsources = $${item}.sources
+    $$itemsources = $$eval($${deploymentfolder}.source)
+    itempath = $${item}.path
+    $$itempath= $$eval($${deploymentfolder}.target)
+    export($$itemsources)
+    export($$itempath)
+    DEPLOYMENT += $$item
+}
+
+MAINPROFILEPWD = $$PWD
+
+symbian {
+    isEmpty(ICON):exists($${TARGET}.svg):ICON = $${TARGET}.svg
+    isEmpty(TARGET.EPOCHEAPSIZE):TARGET.EPOCHEAPSIZE = 0x20000 0x2000000
+} else:win32 {
+    copyCommand =
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+        source = $$replace(source, /, \\)
+        sourcePathSegments = $$split(source, \\)
+        target = $$OUT_PWD/$$eval($${deploymentfolder}.target)/$$last(sourcePathSegments)
+        target = $$replace(target, /, \\)
+        !isEqual(source,$$target) {
+            !isEmpty(copyCommand):copyCommand += &&
+            isEqual(QMAKE_DIR_SEP, \\) {
+                copyCommand += $(COPY_DIR) \"$$source\" \"$$target\"
+            } else {
+                source = $$replace(source, \\\\, /)
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+                target = $$replace(target, \\\\, /)
+                copyCommand += test -d \"$$target\" || mkdir -p \"$$target\" && cp -r \"$$source\" \"$$target\"
+            }
+        }
+    }
+    !isEmpty(copyCommand) {
+        copyCommand = @echo Copying application data... && $$copyCommand
+        copydeploymentfolders.commands = $$copyCommand
+        first.depends = $(first) copydeploymentfolders
+        export(first.depends)
+        export(copydeploymentfolders.commands)
+        QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+    }
+} else:unix {
+    maemo5 {
+        desktopfile.path = /usr/share/applications/hildon
+    } else {
+        desktopfile.path = /usr/share/applications
+        copyCommand =
+        for(deploymentfolder, DEPLOYMENTFOLDERS) {
+            source = $$MAINPROFILEPWD/$$eval($${deploymentfolder}.source)
+            source = $$replace(source, \\\\, /)
+            macx {
+                target = $$OUT_PWD/$${TARGET}.app/Contents/Resources/$$eval($${deploymentfolder}.target)
+            } else {
+                target = $$OUT_PWD/$$eval($${deploymentfolder}.target)
+            }
+            target = $$replace(target, \\\\, /)
+            sourcePathSegments = $$split(source, /)
+            targetFullPath = $$target/$$last(sourcePathSegments)
+            !isEqual(source,$$targetFullPath) {
+                !isEmpty(copyCommand):copyCommand += &&
+                copyCommand += $(MKDIR) \"$$target\"
+                copyCommand += && $(COPY_DIR) \"$$source\" \"$$target\"
+            }
+        }
+        !isEmpty(copyCommand) {
+            copyCommand = @echo Copying application data... && $$copyCommand
+            copydeploymentfolders.commands = $$copyCommand
+            first.depends = $(first) copydeploymentfolders
+            export(first.depends)
+            export(copydeploymentfolders.commands)
+            QMAKE_EXTRA_TARGETS += first copydeploymentfolders
+        }
+    }
+    installPrefix = /opt/$${TARGET}
+    for(deploymentfolder, DEPLOYMENTFOLDERS) {
+        item = item$${deploymentfolder}
+        itemfiles = $${item}.files
+        $$itemfiles = $$eval($${deploymentfolder}.source)
+        itempath = $${item}.path
+        $$itempath = $${installPrefix}/$$eval($${deploymentfolder}.target)
+        export($$itemfiles)
+        export($$itempath)
+        INSTALLS += $$item
+    }
+    icon.files = $${TARGET}.png
+    icon.path = /usr/share/icons/hicolor/64x64/apps
+    desktopfile.files = $${TARGET}.desktop
+    target.path = $${installPrefix}/bin
+    export(icon.files)
+    export(icon.path)
+    export(desktopfile.files)
+    export(desktopfile.path)
+    export(target.path)
+    INSTALLS += desktopfile icon target
+}
+
+export (ICON)
+export (INSTALLS)
+export (DEPLOYMENT)
+export (TARGET.EPOCHEAPSIZE)
+export (TARGET.CAPABILITY)
+export (LIBS)
+export (QMAKE_EXTRA_TARGETS)
+}

diff --git a/devtools.cpp b/devtools.cpp
index 97ec06c..e2427d8 100644 (file)
--- a/devtools.cpp
+++ b/devtools.cpp
@@ -21,7 +21,7 @@ DevTools::DevTools(QWidget *parent): Dyalog(parent, false)
     ToolButtonBox *box = new ToolButtonBox(this);
     addWidget(box);
     box->addButton(QtDebugMsg, tr("Debug"));
-    box->addButton(QtWarningMsg, tr("Warning"));
+    box->addButton(QtWarningMsg, tr("Warn"));
     box->addButton(QtCriticalMsg, tr("Critical"));
     box->addButton(QtFatalMsg, tr("Fatal"));
     box->toggle(Trace::level);

diff --git a/dorian.pro b/dorian.pro
index 61c8384..4ecb1c2 100644 (file)
--- a/dorian.pro
+++ b/dorian.pro
@@ -140,24 +140,8 @@ symbian {
     TARGET.UID3 = 0xA89FC85B
     TARGET.CAPABILITY = UserEnvironment NetworkServices ReadUserData \
         WriteUserData
-    TARGET.EPOCHEAPSIZE = 0x100000 0x4000000
     ICON = $$PWD/pkg/symbian/book.svg
 
-    # FIXME: Package header for Qt 4.6.2:
-    packageheader = \
-        "$${LITERAL_HASH}{\"Dorian\"},(0xA89FC85B),0,4,7" \
-        "[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,7"
-    # my_deployment.pkg_prerules = packageheader
-    # DEPLOYMENT += my_deployment
-
-    INCLUDEPATH += $(QTDIR)/src/3rdparty/zlib
     HEADERS += \
         widgets/flickcharm.h \
         widgets/mediakeysobserver.h
@@ -191,3 +175,6 @@ maemo5 {
     iconscalable.path = $$DATADIR/icons/hicolor/scalable/hildon
     iconscalable.files += pkg/maemo/icon-scalable/dorian.png
 }
+
+include(deployment.pri)
+qtcAddDeployment()

diff --git a/pkg/changelog b/pkg/changelog
index 0716974..a0bfdfd 100644 (file)
--- a/pkg/changelog
+++ b/pkg/changelog
@@ -1,3 +1,10 @@
+dorian (0.4.8-1) unstable; urgency=low
+
+  * Switch to Qt 4.7
+  * Symbian UI improvements
+
+ -- Akos Polster <akos@pipacs.com>  Sun, 12 Jun 2011 02:00:00 +0100
+
 dorian (0.4.7-1) unstable; urgency=low
 
   * Introduce smooth paging

diff --git a/pkg/version.txt b/pkg/version.txt
index 56e6ff8..fc7b274 100644 (file)
--- a/pkg/version.txt
+++ b/pkg/version.txt
@@ -1 +1 @@
-"0.4.7"
+"0.4.8"

diff --git a/widgets/dyalog.cpp b/widgets/dyalog.cpp
index fc8d337..2d8d103 100644 (file)
--- a/widgets/dyalog.cpp
+++ b/widgets/dyalog.cpp
@@ -28,13 +28,15 @@ Dyalog::Dyalog(QWidget *parent, bool showButtons_):
     scroller->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     scroller->setFrameStyle(QFrame::NoFrame);
 #if defined(Q_OS_SYMBIAN)
-    setStyleSheet("QFrame {margin:0; border:0; padding:0}");
+    // setStyleSheet("QFrame {margin:0; border:0; padding:0}");
     setStyleSheet("QScrollArea {margin:0; border:0; padding:0}");
 #endif
 
     content = new QWidget(scroller);
     contentLayout = new QVBoxLayout(content);
+#if !defined(Q_OS_SYMBIAN)
     contentLayout->setMargin(0);
+#endif
     content->setLayout(contentLayout);
 
     QBoxLayout *boxLayout;
@@ -54,6 +56,7 @@ Dyalog::Dyalog(QWidget *parent, bool showButtons_):
 #endif
         boxLayout = new QHBoxLayout(this);
     }
+    boxLayout->setMargin(0);
     boxLayout->addWidget(scroller);
 #ifndef Q_OS_SYMBIAN
     if (showButtons) {
@@ -129,7 +132,7 @@ void Dyalog::show()
     foreach (QWidget *w, QApplication::allWidgets()) {
         w->setContextMenuPolicy(Qt::NoContextMenu);
     }
-    showMaximized();
+    QDialog::showMaximized();
 }
 
 int Dyalog::exec()