Changeset 154 in tspsg-svn for trunk

Timestamp:

Mar 13, 2011, 9:23:53 PM (14 years ago)

Author:

laleppa

Message:

Fixes and updates to Symbian SIS package generation rules and some small Symbian-related code fixes.

Location:

trunk

Files:

• install.pri (modified) (2 diffs)
• src/main.cpp (modified) (1 diff)
• src/mainwindow.cpp (modified) (3 diffs)
• src/tspsolver.h (modified) (1 diff)

trunk/install.pri

@@ -92 +92 @@
 # Symbian
 symbian {
+        TARGET = TSPSG$${D}
+
         share.sources = $$share.files
         # qmake for Symbian (as of Qt 4.6.2) has a bug: file masks doesn't work, so we need to specify all files manually
@@ -99 +101 @@
 #       l10n.path = l10n
         docs.sources = $$docs.files
-        docs.pkg_prerules = \
-                "\"README.txt\" - \"\", FILETEXT, TEXTCONTINUE" \
-                "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
+#       docs.pkg_prerules = \
+#               "\"README.txt\" - \"\", FILETEXT, TEXTCONTINUE" \
+#               "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
         DEPLOYMENT += share docs # l10n
 #       DEPLOYMENT_PLUGIN += qjpeg qtiff qsvgicon
 
         ICON = resources/tspsg.svg
+        TARGET.EPOCHEAPSIZE = 0x20000 0x1100000
+        # OVI Publish - 0x2003AEFB, Self-signed - 0xA89FD7A3
+        TARGET.UID3 = 0xA89FD7A3
+#       TARGET.UID3 = 0x2003AEFB
 
-        appinfo = \
-                "$$LITERAL_HASH{\"TSP Solver and Generator\"},(0xA89FD7A3),$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE"
-        vendorinfo = \
-                "%{\"Oleksii Serdiuk\"}" \
+        languages="&EN,RU,UK"
+        package_header = "$$LITERAL_HASH{" \
+                " \"$$QMAKE_TARGET_PRODUCT\"," \
+                " \"$$QMAKE_TARGET_PRODUCT\"," \
+                " \"$$QMAKE_TARGET_PRODUCT\"" \
+                "},($$TARGET.UID3),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
+        vendor = \
+                "%{\"Oleksii Serdiuk\",\"Алексей Сердюк\",\"Олексій Сердюк\"}" \
                 ":\"Oleksii Serdiuk\""
-        default_deployment.pkg_prerules = appinfo vendorinfo
-        DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"TSPSG Installer\"},(0xA000D7CE),1,0,0"
+#       logo = \
+#               "=\"resources/tspsg.png\",\"image/png\",\"\""
+        dependencies = \
+                "; Depend on Qt $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}" \
+                "(0x2001E61C),$${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION},{\"Qt\",\"Qt\",\"Qt\"}" \
+                "; Declare the supported platforms" \
+                "; Symbian^1" \
+                "[0x1028315F],0,0,0,{\"S60ProductID\",\"S60ProductID\",\"S60ProductID\"}" \
+                "; Symbian^3" \
+                "[0x20022E6D],0,0,0,{\"S60ProductID\",\"S60ProductID\",\"S60ProductID\"}"
+
+        default_deployment.pkg_prerules -= pkg_platform_dependencies pkg_depends_qt
+        default_deployment.pkg_prerules += languages package_header vendor dependencies
+#       default_deployment.pkg_prerules += languages package_header vendor logo dependencies
+        # OVI Publish - 0x2002CCCF, Self-signed - 0xA000D7CE
+        DEPLOYMENT.installer_header = "$${LITERAL_HASH}{" \
+                "\"$$QMAKE_TARGET_PRODUCT Installer\"," \
+                "\"Установщик $$QMAKE_TARGET_PRODUCT\"," \
+                "\"Встановлювач $$QMAKE_TARGET_PRODUCT\"" \
+                "},(0xA000D7CE),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
+#               "},(0x2002CCCF),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
 }
 

trunk/src/main.cpp

@@ -41 +41 @@
 int main(int argc, char *argv[])
 {
+#ifdef Q_WS_S60
+    // No enough memory for solution graph generation with tasks
+    // of 20 and more cities if we use non-raster graphics system.
+    QApplication::setGraphicsSystem("raster");
+#endif
 QApplication app(argc, argv);
     app.setOverrideCursor(QCursor(Qt::WaitCursor));

trunk/src/mainwindow.cpp

@@ -617 +617 @@
 #endif // HANDHELD
 
+#ifndef HANDHELD
     dlg->resize(450, 350);
+#endif
     QApplication::restoreOverrideCursor();
 
@@ -1136 +1138 @@
         }
         if (step->price != INFINITY) {
-            pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, isInteger(step->price) ?  QString("\n%1").arg(step->price) : QString("\n%1").arg(step->price, 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()));
+            pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, isInteger(step->price) ? QString("\n%1").arg(step->price) : QString("\n%1").arg(step->price, 0, 'f', settings->value("Task/FractionalAccuracy", DEF_FRACTIONAL_ACCURACY).toInt()));
         } else {
             pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n"INFSTR);
@@ -1579 +1581 @@
     //! \hack HACK: A little hack for toolbar icons to have a sane size.
 #if defined(HANDHELD) && !defined(Q_WS_MAEMO_5)
+#ifdef Q_WS_S60
+    toolBarMain->setIconSize(QSize(logicalDpiX() / 5, logicalDpiY() / 5));
+#else
     toolBarMain->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
-#endif // HANDHELD
+#endif // Q_WS_S60
+#endif // HANDHELD && !Q_WS_MAEMO_5
 QToolButton *tb = static_cast<QToolButton *>(toolBarMain->widgetForAction(actionFileSave));
-    if (tb != NULL)      {
+    if (tb != NULL) {
         tb->setMenu(menuFileSaveAs);
         tb->setPopupMode(QToolButton::MenuButtonPopup);

trunk/src/tspsolver.h

@@ -36 +36 @@
  * \brief This value means infinity :-)
  *
- *  Some libraries already have \c INFINITY defined.
- *  We need to redefine it for the \c INFINITY to always have the same value.
+ *  Define \c INFINITY if it's not already defined.
  */
-#ifdef INFINITY
-#   undef INFINITY
+#ifndef INFINITY
+#   define INFINITY std::numeric_limits<double>::infinity()
 #endif
-#define INFINITY std::numeric_limits<double>::infinity()
 
 /*!