diff options
author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-24 17:36:04 +0100 |
commit | ad67ec26d0cbc98e3440dd38bb20eef4da2ee96d (patch) | |
tree | 9f8135751df2f995a4f55837ea065a4687245b71 /src/3rdparty | |
parent | 83a16630c13969e68cd3a5aaab73335ccb0d4414 (diff) | |
parent | 20d160d0513a04be187ed851a25b029f47c27b27 (diff) |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
.qmake.conf
LICENSE.GPLv2
examples/qml/networkaccessmanagerfactory/view.qml
src/qml/jsruntime/qv4runtime.cpp
src/qml/jsruntime/qv4stringobject.cpp
Change-Id: I5d12f436d60995e51d5c2f59d364e9cbc24f8e32
Diffstat (limited to 'src/3rdparty')
-rw-r--r-- | src/3rdparty/masm/masm.pri | 16 | ||||
-rw-r--r-- | src/3rdparty/masm/wtf/PageBlock.cpp | 2 |
2 files changed, 8 insertions, 10 deletions
diff --git a/src/3rdparty/masm/masm.pri b/src/3rdparty/masm/masm.pri index 3fd4aa6cec..3655af36b6 100644 --- a/src/3rdparty/masm/masm.pri +++ b/src/3rdparty/masm/masm.pri @@ -71,18 +71,16 @@ retgen.commands = python $$retgen.script > ${QMAKE_FILE_OUT} QMAKE_EXTRA_COMPILERS += retgen # Taken from WebKit/Tools/qmake/mkspecs/features/unix/default_post.prf -linux-g++* { - greaterThan(QT_GCC_MAJOR_VERSION, 3):greaterThan(QT_GCC_MINOR_VERSION, 5) { - !contains(QMAKE_CXXFLAGS, -std=(c|gnu)\\+\\+(0x|11)) { +!c++11:!intel_icc { + # Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways + clang { + QMAKE_CXXFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions + QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -Wno-c++0x-extensions + } else: gcc { + greaterThan(QT_GCC_MAJOR_VERSION, 4)|greaterThan(QT_GCC_MINOR_VERSION, 5) { # We need to deactivate those warnings because some names conflicts with upcoming c++0x types (e.g.nullptr). QMAKE_CXXFLAGS_WARN_ON += -Wno-c++0x-compat QMAKE_CXXFLAGS += -Wno-c++0x-compat } } } - -# Don't warn about OVERRIDE and FINAL, since they are feature-checked anyways -*clang:!contains(QMAKE_CXXFLAGS, -std=c++11) { - QMAKE_CXXFLAGS += -Wno-c++11-extensions - QMAKE_OBJECTIVE_CFLAGS += -Wno-c++11-extensions -} diff --git a/src/3rdparty/masm/wtf/PageBlock.cpp b/src/3rdparty/masm/wtf/PageBlock.cpp index a6f5585925..e715ed262a 100644 --- a/src/3rdparty/masm/wtf/PageBlock.cpp +++ b/src/3rdparty/masm/wtf/PageBlock.cpp @@ -44,7 +44,7 @@ static size_t s_pageMask; inline size_t systemPageSize() { - return getpagesize(); + return ::sysconf(_SC_PAGESIZE); } #elif OS(WINDOWS) |