diff options
| author | Luís Pereira <luis.artur.pereira@gmail.com> | 2013-08-16 04:18:11 -0700 |
|---|---|---|
| committer | Luís Pereira <luis.artur.pereira@gmail.com> | 2013-08-28 14:27:27 +0200 |
| commit | 11331ebe7f7159aadb1a07b81cd6306c8e8f041e (patch) | |
| tree | b5c0868584f881dec0e6558ae04bbd90273bba02 | |
| parent | f7908436836b3fe00a36e3b43fe89b23394997d5 (diff) | |
Don't use the -Wshadow CXX FLAG
It causes the following error (Qt version 4.8.1 i386-linux-gnu):
/usr/include/qt4/QtCore/qtconcurrentrunbase.h:84:42: error: declaration
of ‘future’ shadows a member of 'this' [-Werror=shadow]
Change-Id: I55fe238155948fbd1289f3c5f02596ac0167c0f5
Signed-off-by: Luís Pereira <luis.artur.pereira@gmail.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
| -rw-r--r-- | tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro | 2 | ||||
| -rw-r--r-- | tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro index 882fbe8..8916657 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro +++ b/tests/auto/qmimedatabase/qmimedatabase-cache/qmimedatabase-cache.pro @@ -35,7 +35,7 @@ contains(QMAKE_CXX, --sysroot): { DEFINES += CORE_SOURCES='"\\"$$PWD/../../../../src\\""' -*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor +*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wno-long-long -Wnon-virtual-dtor unix:!symbian { maemo5 { diff --git a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro index 1d55556..66f6f4b 100644 --- a/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro +++ b/tests/auto/qmimedatabase/qmimedatabase-xml/qmimedatabase-xml.pro @@ -35,7 +35,7 @@ contains(QMAKE_CXX, --sysroot): { DEFINES += CORE_SOURCES='"\\"$$PWD/../../../../src\\""' -*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wshadow -Wno-long-long -Wnon-virtual-dtor +*-g++*:QMAKE_CXXFLAGS += -W -Wall -Wextra -Werror -Wno-long-long -Wnon-virtual-dtor unix:!symbian { maemo5 { |