diff options
| author | Thomas McGuire <thomas.mcguire.qnx@kdab.com> | 2012-11-22 18:41:29 +0000 |
|---|---|---|
| committer | Thomas McGuire <thomas.mcguire@kdab.com> | 2012-11-23 09:24:05 +0100 |
| commit | 14a366111055d4651d960a7d5f051a1e04e63485 (patch) | |
| tree | 3764014a88de5322406c2e58837e672d3c680307 /src | |
| parent | 09a0e56acb6a49a99fc1c0feaa2ab9344dcfd8c3 (diff) | |
Fix build on QNX.
* Not all C++ compilers inject C functions into global namespace,
On QNX you need to use std:: when using functions from <cstdlib>
for example.
* Disable a few modules that don't compile.
* QNX linker doesn't like -rdynamic.
* Explicitly link against network, sql and declarative modules
since QNX's linker doesn't pull in indirect dependencies.
* Don't build against gstreamer on QNX.
Change-Id: Ic3a202fbbbb77b25334323681e7dbf8bd5872f59
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/3rdparty/proj/pj_open_lib_qt.cpp | 5 | ||||
| -rw-r--r-- | src/location/maps/qgeomapobjectengine_p.cpp | 6 |
2 files changed, 10 insertions, 1 deletions
diff --git a/src/3rdparty/proj/pj_open_lib_qt.cpp b/src/3rdparty/proj/pj_open_lib_qt.cpp index ac6baf9b55..f625b24665 100644 --- a/src/3rdparty/proj/pj_open_lib_qt.cpp +++ b/src/3rdparty/proj/pj_open_lib_qt.cpp @@ -31,6 +31,11 @@ *****************************************************************************/ #define PJ_LIB__ + +#ifdef __QNXNTO__ +# include <math.h> // Needs to be included outside of "extern "C"" +#endif + extern "C" { #include <projects.h> #include <stdio.h> diff --git a/src/location/maps/qgeomapobjectengine_p.cpp b/src/location/maps/qgeomapobjectengine_p.cpp index b679ee54d5..1fec5b91ed 100644 --- a/src/location/maps/qgeomapobjectengine_p.cpp +++ b/src/location/maps/qgeomapobjectengine_p.cpp @@ -54,7 +54,11 @@ #include <QGraphicsPathItem> #include <QGraphicsEllipseItem> -#include <cmath> +#ifdef Q_OS_QNX +# include <math.h> +#else +# include <cmath> +#endif #include <QDebug> |