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 /src/corelib/tools/tools.pri | |
| 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 'src/corelib/tools/tools.pri')
| -rw-r--r-- | src/corelib/tools/tools.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/tools/tools.pri b/src/corelib/tools/tools.pri index 4e0ebbc..f540f14 100644 --- a/src/corelib/tools/tools.pri +++ b/src/corelib/tools/tools.pri @@ -83,7 +83,7 @@ SOURCES += \ symbian:SOURCES+=tools/qlocale_symbian.cpp -mac:SOURCES += tools/qelapsedtimer_mac.cpp +!nacl:mac:SOURCES += tools/qelapsedtimer_mac.cpp else:symbian:SOURCES += tools/qelapsedtimer_symbian.cpp else:unix:SOURCES += tools/qelapsedtimer_unix.cpp else:win32:SOURCES += tools/qelapsedtimer_win.cpp |