diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2013-12-13 16:43:43 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-01 06:56:45 +0100 |
| commit | 9c9f609313b6a0ddf8e226b291324c97b504d07f (patch) | |
| tree | 918a66c77bd1caf879007d1ea139b82e4930b3b5 /src | |
| parent | 8930839acbfb5cbc231cc73cbbe2d1f83236fb58 (diff) | |
Fix configure & qmake compilation with a future MSVC version
When MSVC supports ref-qualified members, we need to ensure that
qstring_compat.cpp can see the non-qualified definitions in qstring.h,
which means no precompiled header.
Alternatively, for a bootstrapped build we could not compile
qstring_compat.cpp or #ifndef the functions.
Change-Id: I8ece34503060f0b4b0f8f2df2fb9b0fb1311e269
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/tools/qstring_compat.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/corelib/tools/qstring_compat.cpp b/src/corelib/tools/qstring_compat.cpp index 34c37a9cb8..6613dfde8e 100644 --- a/src/corelib/tools/qstring_compat.cpp +++ b/src/corelib/tools/qstring_compat.cpp @@ -39,9 +39,8 @@ ** ****************************************************************************/ -#if defined(QSTRING_H) && !defined(QT_BOOTSTRAPPED) +#if defined(QSTRING_H) # error "This file cannot be compiled with pre-compiled headers" -// (unless it's configure.exe, which is bootstrapped) #endif #define QT_COMPILING_QSTRING_COMPAT_CPP |