diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-11 15:12:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 15:12:00 +0100 |
| commit | df62c31807f7b0a8b9bc222b47ccc7016cfaee65 (patch) | |
| tree | a7df6263cdb4cc96e2d31486437ec19ca0bf01e5 /mkspecs | |
| parent | 17de86f2824c1807c0fa7fa7ae0ed3b7d2acca00 (diff) | |
| parent | a1fe728fa5bd6cb9e50cf317a58efcf4eea4de2c (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/gcc-base-mac.conf | 4 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 8 |
2 files changed, 8 insertions, 4 deletions
diff --git a/mkspecs/common/gcc-base-mac.conf b/mkspecs/common/gcc-base-mac.conf index e0469f31cc..cb1e17bc90 100644 --- a/mkspecs/common/gcc-base-mac.conf +++ b/mkspecs/common/gcc-base-mac.conf @@ -12,10 +12,6 @@ include(gcc-base.conf) QMAKE_COMPILER_DEFINES += __APPLE__ __GNUC__=4 -QMAKE_CFLAGS_DEBUG += -gdwarf-2 - -QMAKE_CXXFLAGS_DEBUG += -gdwarf-2 - QMAKE_OBJECTIVE_CFLAGS = $$QMAKE_CFLAGS QMAKE_OBJECTIVE_CFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON QMAKE_OBJECTIVE_CFLAGS_WARN_OFF = $$QMAKE_CFLAGS_WARN_OFF diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 32a722fb53..2134077ed3 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -119,6 +119,14 @@ DEFINES += QT_BUILDING_QT win32 { INCLUDEPATH += tmp CONFIG += skip_target_version_ext + # If the code is really "unsafe" then it is unsafe on + # other platforms as well; so fixing these warnings just + # for MSVC builds, would clutter the code and wouldn't help + # in fixing issues that might exist on other platforms. + # Using the same functions across all supported platforms + # keeps the code clean and helps in writing code that is + # safe across all platforms. + DEFINES *= _CRT_SECURE_NO_WARNINGS } aix-g++* { |