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/io | |
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/io')
-rw-r--r-- | src/corelib/io/io.pri | 10 | ||||
-rw-r--r-- | src/corelib/io/qresource.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/corelib/io/io.pri b/src/corelib/io/io.pri index ef448b1..7c14886 100644 --- a/src/corelib/io/io.pri +++ b/src/corelib/io/io.pri @@ -69,7 +69,7 @@ win32 { SOURCES += io/qfsfileengine_iterator_unix.cpp symbian:SOURCES += io/qprocess_symbian.cpp else:SOURCES += io/qprocess_unix.cpp - macx-*: { + !nacl:macx-*: { HEADERS += io/qfilesystemwatcher_fsevents_p.h SOURCES += io/qsettings_mac.cpp io/qfilesystemwatcher_fsevents.cpp } @@ -84,9 +84,11 @@ win32 { io/qfilesystemwatcher_dnotify_p.h } - freebsd-*|macx-*|darwin-*|openbsd-*:{ - SOURCES += io/qfilesystemwatcher_kqueue.cpp - HEADERS += io/qfilesystemwatcher_kqueue_p.h + !nacl { + freebsd-*|macx-*|darwin-*|openbsd-*:{ + SOURCES += io/qfilesystemwatcher_kqueue.cpp + HEADERS += io/qfilesystemwatcher_kqueue_p.h + } } symbian { diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 8e76e9e..783fbb0 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -928,7 +928,7 @@ public: } }; -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && ! defined (Q_OS_NACL) #define QT_USE_MMAP #endif |