Changeset 156 in tspsg-svn for trunk


Ignore:
Timestamp:
Mar 16, 2011, 1:03:57 AM (14 years ago)
Author:
laleppa
Message:

Converted tabs to spaces in project files...

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/install.pri

    r154 r156  
    2323#     go to /usr/share/doc/TSPSG-x.x.x
    2424unix:!macx:!symbian:!maemo* {
    25         isEmpty(PREFIX) {
    26                 PREFIX = /usr
    27         }
    28         CONFIG(release, debug|release) {
    29                 DEFINES += PATH_L10N=\\\"$$PREFIX/share/TSPSG/l10n\\\"
    30                 DEFINES += PATH_DOCS=\\\"$$PREFIX/share/TSPSG/docs\\\"
    31         }
     25    isEmpty(PREFIX) {
     26        PREFIX = /usr
     27    }
     28    CONFIG(release, debug|release) {
     29        DEFINES += PATH_L10N=\\\"$$PREFIX/share/TSPSG/l10n\\\"
     30        DEFINES += PATH_DOCS=\\\"$$PREFIX/share/TSPSG/docs\\\"
     31    }
    3232
    33         target.path = $$PREFIX/bin
    34         share.path = $$PREFIX/share/TSPSG
     33    target.path = $$PREFIX/bin
     34    share.path = $$PREFIX/share/TSPSG
    3535#       l10n.path = $$PREFIX/share/TSPSG/l10n
    36         docs.path = $$PREFIX/share/doc/TSPSG-$$VERSION
    37         desktop.files = resources/tspsg.desktop
    38         desktop.path = $$PREFIX/share/applications
    39         icon.files = resources/tspsg.png
    40         icon.path = $$PREFIX/share/pixmaps
    41         INSTALLS += desktop icon
     36    docs.path = $$PREFIX/share/doc/TSPSG-$$VERSION
     37    desktop.files = resources/tspsg.desktop
     38    desktop.path = $$PREFIX/share/applications
     39    icon.files = resources/tspsg.png
     40    icon.path = $$PREFIX/share/pixmaps
     41    INSTALLS += desktop icon
    4242}
    4343
    … …  
    4848# For win32: everything goes to "%PROGRAMFILES%\TSPSG" and subfolders.
    4949win32 {
    50         isEmpty(PREFIX) {
    51                 PREFIX = "$$(PROGRAMFILES)"
    52         }
     50    isEmpty(PREFIX) {
     51        PREFIX = "$$(PROGRAMFILES)"
     52    }
    5353
    54         share.files = $$[QT_INSTALL_BINS]/QtCore$${D}4.dll \
    55                 $$[QT_INSTALL_BINS]/QtGui$${D}4.dll
    56         !nosvg {
    57                 share.files += $$[QT_INSTALL_BINS]/QtSvg$${D}4.dll
    58         }
     54    share.files = $$[QT_INSTALL_BINS]/QtCore$${D}4.dll \
     55        $$[QT_INSTALL_BINS]/QtGui$${D}4.dll
     56    !nosvg {
     57        share.files += $$[QT_INSTALL_BINS]/QtSvg$${D}4.dll
     58    }
    5959#       l10n.files += $$[QT_INSTALL_TRANSLATIONS]/*.qm
    60         win32-g++ {
    61                 share.files += $$[QT_INSTALL_BINS]/mingwm10.dll \
    62                         $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll
    63         }
    64         imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll \
    65                 $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${D}4.dll
    66         imageformats.path = $$PREFIX/TSPSG/imageformats
    67         INSTALLS += share imageformats
     60    win32-g++ {
     61        share.files += $$[QT_INSTALL_BINS]/mingwm10.dll \
     62            $$[QT_INSTALL_BINS]/libgcc_s_dw2-1.dll
     63    }
     64    imageformats.files = $$[QT_INSTALL_PLUGINS]/imageformats/qjpeg$${D}4.dll \
     65        $$[QT_INSTALL_PLUGINS]/imageformats/qtiff$${D}4.dll
     66    imageformats.path = $$PREFIX/TSPSG/imageformats
     67    INSTALLS += share imageformats
    6868}
    6969
    7070# For wince: we are deploying to \Program Files\TSPSG.
    7171wince* {
    72         isEmpty(PREFIX) {
    73                 PREFIX = "\\Program Files"
    74         }
    75         share.sources = $$share.files
     72    isEmpty(PREFIX) {
     73        PREFIX = "\\Program Files"
     74    }
     75    share.sources = $$share.files
    7676#       l10n.sources = $$l10n.files \
    7777#               $$[QT_INSTALL_TRANSLATIONS]/*.qm
    78         docs.sources = $$docs.files
     78    docs.sources = $$docs.files
    7979
    80         DEPLOYMENT += target share docs # l10n
    81         DEPLOYMENT_PLUGIN += qjpeg qtiff
     80    DEPLOYMENT += target share docs # l10n
     81    DEPLOYMENT_PLUGIN += qjpeg qtiff
    8282}
    8383
    8484# win32 and wince common
    8585win* {
    86         target.path = $$PREFIX/TSPSG
    87         share.path = $$PREFIX/TSPSG
     86    target.path = $$PREFIX/TSPSG
     87    share.path = $$PREFIX/TSPSG
    8888#       l10n.path = $$PREFIX/TSPSG/l10n
    89         docs.path = $$PREFIX/TSPSG
     89    docs.path = $$PREFIX/TSPSG
    9090}
    9191
    9292# Symbian
    9393symbian {
    94         TARGET = TSPSG$${D}
     94    TARGET = TSPSG$${D}
    9595
    96         share.sources = $$share.files
    97         # 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
     96    share.sources = $$share.files
     97    # 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
    9898#       l10n.sources = $$[QT_INSTALL_TRANSLATIONS]/qt_ru.qm \
    9999#               $$[QT_INSTALL_TRANSLATIONS]/qt_uk.qm \
    100100#               l10n/tspsg_en.qm l10n/tspsg_ru.qm l10n/tspsg_uk.qm
    101101#       l10n.path = l10n
    102         docs.sources = $$docs.files
     102    docs.sources = $$docs.files
    103103#       docs.pkg_prerules = \
    104104#               "\"README.txt\" - \"\", FILETEXT, TEXTCONTINUE" \
    105105#               "\"COPYING\" - \"\", FILETEXT, TEXTEXIT"
    106         DEPLOYMENT += share docs # l10n
     106    DEPLOYMENT += share docs # l10n
    107107#       DEPLOYMENT_PLUGIN += qjpeg qtiff qsvgicon
    108108
    109         ICON = resources/tspsg.svg
    110         TARGET.EPOCHEAPSIZE = 0x20000 0x1100000
    111         # OVI Publish - 0x2003AEFB, Self-signed - 0xA89FD7A3
    112         TARGET.UID3 = 0xA89FD7A3
     109    ICON = resources/tspsg.svg
     110    TARGET.EPOCHEAPSIZE = 0x20000 0x1100000
     111    # OVI Publish - 0x2003AEFB, Self-signed - 0xA89FD7A3
     112    TARGET.UID3 = 0xA89FD7A3
    113113#       TARGET.UID3 = 0x2003AEFB
    114114
    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\",\"Алексей Сердюк\",\"Олексій Сердюк\"}" \
    123                 ":\"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\",\"Алексей Сердюк\",\"Олексій Сердюк\"}" \
     123        ":\"Oleksii Serdiuk\""
    124124#       logo = \
    125125#               "=\"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\"}"
     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\"}"
    134134
    135         default_deployment.pkg_prerules -= pkg_platform_dependencies pkg_depends_qt
    136         default_deployment.pkg_prerules += languages package_header vendor dependencies
     135    default_deployment.pkg_prerules -= pkg_platform_dependencies pkg_depends_qt
     136    default_deployment.pkg_prerules += languages package_header vendor dependencies
    137137#       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"
     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"
    144144#               "},(0x2002CCCF),$$BUILD_VERSION_MAJOR,$${BUILD_VERSION_MINOR}$${BUILD_RELEASE},$$REVISION"
    145145}
    … …  
    147147# Maemo 5
    148148maemo5 {
    149         target.path = /opt/usr/bin
    150         desktop.files = qtc_packaging/tspsg.desktop
    151         desktop.path = /usr/share/applications/hildon
    152         icon.files = qtc_packaging/tspsg.png
    153         icon.path = /usr/share/icons/hicolor/64x64/apps
     149    target.path = /opt/usr/bin
     150    desktop.files = qtc_packaging/tspsg.desktop
     151    desktop.path = /usr/share/applications/hildon
     152    icon.files = qtc_packaging/tspsg.png
     153    icon.path = /usr/share/icons/hicolor/64x64/apps
    154154
    155         INSTALLS += desktop icon
     155    INSTALLS += desktop icon
    156156}

  • trunk/tspsg.pri

    r151 r156  
    1313#Header files
    1414HEADERS += src/globals.h \
    15         src/version.h \
    16         src/os.h \
    17         src/defaults.h \
    18         src/mainwindow.h \
    19         src/settingsdialog.h \
    20         src/tspmodel.h \
    21         src/tspsolver.h \
    22         src/resource.h \
    23         src/qtwin.h
     15    src/version.h \
     16    src/os.h \
     17    src/defaults.h \
     18    src/mainwindow.h \
     19    src/settingsdialog.h \
     20    src/tspmodel.h \
     21    src/tspsolver.h \
     22    src/resource.h \
     23    src/qtwin.h
    2424
    2525#Source files
    2626SOURCES += src/main.cpp \
    27         src/globals.cpp \
    28         src/mainwindow.cpp \
    29         src/settingsdialog.cpp \
    30         src/tspmodel.cpp \
    31         src/tspsolver.cpp \
    32         src/qtwin.cpp
     27    src/globals.cpp \
     28    src/mainwindow.cpp \
     29    src/settingsdialog.cpp \
     30    src/tspmodel.cpp \
     31    src/tspsolver.cpp \
     32    src/qtwin.cpp
    3333
    3434#Forms
    3535FORMS += ui/mainwindow.ui \
    36         ui/settingsdialog.ui
     36    ui/settingsdialog.ui
    3737
    3838#Resource file(s)
    3939RESOURCES += resources/common.qrc \
    40         l10n/l10n.qrc
     40    l10n/l10n.qrc
    4141
    4242handheld {
    43         RESOURCES += resources/handheld.qrc
     43    RESOURCES += resources/handheld.qrc
    4444} else {
    45         RESOURCES += resources/desktop.qrc
     45    RESOURCES += resources/desktop.qrc
    4646}
    4747
    4848win* {
    49         RC_FILE = resources/tspsg.rc
     49    RC_FILE = resources/tspsg.rc
    5050}
    5151
    … …  
    5353CODECFORTR = UTF-8
    5454TRANSLATIONS += l10n/template.ts \
    55         l10n/tspsg_en.ts \
    56         l10n/tspsg_ru.ts \
    57         l10n/tspsg_uk.ts
     55    l10n/tspsg_en.ts \
     56    l10n/tspsg_ru.ts \
     57    l10n/tspsg_uk.ts
    5858
    5959!nopch {
    60         # Precompiled header
    61         PRECOMPILED_HEADER = src/pch.h
     60    # Precompiled header
     61    PRECOMPILED_HEADER = src/pch.h
    6262}
    6363
    6464_t_t_l_ {
    65         DEFINES += _T_T_L_
    66         HEADERS += src/_.h
     65    DEFINES += _T_T_L_
     66    HEADERS += src/_.h
    6767}

  • trunk/tspsg.pro

    r152 r156  
    1212
    1313!nosvg {
    14         QT += svg
     14    QT += svg
    1515} else {
    16         DEFINES += NOSVG
     16    DEFINES += NOSVG
    1717}
    1818
    1919wincewm*|symbian|maemo*|simulator {
    20         CONFIG += handheld
     20    CONFIG += handheld
    2121}
    2222
    … …  
    2929QMAKE_TARGET_PRODUCT = TSP Solver and Generator
    3030QMAKE_TARGET_DESCRIPTION = TSPSG: TSP Solver and Generator
    31 QMAKE_TARGET_COPYRIGHT = Copyright © 200-20110 Oleksii "Lёppa" Serdiuk <contacts[at]oleksii[dot]name>
     31QMAKE_TARGET_COPYRIGHT = Copyright © 2010-2011 Oleksii "Lёppa" Serdiuk <contacts[at]oleksii[dot]name>
    3232
    3333# Versioning
    … …  
    4343#REVISION = 145
    4444isEmpty(REVISION) {
    45         REVISION = $$system(svnversion)
     45    REVISION = $$system(svnversion)
    4646}
    4747isEmpty(REVISION)|isEqual(REVISION,exported) {
    48         REVISION = 0
     48    REVISION = 0
    4949} else {
    50         REVISION = $$replace(REVISION,":","")
    51         REVISION = $$replace(REVISION,"M","")
     50    REVISION = $$replace(REVISION,":","")
     51    REVISION = $$replace(REVISION,"M","")
    5252}
    5353SHORT_VERSION = $$sprintf("%1.%2",$$BUILD_VERSION_MAJOR,$$BUILD_VERSION_MINOR)
    5454win32-msvc*|wincewm* {
    55         VERSION = $$SHORT_VERSION
     55    VERSION = $$SHORT_VERSION
    5656} else {
    57         VERSION = $$sprintf("%1.%2",$$SHORT_VERSION,$$BUILD_RELEASE)
     57    VERSION = $$sprintf("%1.%2",$$SHORT_VERSION,$$BUILD_RELEASE)
    5858}
    5959
    6060DEFINES += BUILD_VERSION_MAJOR=$$BUILD_VERSION_MAJOR \
    61         BUILD_VERSION_MINOR=$$BUILD_VERSION_MINOR \
    62         BUILD_RELEASE=$$BUILD_RELEASE \
    63         BUILD_NUMBER=$$REVISION
     61    BUILD_VERSION_MINOR=$$BUILD_VERSION_MINOR \
     62    BUILD_RELEASE=$$BUILD_RELEASE \
     63    BUILD_NUMBER=$$REVISION
    6464
    6565# A hack to determine whether we have static or dynamic Qt build
    6666macx {
    67         PRL = $$[QT_INSTALL_LIBS] QtCore.framework QtCore.prl
     67    PRL = $$[QT_INSTALL_LIBS] QtCore.framework QtCore.prl
    6868} else:symbian|maemo* {
    69         # Nothing here
     69    # Nothing here
    7070} else:unix {
    71         PRL = $$[QT_INSTALL_LIBS] libQtCore.prl
     71    PRL = $$[QT_INSTALL_LIBS] libQtCore.prl
    7272} else {
    73         PRL = $$[QT_INSTALL_LIBS] QtCore.prl
     73    PRL = $$[QT_INSTALL_LIBS] QtCore.prl
    7474}
    7575!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
     76    include($$join(PRL, "/"))
     77    contains(QMAKE_PRL_CONFIG, static) {
     78        # We "embed" SVG icon support on static build
     79        DEFINES += STATIC_BUILD
    8080#               !nosvg:QTPLUGIN += qsvgicon
    81         }
     81    }
    8282}
    8383
    8484CONFIG(release, debug|release) {
    85         OBJECTS_DIR = release
    86         D =
     85    OBJECTS_DIR = release
     86    D =
    8787} else {
    88         OBJECTS_DIR = debug
    89         DEFINES += DEBUG
     88    OBJECTS_DIR = debug
     89    DEFINES += DEBUG
    9090#       CONFIG += console
    91         D = d
     91    D = d
    9292}
    9393DESTDIR = bin
    … …  
    101101# Include 3rd party libraries
    102102!handheld {
    103         include(src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
     103    include(src/3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
    104104}
    105105
Note: See TracChangeset for help on using the changeset viewer.