Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

summary refs log tree commit diff stats

path: root/tests/auto/qregion

	Commit message (Expand)	Author	Age	Files	Lines
*	Update copyright year to 2010	Jason McDonald	2010-01-06	1	-1/+1

*	API review: Rename numRects() -> rectCount()	Marius Storm-Olsen	2009-11-09	1	-10/+10

*	Update license headers again.	Jason McDonald	2009-09-09	1	-4/+4

*	Merge branch '4.5' into 4.6	Thiago Macieira	2009-08-31	1	-13/+13
\|\
\| *	Update tech preview license header.	Jason McDonald	2009-08-31	1	-13/+13

\| *	Update license headers.	Jason McDonald	2009-08-11	1	-1/+1

* \|	make moc, qregion and qsharedpointer autotest compile with namespaces	hjk	2009-08-21	1	-1/+6

* \|	Merge commit 'qt/master'	Jason Barron	2009-08-13	1	-1/+1
\|\ \
\| * \|	Update contact URL in license headers.	Jason McDonald	2009-08-12	1	-1/+1

* \| \|	Merge commit 'qt/master-stable'	Jason Barron	2009-07-27	1	-2/+4
\|\ \ \ \| \|/ /
\| * \|	Disable private unit tests when Qt is configured without	Rohan McGovern	2009-07-09	1	-2/+4
\| \|/
* \|	Merge commit 'qt/master-stable' into 4.6-merged	Jason Barron	2009-06-30	1	-2/+2
\|\ \ \| \|/
\| *	Update license headers as requested by the marketing department.	Jason McDonald	2009-06-16	1	-2/+2

* \|	Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt	axis	2009-04-27	1	-13/+0
\|\ \ \| \|/
\| *	Remove obsolete code from autotests.	Jason McDonald	2009-04-16	1	-13/+0

\| *	Long live Qt 4.5!	Lars Knoll	2009-03-23	3	-0/+1027

*	Long live Qt for S60!	axis	2009-04-24	3	-0/+1027

pnetworkreply.pro b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
index 9593c55..0755055 100644
--- a/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro
+++ b/tests/auto/qhttpnetworkreply/qhttpnetworkreply.pro

@@ -1,4 +1,5 @@

load(qttest_p4)

SOURCES += tst_qhttpnetworkreply.cpp

+INCLUDEPATH += $$(QTDIR)/src/3rdparty/zlib

QT = core network

diff --git a/tests/auto/qstatemachine/tst_qstatemachine.cpp b/tests/auto/qstatemachine/tst_qstatemachine.cpp
index 6040abd..b39f0a1 100644
--- a/tests/auto/qstatemachine/tst_qstatemachine.cpp
+++ b/tests/auto/qstatemachine/tst_qstatemachine.cpp

@@ -413,7 +413,7 @@ void tst_QStateMachine::customGlobalErrorState()

machine.start();

QCoreApplication::processEvents();

- QCOMPARE(machine.errorState(), customErrorState);

+ QCOMPARE(machine.errorState(), static_cast<QAbstractState*>(customErrorState));

QCOMPARE(machine.configuration().count(), 1);

QVERIFY(machine.configuration().contains(initialState));

@@ -1724,18 +1724,18 @@ void tst_QStateMachine::signalTransitions()

QStateMachine machine;

QState *s0 = new QState(machine.rootState());

QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: sender cannot be null");

- QCOMPARE(s0->addTransition(0, SIGNAL(noSuchSignal()), 0), (QAbstractTransition*)0);

+ QCOMPARE(s0->addTransition(0, SIGNAL(noSuchSignal()), 0), (QSignalTransition*)0);

SignalEmitter emitter;

QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: signal cannot be null");

- QCOMPARE(s0->addTransition(&emitter, 0, 0), (QAbstractTransition*)0);

+ QCOMPARE(s0->addTransition(&emitter, 0, 0), (QSignalTransition*)0);

QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: cannot add transition to null state");

- QCOMPARE(s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), 0), (QAbstractTransition*)0);

+ QCOMPARE(s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), 0), (QSignalTransition*)0);

QFinalState *s1 = new QFinalState(machine.rootState());

QTest::ignoreMessage(QtWarningMsg, "QState::addTransition: no such signal SignalEmitter::noSuchSignal()");

- QCOMPARE(s0->addTransition(&emitter, SIGNAL(noSuchSignal()), s1), (QAbstractTransition*)0);

+ QCOMPARE(s0->addTransition(&emitter, SIGNAL(noSuchSignal()), s1), (QSignalTransition*)0);

QSignalTransition *trans = s0->addTransition(&emitter, SIGNAL(signalWithNoArg()), s1);

QVERIFY(trans != 0);

diff --git a/tests/auto/qtabbar/tst_qtabbar.cpp b/tests/auto/qtabbar/tst_qtabbar.cpp
index 29f42df..f908d3f 100644
--- a/tests/auto/qtabbar/tst_qtabbar.cpp
+++ b/tests/auto/qtabbar/tst_qtabbar.cpp

@@ -370,7 +370,7 @@ void tst_QTabBar::tabButton()

tabbar.setTabButton(0, position, button);

- QCOMPARE(tabbar.tabButton(0, position), static_cast<const QWidget *>(button));

+ QCOMPARE(tabbar.tabButton(0, position), static_cast<QWidget *>(button));

QTRY_VERIFY(!button->isHidden());

QVERIFY(tabbar.tabButton(0, otherSide) == 0);

QCOMPARE(button->parent(), static_cast<QObject *>(&tabbar));

diff --git a/tests/auto/windowsmobile/test/tst_windowsmobile.cpp b/tests/auto/windowsmobile/test/tst_windowsmobile.cpp