Changeset 152 in tspsg-svn for trunk


Ignore:
Timestamp:
Feb 18, 2011, 8:14:47 PM (14 years ago)
Author:
laleppa
Message:

Fixed some errors in the tspsg.desktop file and tweaked project files a little...

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/install.pri

    r151 r152  
    1515#share.files =
    1616docs.files = COPYING ChangeLog.txt README.txt INSTALL.txt
    17 INSTALLS += target share docs # l10n
     17INSTALLS += target docs # share l10n
    1818
    1919# For *nix:
    … …  
    6262                        $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll
    6363        }
    64 #       iconengines.files = $$[QT_INSTALL_PLUGINS]/iconengines/qsvgicon$${D}4.dll
    65 #       iconengines.path = $$PREFIX/TSPSG/iconengines
    6664        imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll \
    6765                $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${D}4.dll
    6866        imageformats.path = $$PREFIX/TSPSG/imageformats
    69         INSTALLS += imageformats # iconengines
     67        INSTALLS += share imageformats
    7068}
    7169
    … …  
    8179
    8280        DEPLOYMENT += target share docs # l10n
    83 #       DEPLOYMENT_PLUGIN += qjpeg qtiff qsvgicon
     81        DEPLOYMENT_PLUGIN += qjpeg qtiff
    8482}
    8583
    … …  
    9492# Symbian
    9593symbian {
     94        share.sources = $$share.files
    9695        # 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
    97         share.sources = $$share.files
    9896#       l10n.sources = $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
    9997#               $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \
    … …  
    110108
    111109        appinfo = \
    112                 "$$LITERAL_HASH{\"TSPSG\"},(0xEb9dce0e),$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE"
     110                "$$LITERAL_HASH{\"TSP Solver and Generator\"},(0xA89FD7A3),$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR,$$BUILD_RELEASE"
    113111        vendorinfo = \
    114                 "%{\"l-homes.org\"}" \
    115                 ":\"l-homes.org\""
     112                "%{\"Oleksii Serdiuk\"}" \
     113                ":\"Oleksii Serdiuk\""
    116114        default_deployment.pkg_prerules = appinfo vendorinfo
    117115        DEPLOYMENT.installer_header = "$${LITERAL_HASH}{\"TSPSG Installer\"},(0xA000D7CE),1,0,0"

  • trunk/resources/tspsg.desktop

    r116 r152  
    11[Desktop Entry]
    22Encoding=UTF-8
     3Version=1.0
    34Type=Application
    4 Version=0.1
    5 Name=TSPSG: TSP Solver and Generator
     5Terminal=false
     6Name=TSP Solver and Generator
    67GenericName=Solving Travelling Salesman Problem using Branch and Bound method
    78GenericName[ru]=Решение задачи коммивояжера методом ветвей и границ
    89GenericName[uk]=Розв'язання задачі комівояжера методом гілок та меж
    9 Comment=Solving Travelling Salesman Problem using Branch and Bound method
    10 Comment[ru]=Решение задачи коммивояжера методом ветвей и границ
    11 Comment[uk]=Розв'язання задачі комівояжера методом гілок та меж
     10Exec=tspsg %f
    1211Icon=tspsg
    13 Exec=tspsg %f
    14 Terminal=false
    15 Categories=Qt;KDE;Education;Math;
     12Categories=Qt;KDE;Education;Science;Math;
    1613StartupNotify=true

  • trunk/tspsg.pro

    r151 r152  
    4242
    4343#REVISION = 145
    44 REVISION = $$system(svnversion)
     44isEmpty(REVISION) {
     45        REVISION = $$system(svnversion)
     46}
    4547isEmpty(REVISION)|isEqual(REVISION,exported) {
    4648        REVISION = 0
    … …  
    6466macx {
    6567        PRL = $$[QT_INSTALL_LIBS] QtCore.framework QtCore.prl
    66 } else:symbian {
    67         PRL = $$[QT_INSTALL_LIBS] QtCore.prl
     68} else:symbian|maemo* {
     69        # Nothing here
    6870} else:unix {
    6971        PRL = $$[QT_INSTALL_LIBS] libQtCore.prl
    … …  
    7173        PRL = $$[QT_INSTALL_LIBS] QtCore.prl
    7274}
    73 include($$join(PRL, "/"))
    74 contains(QMAKE_PRL_CONFIG, static) {
    75         # We "embed" SVG icon support on static build
    76         DEFINES += STATIC_BUILD
    77 #       !nosvg:QTPLUGIN += qsvgicon
     75!isEmpty(PRL) {
     76        include($$join(PRL, "/"))
     77        contains(QMAKE_PRL_CONFIG, static) {
     78                # We "embed" SVG icon support on static build
     79                DEFINES += STATIC_BUILD
     80#               !nosvg:QTPLUGIN += qsvgicon
     81        }
    7882}
    7983
    … …  
    105109include(tspsg.pri)
    106110
    107 # Installation and deployment
     111# Installation and deployment rules
    108112include(install.pri)
Note: See TracChangeset for help on using the changeset viewer.