Changeset 1241232377 in tspsg


Ignore:
Timestamp:
Aug 31, 2013, 11:52:19 PM (11 years ago)
Author:
Oleksii Serdiuk
Branches:
appveyor, imgbot, master, readme
Children:
7ed8b57eea
Parents:
243b53b608
Message:

[BB10] Created BlackBerry? 10 packaging rules and fixed build errors.

Cherry-picks from:
0edec5a2aec568f1d6d370bc5f4826f379890207
bd4553fa91c90a175e2d2709c2823b2faf5d0818
ca9cb6dfa53108993c75186063a5aad525669c25

Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • src/globals.h

    r243b53b608 r1241232377  
    3434#   error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
    3535#endif
    36 #if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
     36#if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) || defined(Q_OS_BLACKBERRY)
    3737    //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
    3838#   define HANDHELD
  • src/mainwindow.cpp

    r243b53b608 r1241232377  
    6363#endif // NOSVG
    6464
    65 #if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
    66 #   include <QtConcurrent>
    67 #endif
     65#include <QtConcurrentRun>
    6866
    6967#include "os.h"
     
    9896{
    9997double i;
     98#ifdef Q_OS_BLACKBERRY
     99    return (std::modf(x, &i) == 0.0);
     100#else
    100101    return (modf(x, &i) == 0.0);
     102#endif
    101103}
    102104
  • src/os.h

    r243b53b608 r1241232377  
    115115#   define OS "HP Tru64 UNIX"
    116116#   define OSID quint8(16)
     117#elif defined(Q_OS_BLACKBERRY)
     118#   define OS "BlackBerry 10"
     119#   define OSID quint8(17)
    117120#elif defined(Q_OS_QNX)
    118121#   define OS "QNX Neutrino"
    119 #   define OSID quint8(17)
     122#   define OSID quint8(18)
    120123#elif defined(Q_OS_RELIANT)
    121124#   define OS "Reliant UNIX"
    122 #   define OSID quint8(18)
     125#   define OSID quint8(19)
    123126#elif defined(Q_OS_SCO)
    124127#   define OS "SCO OpenServer 5"
    125 #   define OSID quint8(19)
     128#   define OSID quint8(20)
    126129#elif defined(Q_OS_SOLARIS)
    127130#   define OS "Sun Solaris"
    128 #   define OSID quint8(20)
     131#   define OSID quint8(21)
    129132#elif defined(Q_OS_SYMBIAN)
    130133#   define OS "Symbian"
    131 #   define OSID quint8(21)
     134#   define OSID quint8(22)
    132135#elif defined(Q_OS_ULTRIX)
    133136#   define OS "DEC Ultrix"
    134 #   define OSID quint8(22)
     137#   define OSID quint8(23)
    135138#elif defined(Q_OS_UNIXWARE)
    136139#   define OS "UnixWare 7/Open UNIX 8"
    137 #   define OSID quint8(23)
     140#   define OSID quint8(24)
    138141#elif defined(Q_OS_WIN32)
    139142#   define OS "Windows"
    140 #   define OSID quint8(24)
     143#   define OSID quint8(25)
    141144#elif defined(Q_OS_WINCE_WM)
    142145#   define OS "Windows Mobile"
    143 #   define OSID quint8(25)
     146#   define OSID quint8(26)
    144147#elif defined(Q_OS_WINCE)
    145148#   define OS "Windows CE"
    146 #   define OSID quint8(26)
     149#   define OSID quint8(27)
    147150#elif defined(Q_OS_BSD4)
    148151#   define OS "BSD 4.4"
  • tspsg.pri

    r243b53b608 r1241232377  
    5959    l10n/tspsg_uk.ts
    6060
     61blackberry {
     62    OTHER_FILES += \
     63        bar-descriptor.xml
     64}
     65
    6166!nopch {
    6267    # Precompiled header
  • tspsg.pro

    r243b53b608 r1241232377  
    2121}
    2222
    23 wincewm*|symbian|maemo*|simulator {
     23wincewm*|symbian|maemo*|simulator|blackberry {
    2424    CONFIG += handheld
    2525}
     
    4343    BUILD_NUMBER=$$BUILD_NUMBER
    4444
    45 !debug_and_release|build_pass {
    46     CONFIG(debug, debug|release) {
    47         OBJECTS_DIR = debug
    48         DEFINES += DEBUG
    49 #           CONFIG += console
    50         D = d
    51     } else {
    52         OBJECTS_DIR = release
    53         D =
     45blackberry {
     46    TARGET = tspsg
     47} else {
     48    !debug_and_release|build_pass {
     49        CONFIG(debug, debug|release) {
     50            OBJECTS_DIR = debug
     51            DEFINES += DEBUG
     52#            CONFIG += console
     53            D = d
     54        } else {
     55            OBJECTS_DIR = release
     56            D =
     57        }
    5458    }
    5559}
    56 DESTDIR = bin
    57 TARGET = tspsg$${D}
    5860
    5961# Saving all intermediate files to tmp directory.
Note: See TracChangeset for help on using the changeset viewer.