summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/concurrent.pro3
-rw-r--r--src/concurrent/doc/qtconcurrent.qdocconf2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 2a519314f3..fd15a3c758 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -2,7 +2,8 @@ TARGET = QtConcurrent
QT = core-private
CONFIG += exceptions
-DEFINES += QT_NO_USING_NAMESPACE
+DEFINES += QT_NO_USING_NAMESPACE QT_NO_FOREACH
+
win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x66000000
QMAKE_DOCS = $$PWD/doc/qtconcurrent.qdocconf
diff --git a/src/concurrent/doc/qtconcurrent.qdocconf b/src/concurrent/doc/qtconcurrent.qdocconf
index 3cd2fac075..d8ee963ef5 100644
--- a/src/concurrent/doc/qtconcurrent.qdocconf
+++ b/src/concurrent/doc/qtconcurrent.qdocconf
@@ -4,7 +4,7 @@ project = QtConcurrent
description = Qt Concurrent Reference Documentation
version = $QT_VERSION
-examplesinstallpath = qtbase/qtconcurrent
+examplesinstallpath = qtconcurrent
qhp.projects = QtConcurrent