diff options
| author | Andreas Holzammer <andreas.holzammer@kdab.com> | 2013-11-21 12:58:22 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-23 15:45:35 +0100 |
| commit | ca2440e2b10368c7d8b849ee1b504a7d587dd1a9 (patch) | |
| tree | c025590b3589a41199f3bea61faeafa3c3e19ac1 /configure | |
| parent | a18daa8793ea6b2e9405e854f4b0fef66f8ceb16 (diff) | |
Add PPS configure check
Plain QNX 6.5.0 does not have a libpps, the new QNX
has a libpps and BlackBerry has it as well. So we need
a configure check to not open another mkspec for this
platform. This fixes the plain QNX 6.5.0 build.
Change-Id: Id4b3876f2385bcb5f3df426945532e7e26133f24
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 24 |
1 files changed, 23 insertions, 1 deletions
@@ -629,6 +629,7 @@ CFG_JAVASCRIPTCORE_JIT=auto CFG_PKGCONFIG=auto CFG_STACK_PROTECTOR_STRONG=auto CFG_SLOG2=auto +CFG_PPS=auto CFG_SYSTEM_PROXIES=no # Target architecture @@ -1770,6 +1771,13 @@ while [ "$#" -gt 0 ]; do UNKNOWN_OPT=yes fi ;; + pps) + if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then + CFG_PPS="$VAL" + else + UNKNOWN_OPT=yes + fi + ;; gtkstyle) if [ "$VAL" = "yes" ] || [ "$VAL" = "no" ]; then CFG_QGTKSTYLE="$VAL" @@ -2456,6 +2464,9 @@ QNX/Blackberry options: -no-slog2 .......... Do not compile with slog2 support. -slog2 ............. Compile with slog2 support. + -no-pps ............ Do not compile with pps support. + -pps ............... Compile with pps support. + MacOS/iOS options: -Fstring ........... Add an explicit framework path. @@ -4343,6 +4354,15 @@ if [ "$XPLATFORM_QNX" = "yes" ]; then CFG_SLOG2=no fi fi + + if [ "$CFG_PPS" != "no" ]; then + if compileTest unix/pps "pps"; then + CFG_PPS=yes + QMAKE_CONFIG="$QMAKE_CONFIG qqnx_pps" + else + CFG_PPS=no + fi + fi fi if [ "$CFG_ZLIB" = "auto" ]; then @@ -6703,8 +6723,10 @@ if [ "$CFG_XCB" != "no" ]; then report_support " XVideo ............." "$CFG_XVIDEO" fi report_support " Session management ....." "$CFG_SM" -[ "$XPLATFORM_QNX" = "yes" ] && \ +if [ "$XPLATFORM_QNX" = "yes" ]; then report_support " SLOG2 .................." "$CFG_SLOG2" + report_support " PPS ...................." "$CFG_PPS" +fi report_support " SQL drivers:" report_support " DB2 .................." "$CFG_SQL_db2" plugin "plugin" yes "built into QtSql" report_support " InterBase ............" "$CFG_SQL_ibase" plugin "plugin" yes "built into QtSql" |