diff --git a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp index c5779241f23..862127aff59 100644 --- a/tests/auto/cplusplus/translationunit/tst_translationunit.cpp +++ b/tests/auto/cplusplus/translationunit/tst_translationunit.cpp @@ -227,6 +227,7 @@ static QByteArray stripEncodingPrefixAndQuotationMarks(const QByteArray &literal Q_ASSERT(firstQuotationMarkPosition != -1); Q_ASSERT(lastQuotationMarkPosition == literal.size() - 1); Q_ASSERT(firstQuotationMarkPosition < lastQuotationMarkPosition - 1); + Q_UNUSED(lastQuotationMarkPosition); QByteArray result = literal.mid(firstQuotationMarkPosition + 1); result.chop(1); diff --git a/tests/auto/externaltool/externaltool.pro b/tests/auto/externaltool/externaltool.pro index a94191c5447..1c7936c0e20 100644 --- a/tests/auto/externaltool/externaltool.pro +++ b/tests/auto/externaltool/externaltool.pro @@ -1,7 +1,6 @@ +QTC_LIB_DEPENDS += utils QTC_PLUGIN_DEPENDS += coreplugin include(../qttest.pri) -include($$IDE_SOURCE_TREE/src/plugins/coreplugin/coreplugin_dependencies.pri) -include($$IDE_SOURCE_TREE/src/libs/utils/utils_dependencies.pri) SOURCES += tst_externaltooltest.cpp \ $$IDE_SOURCE_TREE/src/plugins/coreplugin/externaltool.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro index 1351ca88d76..0076f66a1e3 100644 --- a/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro +++ b/tests/auto/valgrind/memcheck/testapps/leak3/leak3.pro @@ -7,4 +7,6 @@ QT += core macx:CONFIG -= app_bundle +win32-msvc*:QMAKE_CXXFLAGS += -w4996 + SOURCES += main.cpp diff --git a/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro index 72bb8a99d9f..dcc03cf1825 100644 --- a/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro +++ b/tests/auto/valgrind/memcheck/testapps/overlap/overlap.pro @@ -3,7 +3,7 @@ TARGET = overlap CONFIG += debug console CONFIG -= qt -QMAKE_CXXFLAGS = -O0 -fno-builtin +!win32-msvc*:QMAKE_CXXFLAGS = -O0 -fno-builtin macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp index 7365f7ba3e9..f81c4702c69 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp +++ b/tests/auto/valgrind/memcheck/testapps/uninit1/main.cpp @@ -28,8 +28,6 @@ ** ****************************************************************************/ -#pragma GCC diagnostic ignored "-Wuninitialized" - int main() { bool b; diff --git a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro index 6374c0c80b6..7690b4848b3 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit1/uninit1.pro @@ -3,7 +3,8 @@ TARGET = uninit1 CONFIG += debug console CONFIG -= qt -QMAKE_CXXFLAGS = -O0 +win32-msvc*:QMAKE_CXXFLAGS += -w4700 +else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp index 961d1c17007..f2aa1e2d1eb 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp +++ b/tests/auto/valgrind/memcheck/testapps/uninit2/main.cpp @@ -28,8 +28,6 @@ ** ****************************************************************************/ -#pragma GCC diagnostic ignored "-Wuninitialized" - int main() { int *i; diff --git a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro index b567008dd22..a2c3341c15a 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit2/uninit2.pro @@ -3,7 +3,8 @@ TARGET = uninit2 CONFIG += debug console CONFIG -= qt -QMAKE_CXXFLAGS = -O0 +win32-msvc*:QMAKE_CXXFLAGS += -w4700 +else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp b/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp index 6832aff7f0a..565f6533b03 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp +++ b/tests/auto/valgrind/memcheck/testapps/uninit3/main.cpp @@ -28,8 +28,6 @@ ** ****************************************************************************/ -#pragma GCC diagnostic ignored "-Wuninitialized" - int main() { int *i; diff --git a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro index 3333b310d84..43fdc08abef 100644 --- a/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro +++ b/tests/auto/valgrind/memcheck/testapps/uninit3/uninit3.pro @@ -3,7 +3,8 @@ TARGET = uninit3 CONFIG += debug console CONFIG -= qt -QMAKE_CXXFLAGS = -O0 +win32-msvc*:QMAKE_CXXFLAGS += -w4700 +else:QMAKE_CXXFLAGS = -O0 -Wno-uninitialized macx:CONFIG -= app_bundle diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index ee7cc0bd366..e9a9563179b 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -3245,12 +3245,12 @@ namespace stdmap { { typedef std::pair V; std::multimap map; - map.insert(V(11, 11.0)); - map.insert(V(22, 22.0)); - map.insert(V(22, 33.0)); - map.insert(V(22, 34.0)); - map.insert(V(22, 35.0)); - map.insert(V(22, 36.0)); + map.insert(V(11, 11.0f)); + map.insert(V(22, 22.0f)); + map.insert(V(22, 33.0f)); + map.insert(V(22, 34.0f)); + map.insert(V(22, 35.0f)); + map.insert(V(22, 36.0f)); BREAK_HERE; // Expand map. // Check map <6 items> std:multimap. @@ -7089,9 +7089,9 @@ namespace sanity { } // namespace sanity -template int ffff(X x) +template int ffff(X) { - return sizeof(x); + return sizeof(X); } int main(int argc, char *argv[])