diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-04-29 14:47:35 +0200 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-05-14 09:52:41 +0200 |
| commit | 075e96eba50013c583234b787562e09bb7535dd8 (patch) | |
| tree | b309e9b03b4a4693906a73c946d71bb2fb5fa193 /src/corelib/corelib.pro | |
| parent | dcb472d839f41b29d3926c67c36e246a4e0049e0 (diff) | |
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 'src/corelib/corelib.pro')
| -rw-r--r-- | src/corelib/corelib.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 83fa0447e3..5a810b1cbe 100644 --- a/src/corelib/corelib.pro +++ b/src/corelib/corelib.pro @@ -18,7 +18,7 @@ include(codecs/codecs.pri) include(statemachine/statemachine.pri) include(xml/xml.pri) -mac|darwin:LIBS_PRIVATE += -framework ApplicationServices +!nacl:mac|darwin:LIBS_PRIVATE += -framework ApplicationServices mac:lib_bundle:DEFINES += QT_NO_DEBUG_PLUGIN_CHECK win32:DEFINES-=QT_NO_CAST_TO_ASCII |