Changeset 1241232377 in tspsg for src

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

Location:

src

Files:

• globals.h (modified) (1 diff)
• mainwindow.cpp (modified) (2 diffs)
• os.h (modified) (1 diff)

src/globals.h

@@ -34 +34 @@
 #   error You are using Qt version < 4.5 but minimum required version is 4.5.0. Compilation aborted.
 #endif
-#if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
+#if defined(Q_OS_WINCE_WM) || defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) || defined(Q_OS_BLACKBERRY)
     //! This is defined on handheld devices (e.g., Windows Mobile, Symbian).
 #   define HANDHELD

src/mainwindow.cpp

@@ -63 +63 @@
 #endif // NOSVG
 
-#if QT_VERSION >= QT_VERSION_CHECK(5,0,0)
-#   include <QtConcurrent>
-#endif
+#include <QtConcurrentRun>
 
 #include "os.h"
@@ -98 +96 @@
 {
 double i;
+#ifdef Q_OS_BLACKBERRY
+    return (std::modf(x, &i) == 0.0);
+#else
     return (modf(x, &i) == 0.0);
+#endif
 }
 

src/os.h

@@ -115 +115 @@
 #   define OS "HP Tru64 UNIX"
 #   define OSID quint8(16)
+#elif defined(Q_OS_BLACKBERRY)
+#   define OS "BlackBerry 10"
+#   define OSID quint8(17)
 #elif defined(Q_OS_QNX)
 #   define OS "QNX Neutrino"
-#   define OSID quint8(17)
+#   define OSID quint8(18)
 #elif defined(Q_OS_RELIANT)
 #   define OS "Reliant UNIX"
-#   define OSID quint8(18)
+#   define OSID quint8(19)
 #elif defined(Q_OS_SCO)
 #   define OS "SCO OpenServer 5"
-#   define OSID quint8(19)
+#   define OSID quint8(20)
 #elif defined(Q_OS_SOLARIS)
 #   define OS "Sun Solaris"
-#   define OSID quint8(20)
+#   define OSID quint8(21)
 #elif defined(Q_OS_SYMBIAN)
 #   define OS "Symbian"
-#   define OSID quint8(21)
+#   define OSID quint8(22)
 #elif defined(Q_OS_ULTRIX)
 #   define OS "DEC Ultrix"
-#   define OSID quint8(22)
+#   define OSID quint8(23)
 #elif defined(Q_OS_UNIXWARE)
 #   define OS "UnixWare 7/Open UNIX 8"
-#   define OSID quint8(23)
+#   define OSID quint8(24)
 #elif defined(Q_OS_WIN32)
 #   define OS "Windows"
-#   define OSID quint8(24)
+#   define OSID quint8(25)
 #elif defined(Q_OS_WINCE_WM)
 #   define OS "Windows Mobile"
-#   define OSID quint8(25)
+#   define OSID quint8(26)
 #elif defined(Q_OS_WINCE)
 #   define OS "Windows CE"
-#   define OSID quint8(26)
+#   define OSID quint8(27)
 #elif defined(Q_OS_BSD4)
 #   define OS "BSD 4.4"