diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:21:25 (GMT) |
|---|---|---|
| committer | Janne Anttila <janne.anttila@digia.com> | 2009-08-21 05:21:25 (GMT) |
| commit | 5365c1cdf1e79b60f913f8fba2b5a25058d65b5c (patch) | |
| tree | d80717bf04339f767b92b5cc15c8d905eb3265af /mkspecs | |
| parent | b0743dd4e6f72108ac1fd989a418969fd241335d (diff) | |
| download | Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.zip Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.tar.gz Qt-5365c1cdf1e79b60f913f8fba2b5a25058d65b5c.tar.bz2 | |
Revert "Hackish workaroung to Open C / C++ defect when intermixing standard"
This reverts commit 4dd03abdfbcc1af3075b30165e19ee63fe8051f4. And changes
stl.prf slightly to get the Qt libs compiled again without reverted hack.
Conflicts:
src/gui/painting/qblackraster.c
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/symbian/stl.prf | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mkspecs/features/symbian/stl.prf b/mkspecs/features/symbian/stl.prf index 9eb6b86..6d7426b 100644 --- a/mkspecs/features/symbian/stl.prf +++ b/mkspecs/features/symbian/stl.prf @@ -5,7 +5,6 @@ CONFIG -= stl_off # MACRO _WCHAR_T_DECLARED QMAKE_CXXFLAGS.CW *= $$STLLIB_USAGE_CW_FLAGS -DEFINES *= $$STLLIB_USAGE_DEFINES # Legacy support requires some hardcoded stdapis paths. # Note: Also the new header is used from STL when it is enabled |