summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-04-19 08:56:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-04-19 08:56:03 (GMT)
commit8485052e3991aebf7c823b3e80fc06ccf9f08991 (patch)
treedcb2db231d640bc9327fe625353fa1e43fcb572d /src/corelib
parent685df07ff7e357f6848c50cffa311641afdca307 (diff)
parent6c121991f85164d257208b14845c7ff913a687f4 (diff)
downloadQt-8485052e3991aebf7c823b3e80fc06ccf9f08991.zip
Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.tar.gz
Qt-8485052e3991aebf7c823b3e80fc06ccf9f08991.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Make sure #ifdef'd tests still have main() function Long live QRawFont!
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/global/qglobal.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 6469b46..c2244cd 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2750,6 +2750,12 @@ QT_LICENSED_MODULE(DBus)
# endif
#endif
+#if !(defined(Q_WS_WIN) && !defined(Q_WS_WINCE)) \
+ && !(defined(Q_WS_MAC) && defined(QT_MAC_USE_COCOA)) \
+ && !(defined(Q_WS_X11) && !defined(QT_NO_FREETYPE))
+# define QT_NO_RAWFONT
+#endif
+
QT_END_NAMESPACE
QT_END_HEADER