summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-09-01 16:38:18 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-09-01 16:38:18 (GMT)
commitfb920977b1afd105ae87109d9ee930f5a2fe0b90 (patch)
treef13149d253529f800d067e7f97aa356e8d3d3229 /src/corelib/global/qglobal.h
parent35d05651d3eabeb981f0ffa0251410df4d991d36 (diff)
parente4804c5d3d2e80cc7f57936591374d29478dbb2a (diff)
downloadQt-fb920977b1afd105ae87109d9ee930f5a2fe0b90.zip
Qt-fb920977b1afd105ae87109d9ee930f5a2fe0b90.tar.gz
Qt-fb920977b1afd105ae87109d9ee930f5a2fe0b90.tar.bz2
Merge branch '4.6'
Diffstat (limited to 'src/corelib/global/qglobal.h')
-rw-r--r--src/corelib/global/qglobal.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index da53289..b0ca3f7 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -1364,6 +1364,9 @@ inline void qt_noop() {}
#ifdef QT_BOOTSTRAPPED
# define QT_NO_EXCEPTIONS
#endif
+#if defined(Q_CC_GNU) && !defined (__EXCEPTIONS)
+# define QT_NO_EXCEPTIONS
+#endif
#ifdef QT_NO_EXCEPTIONS
# define QT_TRY if (true)