diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-04-29 12:47:35 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-14 07:52:41 (GMT) |
| commit | 075e96eba50013c583234b787562e09bb7535dd8 (patch) | |
| tree | b309e9b03b4a4693906a73c946d71bb2fb5fa193 /mkspecs/qws/macx-generic-g++ | |
| parent | dcb472d839f41b29d3926c67c36e246a4e0049e0 (diff) | |
| download | Qt-075e96eba50013c583234b787562e09bb7535dd8.zip Qt-075e96eba50013c583234b787562e09bb7535dd8.tar.gz Qt-075e96eba50013c583234b787562e09bb7535dd8.tar.bz2 | |
Say hello to Qt for Native Client.
This commits adds build system to support for the native
client compiler (x86-only for now), sets up global defines,
and adds compile fixes for QtCore and QtGui.
Details:
* Add mkspecs for linux-nacl-g++ and macx-nacl-c++
* Add nacl configure option
* Add qconfig-minimal-system-dependencies.h
* Define Q_OS_NACL in qglobal.h
* Add qnacalunimplemented.h/cpp with POSIX stubs.
* .pro file changes for cross-compiling on Mac
Diffstat (limited to 'mkspecs/qws/macx-generic-g++')
| -rw-r--r-- | mkspecs/qws/macx-generic-g++/qmake.conf | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mkspecs/qws/macx-generic-g++/qmake.conf b/mkspecs/qws/macx-generic-g++/qmake.conf index 9096712..63bfc57 100644 --- a/mkspecs/qws/macx-generic-g++/qmake.conf +++ b/mkspecs/qws/macx-generic-g++/qmake.conf @@ -2,6 +2,8 @@ # qmake configuration for macx-g++ with Qtopia Core # +include(../../common/unix.conf) + MAKEFILE_GENERATOR = UNIX TARGET_PLATFORM = macx TEMPLATE = app @@ -18,7 +20,7 @@ QMAKE_YACCFLAGS = -d QMAKE_CFLAGS = -pipe QMAKE_CFLAGS_WARN_ON = -Wall -W QMAKE_CFLAGS_WARN_OFF = -QMAKE_CFLAGS_RELEASE = -O2 -fno-default-inline +QMAKE_CFLAGS_RELEASE = -O2 QMAKE_CFLAGS_DEBUG = -g QMAKE_CFLAGS_SHLIB = -fPIC QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses @@ -29,7 +31,7 @@ QMAKE_CXX = $(TB)c++ QMAKE_CXXFLAGS = $$QMAKE_CFLAGS -DQT_NO_QWS_TRANSFORMED QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_CXXFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF -QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE +QMAKE_CXXFLAGS_RELEASE = $$QMAKE_CFLAGS_RELEASE -fno-default-inline QMAKE_CXXFLAGS_DEBUG = $$QMAKE_CFLAGS_DEBUG QMAKE_CXXFLAGS_SHLIB = $$QMAKE_CFLAGS_SHLIB QMAKE_CXXFLAGS_YACC = $$QMAKE_CFLAGS_YACC |