summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@nokia.com>2010-04-29 12:47:35 (GMT)
committerMorten Johan Sørvig <morten.sorvig@nokia.com>2010-05-14 07:52:41 (GMT)
commit075e96eba50013c583234b787562e09bb7535dd8 (patch)
treeb309e9b03b4a4693906a73c946d71bb2fb5fa193 /src/src.pro
parentdcb472d839f41b29d3926c67c36e246a4e0049e0 (diff)
downloadQt-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/src.pro')
-rw-r--r--src/src.pro2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/src.pro b/src/src.pro
index 9c4831c..d15e973 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -5,6 +5,8 @@ unset(SRC_SUBDIRS)
win32:SRC_SUBDIRS += src_winmain
symbian:SRC_SUBDIRS += src_s60main
SRC_SUBDIRS += src_corelib src_xml src_network src_sql src_testlib
+nacl: SRC_SUBDIRS -= src_network src_testlib
+win32:SRC_SUBDIRS += src_activeqt
!symbian:contains(QT_CONFIG, dbus):SRC_SUBDIRS += src_dbus
!contains(QT_CONFIG, no-gui): SRC_SUBDIRS += src_gui
!wince*:!symbian:!vxworks:contains(QT_CONFIG, qt3support): SRC_SUBDIRS += src_qt3support