From 6dc975a8ad521a768cd50e8d06e2cf5f26dcb699 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Wed, 27 Mar 2013 16:02:40 +0200
Subject: [PATCH] Tests: Fix MSVC errors and warnings
Change-Id: I7350b3fe751a76787a932e1346ad19377a6ea9bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
---
tests/auto/debugger/tst_dumpers.cpp | 10 +++++-----
tests/manual/debugger/gui/mainwindow.cpp | 4 ++--
tests/manual/debugger/simple/simple_test_app.cpp | 12 ++++++------
tests/manual/debugger/simple/simple_test_app.pro | 1 +
tests/manual/preprocessor/main.cpp | 4 ++--
5 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp
index ae22990418e..201b9e33f9a 100644
--- a/tests/auto/debugger/tst_dumpers.cpp
+++ b/tests/auto/debugger/tst_dumpers.cpp
@@ -837,9 +837,9 @@ void tst_Dumpers::dumper_data()
"QByteArray buf3(str3);\n"
"unused(&buf1, &buf2, &buf3);\n")
% CoreProfile()
- % Check("buf1", "\"" + QByteArray(1, 0xee) + "\"", "@QByteArray")
- % Check("buf2", "\"" + QByteArray(1, 0xee) + "\"", "@QByteArray")
- % Check("buf3", "\"\ee\"", "@QByteArray")
+ % Check("buf1", "\"" + QByteArray(1, (char)0xee) + "\"", "@QByteArray")
+ % Check("buf2", "\"" + QByteArray(1, (char)0xee) + "\"", "@QByteArray")
+ % Check("buf3", "\"\\ee\"", "@QByteArray")
% CheckType("str1", "char *");
QTest::newRow("QByteArray4")
@@ -928,7 +928,7 @@ void tst_Dumpers::dumper_data()
"QFileInfo fi(\"C:\\Program Files\\tt\");\n"
"QString s = fi.absoluteFilePath();\n")
% Check("fi", "\"C:/Program Files/tt\"", "QFileInfo")
- % Check("file", "\"C:\Program Files\t\"", "QFile")
+ % Check("file", "\"C:\\Program Files\\t\"", "QFile")
% Check("s", "\"C:/Program Files/tt\"", "QString");
#else
<< Data("#include <QFile>\n"
@@ -2806,7 +2806,7 @@ void tst_Dumpers::dumper_data()
% Check("l.0", "[0]", "\" big, \"", "@QString")
% Check("l.1", "[1]", "\" World \"", "@QString");
- QChar oUmlaut = QLatin1Char(0xf6);
+ QChar oUmlaut = QLatin1Char((char)0xf6);
QTest::newRow("String")
<< Data("#include <QString>",
"const wchar_t *w = L\"aöa\";\n"
diff --git a/tests/manual/debugger/gui/mainwindow.cpp b/tests/manual/debugger/gui/mainwindow.cpp
index afe398774ee..eadeb290ba9 100644
--- a/tests/manual/debugger/gui/mainwindow.cpp
+++ b/tests/manual/debugger/gui/mainwindow.cpp
@@ -62,7 +62,7 @@ struct TestClass {
TestClass::TestClass() :
m_i(1),
- m_f(M_E)
+ m_f((float)M_E)
{
}
@@ -120,7 +120,7 @@ void MainWindow::complexBP(int *inc, QString inx)
qint64 i64 = 54354;
quint64 iu64 = 54354;
- float r = M_PI;
+ float r = (float)M_PI;
double d = M_PI;
QString x = "Hallo ";
diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp
index 8a8c18a3944..9fd0b4fa904 100644
--- a/tests/manual/debugger/simple/simple_test_app.cpp
+++ b/tests/manual/debugger/simple/simple_test_app.cpp
@@ -3042,12 +3042,12 @@ namespace stdset {
{
typedef std::set<int> Set;
Set set;
- set.insert(11.0);
- set.insert(22.0);
- set.insert(33.0);
- set.insert(44.0);
- set.insert(55.0);
- set.insert(66.0);
+ set.insert(11);
+ set.insert(22);
+ set.insert(33);
+ set.insert(44);
+ set.insert(55);
+ set.insert(66);
Set::iterator it1 = set.begin();
Set::iterator it2 = it1; ++it2;
diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro
index 12a6cc4ec7d..aad44498a0c 100644
--- a/tests/manual/debugger/simple/simple_test_app.pro
+++ b/tests/manual/debugger/simple/simple_test_app.pro
@@ -46,5 +46,6 @@ exists($$QMAKE_INCDIR_QT/QtCore/private/qobject_p.h):DEFINES += USE_PRIVATE
exists(/usr/include/boost/optional.hpp): DEFINES += USE_BOOST
exists(/usr/include/eigen2/Eigen/Core): DEFINES += USE_EIGEN
+win32-msvc*:DEFINES += _CRT_SECURE_NO_WARNINGS
# Use for semi-automated testing
#DEFINES += USE_AUTORUN=1
diff --git a/tests/manual/preprocessor/main.cpp b/tests/manual/preprocessor/main.cpp
index 573ab665949..c5fe4ad7aa9 100644
--- a/tests/manual/preprocessor/main.cpp
+++ b/tests/manual/preprocessor/main.cpp
@@ -150,9 +150,9 @@ int main(int argc, char *argv[])
}
}
-int make_depend(QCoreApplication *app)
+int make_depend(QCoreApplication *)
{
- QStringList todo = app->arguments();
+ QStringList todo = QCoreApplication::arguments();
todo.removeFirst();
if (todo.isEmpty())
--
GitLab