feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Tests: Fix MSVC errors and warnings

Browse Source 
Change-Id: I7350b3fe751a76787a932e1346ad19377a6ea9bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
This commit is contained in:
Orgad Shaneh
2013-03-27 16:02:40 +02:00
committed by Orgad Shaneh
parent 1db74e381c
commit 6dc975a8ad
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/auto/debugger/tst_dumpers.cpp
View File

@@ -837,9 +837,9 @@ void tst_Dumpers::dumper_data()
"QByteArray buf3(str3);\n" "QByteArray buf3(str3);\n"
"unused(&buf1, &buf2, &buf3);\n") "unused(&buf1, &buf2, &buf3);\n")
% CoreProfile() % CoreProfile()
% Check("buf1", "\"" + QByteArray(1, 0xee) + "\"", "@QByteArray") % Check("buf1", "\"" + QByteArray(1, (char)0xee) + "\"", "@QByteArray")
% Check("buf2", "\"" + QByteArray(1, 0xee) + "\"", "@QByteArray") % Check("buf2", "\"" + QByteArray(1, (char)0xee) + "\"", "@QByteArray")
% Check("buf3", "\"\ee\"", "@QByteArray") % Check("buf3", "\"\\ee\"", "@QByteArray")
% CheckType("str1", "char *"); % CheckType("str1", "char *");
QTest::newRow("QByteArray4") QTest::newRow("QByteArray4")
@@ -928,7 +928,7 @@ void tst_Dumpers::dumper_data()
"QFileInfo fi(\"C:\\Program Files\\tt\");\n" "QFileInfo fi(\"C:\\Program Files\\tt\");\n"
"QString s = fi.absoluteFilePath();\n") "QString s = fi.absoluteFilePath();\n")
% Check("fi", "\"C:/Program Files/tt\"", "QFileInfo") % 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"); % Check("s", "\"C:/Program Files/tt\"", "QString");
#else #else
<< Data("#include <QFile>\n" << Data("#include <QFile>\n"
@@ -2806,7 +2806,7 @@ void tst_Dumpers::dumper_data()
% Check("l.0", "[0]", "\" big, \"", "@QString") % Check("l.0", "[0]", "\" big, \"", "@QString")
% Check("l.1", "[1]", "\" World \"", "@QString"); % Check("l.1", "[1]", "\" World \"", "@QString");
QChar oUmlaut = QLatin1Char(0xf6); QChar oUmlaut = QLatin1Char((char)0xf6);
QTest::newRow("String") QTest::newRow("String")
<< Data("#include <QString>", << Data("#include <QString>",
"const wchar_t *w = L\"aöa\";\n" "const wchar_t *w = L\"aöa\";\n"

4
tests/manual/debugger/gui/mainwindow.cpp
View File

@@ -62,7 +62,7 @@ struct TestClass {
TestClass::TestClass() : TestClass::TestClass() :
m_i(1), 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; qint64 i64 = 54354;
quint64 iu64 = 54354; quint64 iu64 = 54354;
float r = M_PI; float r = (float)M_PI;
double d = M_PI; double d = M_PI;
QString x = "Hallo "; QString x = "Hallo ";

12
tests/manual/debugger/simple/simple_test_app.cpp
View File

@@ -3042,12 +3042,12 @@ namespace stdset {
{ {
typedef std::set<int> Set; typedef std::set<int> Set;
Set set; Set set;
set.insert(11.0); set.insert(11);
set.insert(22.0); set.insert(22);
set.insert(33.0); set.insert(33);
set.insert(44.0); set.insert(44);
set.insert(55.0); set.insert(55);
set.insert(66.0); set.insert(66);
Set::iterator it1 = set.begin(); Set::iterator it1 = set.begin();
Set::iterator it2 = it1; ++it2; Set::iterator it2 = it1; ++it2;

1
tests/manual/debugger/simple/simple_test_app.pro
View File

@@ -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/boost/optional.hpp): DEFINES += USE_BOOST
exists(/usr/include/eigen2/Eigen/Core): DEFINES += USE_EIGEN exists(/usr/include/eigen2/Eigen/Core): DEFINES += USE_EIGEN
win32-msvc*:DEFINES += _CRT_SECURE_NO_WARNINGS
# Use for semi-automated testing # Use for semi-automated testing
#DEFINES += USE_AUTORUN=1 #DEFINES += USE_AUTORUN=1

4
tests/manual/preprocessor/main.cpp
View File

@@ -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(); todo.removeFirst();
if (todo.isEmpty()) if (todo.isEmpty())