diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2012-04-04 12:43:48 (GMT) |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-04 13:02:34 (GMT) |
| commit | cb4ec42709d4571b1186a1c0d0d9c1a37c212e91 (patch) | |
| tree | efd1cd4812850ac6d9a2417db090d54a1e1d41b9 /src/corelib | |
| parent | d4858c581eaf23c57577dc7e12b48f392ed0463f (diff) | |
| download | Qt-cb4ec42709d4571b1186a1c0d0d9c1a37c212e91.zip Qt-cb4ec42709d4571b1186a1c0d0d9c1a37c212e91.tar.gz Qt-cb4ec42709d4571b1186a1c0d0d9c1a37c212e91.tar.bz2 | |
Fix corelib build for WEC7.
Qt5 backported fix http://codereview.qt-project.org/17852 broke the Qt4.8
build for WEC7. The change works fine in Qt5 because Qt5 does not anymore
have QT_MODULE macro in every header, including qfunctions_wince.h.
See commit: 4ecf8279
Apparently implementations of QT_MODULE and c-language zlib are
not compatible, because MSVC2008 gives a lot of errors like:
error C2085: 'qt_wince_getenv_s' : not in formal parameter list
Build break fixed by putting QT_MODULE macro inside #ifdef __cplusplus.
Change-Id: Id71386867750fcc61ab2cb2ecc527edc37c943ba
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qfunctions_wince.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index 3872113..6ed8162 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -60,8 +60,10 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifdef QT_BUILD_CORE_LIB +#ifdef __cplusplus // zlib is written in C, and does not like about the implementation of QT_MODULE macro QT_MODULE(Core) -#endif +#endif // __cplusplus +#endif // QT_BUILD_CORE_LIB QT_END_NAMESPACE QT_END_HEADER |