Changeset 5cbcd091ed in tspsg


Ignore:
Timestamp:
Mar 13, 2011, 9:23:53 PM (13 years ago)
Author:
Oleksii Serdiuk
Branches:
0.1.4.170-beta2-bb10, appveyor, imgbot, master, readme
Children:
5631fb4d50
Parents:
8dcf4701e6
git-author:
Oleksii Serdiuk <contacts@…> (03/13/11 21:23:53)
git-committer:
Oleksii Serdiuk <contacts@…> (06/29/12 19:45:58)
Message:

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

Files:
4 edited

Legend:

Unmodified
Added
Removed
  • install.pri

    r8dcf4701e6 r5cbcd091ed  
    9292# Symbian
    9393symbian {
     94        TARGET = TSPSG$${D}
     95
    9496        share.sources = $$share.files
    9597        # 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
     
    99101#       l10n.path = l10n
    100102        docs.sources = $$docs.files
    101         docs.pkg_prerules = \
    102                 "\"README.txt\" - \"\", FILETEXT, TEXTCONTINUE" \
    103                 "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
     103#       docs.pkg_prerules = \
     104#               "\"README.txt\" - \"\", FILETEXT, TEXTCONTINUE" \
     105#               "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
    104106        DEPLOYMENT += share docs # l10n
    105107#       DEPLOYMENT_PLUGIN += qjpeg qtiff qsvgicon
    106108
    107109        ICON = resources/tspsg.svg
     110        TARGET.EPOCHEAPSIZE = 0x20000 0x1100000
     111        # OVI Publish - 0x2003AEFB, Self-signed - 0xA89FD7A3
     112        TARGET.UID3 = 0xA89FD7A3
     113#       TARGET.UID3 = 0x2003AEFB
    108114
    109         appinfo = \
    110                 "$$LITERAL_HASH{\"TSP Solver and Generator\"},(0xA89FD7A3),$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE"
    111         vendorinfo = \
    112                 "%{\"Oleksii Serdiuk\"}" \
     115        languages="&EN,RU,UK"
     116        package_header = "$$LITERAL_HASH{" \
     117                " \"$$QMAKE_TARGET_PRODUCT\"," \
     118                " \"$$QMAKE_TARGET_PRODUCT\"," \
     119                " \"$$QMAKE_TARGET_PRODUCT\"" \
     120                "},($$TARGET.UID3),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
     121        vendor = \
     122                "%{\"Oleksii Serdiuk\",\"Алексей Сердюк\",\"Олексій Сердюк\"}" \
    113123                ":\"Oleksii Serdiuk\""
    114         default_deployment.pkg_prerules = appinfo vendorinfo
    115         DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"TSPSG Installer\"},(0xA000D7CE),1,0,0"
     124#       logo = \
     125#               "=\"resources/tspsg.png\",\"image/png\",\"\""
     126        dependencies = \
     127                "; Depend on Qt $${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION}" \
     128                "(0x2001E61C),$${QT_MAJOR_VERSION},$${QT_MINOR_VERSION},$${QT_PATCH_VERSION},{\"Qt\",\"Qt\",\"Qt\"}" \
     129                "; Declare the supported platforms" \
     130                "; Symbian^1" \
     131                "[0x1028315F],0,0,0,{\"S60ProductID\",\"S60ProductID\",\"S60ProductID\"}" \
     132                "; Symbian^3" \
     133                "[0x20022E6D],0,0,0,{\"S60ProductID\",\"S60ProductID\",\"S60ProductID\"}"
     134
     135        default_deployment.pkg_prerules -= pkg_platform_dependencies pkg_depends_qt
     136        default_deployment.pkg_prerules += languages package_header vendor dependencies
     137#       default_deployment.pkg_prerules += languages package_header vendor logo dependencies
     138        # OVI Publish - 0x2002CCCF, Self-signed - 0xA000D7CE
     139        DEPLOYMENT.installer_header = "$${LITERAL_HASH}{" \
     140                "\"$$QMAKE_TARGET_PRODUCT Installer\"," \
     141                "\"Установщик $$QMAKE_TARGET_PRODUCT\"," \
     142                "\"Встановлювач $$QMAKE_TARGET_PRODUCT\"" \
     143                "},(0xA000D7CE),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
     144#               "},(0x2002CCCF),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
    116145}
    117146
  • src/main.cpp

    r8dcf4701e6 r5cbcd091ed  
    4141int main(int argc, char *argv[])
    4242{
     43#ifdef Q_WS_S60
     44    // No enough memory for solution graph generation with tasks
     45    // of 20 and more cities if we use non-raster graphics system.
     46    QApplication::setGraphicsSystem("raster");
     47#endif
    4348QApplication app(argc, argv);
    4449    app.setOverrideCursor(QCursor(Qt::WaitCursor));
  • src/mainwindow.cpp

    r8dcf4701e6 r5cbcd091ed  
    617617#endif // HANDHELD
    618618
     619#ifndef HANDHELD
    619620    dlg->resize(450, 350);
     621#endif
    620622    QApplication::restoreOverrideCursor();
    621623
     
    11361138        }
    11371139        if (step->price != INFINITY) {
    1138             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()));
     1140            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()));
    11391141        } else {
    11401142            pic.drawText(QRectF(x - r, y - r, r * 2, r * 2), Qt::AlignCenter, "\n"INFSTR);
     
    15791581    //! \hack HACK: A little hack for toolbar icons to have a sane size.
    15801582#if defined(HANDHELD) && !defined(Q_WS_MAEMO_5)
     1583#ifdef Q_WS_S60
     1584    toolBarMain->setIconSize(QSize(logicalDpiX() / 5, logicalDpiY() / 5));
     1585#else
    15811586    toolBarMain->setIconSize(QSize(logicalDpiX() / 4, logicalDpiY() / 4));
    1582 #endif // HANDHELD
     1587#endif // Q_WS_S60
     1588#endif // HANDHELD && !Q_WS_MAEMO_5
    15831589QToolButton *tb = static_cast<QToolButton *>(toolBarMain->widgetForAction(actionFileSave));
    1584     if (tb != NULL)      {
     1590    if (tb != NULL) {
    15851591        tb->setMenu(menuFileSaveAs);
    15861592        tb->setPopupMode(QToolButton::MenuButtonPopup);
  • src/tspsolver.h

    r8dcf4701e6 r5cbcd091ed  
    3636 * \brief This value means infinity :-)
    3737 *
    38  *  Some libraries already have \c INFINITY defined.
    39  *  We need to redefine it for the \c INFINITY to always have the same value.
     38 *  Define \c INFINITY if it's not already defined.
    4039 */
    41 #ifdef INFINITY
    42 #   undef INFINITY
     40#ifndef INFINITY
     41#   define INFINITY std::numeric_limits<double>::infinity()
    4342#endif
    44 #define INFINITY std::numeric_limits<double>::infinity()
    4543
    4644/*!
Note: See TracChangeset for help on using the changeset viewer.