diff options
44 files changed, 283 insertions, 212 deletions
diff --git a/src/gui/dialogs/qfiledialog_win.cpp b/src/gui/dialogs/qfiledialog_win.cpp index 02469b2..5fd341a 100644 --- a/src/gui/dialogs/qfiledialog_win.cpp +++ b/src/gui/dialogs/qfiledialog_win.cpp @@ -175,15 +175,22 @@ static QStringList qt_win_make_filters_list(const QString &filter) } // Makes a NUL-oriented Windows filter from a Qt filter. -static QString qt_win_filter(const QString &filter) +static QString qt_win_filter(const QString &filter, bool hideFiltersDetails) { QStringList filterLst = qt_win_make_filters_list(filter); QStringList::Iterator it = filterLst.begin(); QString winfilters; + QRegExp r(QString::fromLatin1(qt_file_dialog_filter_reg_exp)); for (; it != filterLst.end(); ++it) { QString subfilter = *it; if (!subfilter.isEmpty()) { - winfilters += subfilter; + if (hideFiltersDetails) { + int index = r.indexIn(subfilter); + if (index >= 0) + winfilters += r.cap(1); + } else { + winfilters += subfilter; + } winfilters += QChar(); winfilters += qt_win_extract_filter(subfilter); winfilters += QChar(); @@ -297,9 +304,10 @@ QString qt_win_get_open_file_name(const QFileDialogArgs &args, modal_widget.setParent(args.parent, Qt::Window); QApplicationPrivate::enterModal(&modal_widget); + bool hideFiltersDetails = args.options & QFileDialog::HideNameFilterDetails; OPENFILENAME* ofn = qt_win_make_OFN(args.parent, args.selection, args.directory, args.caption, - qt_win_filter(args.filter), + qt_win_filter(args.filter, hideFiltersDetails), QFileDialog::ExistingFile, args.options); if (idx) @@ -356,7 +364,7 @@ QString qt_win_get_save_file_name(const QFileDialogArgs &args, modal_widget.setAttribute(Qt::WA_NoChildEventsForParent, true); modal_widget.setParent(args.parent, Qt::Window); QApplicationPrivate::enterModal(&modal_widget); - + bool hideFiltersDetails = args.options & QFileDialog::HideNameFilterDetails; // This block is used below for the lpstrDefExt member. // Note that the current MSDN docs document this member wrong. // It should rather be documented as "the default extension if no extension was given and if the @@ -376,7 +384,7 @@ QString qt_win_get_save_file_name(const QFileDialogArgs &args, OPENFILENAME *ofn = qt_win_make_OFN(args.parent, args.selection, args.directory, args.caption, - qt_win_filter(args.filter), + qt_win_filter(args.filter, hideFiltersDetails), QFileDialog::AnyFile, args.options); @@ -642,9 +650,10 @@ QStringList qt_win_get_open_file_names(const QFileDialogArgs &args, modal_widget.setParent(args.parent, Qt::Window); QApplicationPrivate::enterModal(&modal_widget); + bool hideFiltersDetails = args.options & QFileDialog::HideNameFilterDetails; OPENFILENAME* ofn = qt_win_make_OFN(args.parent, args.selection, args.directory, args.caption, - qt_win_filter(args.filter), + qt_win_filter(args.filter, hideFiltersDetails), QFileDialog::ExistingFiles, args.options); if (idx) diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 94569ec..ed2b3c5 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -2676,6 +2676,7 @@ void QAbstractItemView::keyboardSearch(const QString &search) QModelIndex current = start; QModelIndexList match; QModelIndex firstMatch; + QModelIndex startMatch; QModelIndexList previous; do { match = d->model->match(current, Qt::DisplayRole, searchString); @@ -2692,6 +2693,12 @@ void QAbstractItemView::keyboardSearch(const QString &search) if (row >= d->model->rowCount(firstMatch.parent())) row = 0; current = firstMatch.sibling(row, firstMatch.column()); + + //avoid infinite loop if all the matching items are disabled. + if (!startMatch.isValid()) + startMatch = firstMatch; + else if (startMatch == firstMatch) + break; } } while (current != start && firstMatch.isValid()); } diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 78df09d..6851e25 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3176,6 +3176,12 @@ void QWidgetPrivate::show_sys() #ifndef QT_MAC_USE_COCOA SizeWindow(window, q->width(), q->height(), true); #endif + +#ifdef QT_MAC_USE_COCOA + // Make sure that we end up sending a repaint event to + // the widget if the window has been visible one before: + [qt_mac_get_contentview_for(window) setNeedsDisplay:YES]; +#endif if(qt_mac_is_macsheet(q)) { qt_event_request_showsheet(q); } else if(qt_mac_is_macdrawer(q)) { diff --git a/src/network/access/qhttpnetworkheader.cpp b/src/network/access/qhttpnetworkheader.cpp index 5af9764..88cc484 100644 --- a/src/network/access/qhttpnetworkheader.cpp +++ b/src/network/access/qhttpnetworkheader.cpp @@ -41,6 +41,7 @@ #include "qhttpnetworkheader_p.h" +#ifndef QT_NO_HTTP QT_BEGIN_NAMESPACE @@ -121,3 +122,5 @@ bool QHttpNetworkHeaderPrivate::operator==(const QHttpNetworkHeaderPrivate &othe QT_END_NAMESPACE + +#endif diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index fe49799..819aeb5 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -52,6 +52,7 @@ // // We mean it. // +#include <qplatformdefs.h> #ifndef QT_NO_HTTP #ifndef QT_NO_COMPRESS diff --git a/src/network/access/qhttpnetworkrequest.cpp b/src/network/access/qhttpnetworkrequest.cpp index 0f330af..b1db0b7 100644 --- a/src/network/access/qhttpnetworkrequest.cpp +++ b/src/network/access/qhttpnetworkrequest.cpp @@ -42,6 +42,8 @@ #include "qhttpnetworkrequest_p.h" #include "private/qnoncontiguousbytedevice_p.h" +#ifndef QT_NO_HTTP + QT_BEGIN_NAMESPACE QHttpNetworkRequestPrivate::QHttpNetworkRequestPrivate(QHttpNetworkRequest::Operation op, @@ -260,3 +262,5 @@ int QHttpNetworkRequest::minorVersion() const QT_END_NAMESPACE +#endif + diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp index dba4e88..9b5c33f 100644 --- a/src/qt3support/network/q3http.cpp +++ b/src/qt3support/network/q3http.cpp @@ -42,7 +42,7 @@ #include <qplatformdefs.h> #include "q3http.h" -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef QT_NO_HTTP #include "q3socket.h" #include "qtextstream.h" diff --git a/src/qt3support/network/q3http.h b/src/qt3support/network/q3http.h index 93ab00e..5311764 100644 --- a/src/qt3support/network/q3http.h +++ b/src/qt3support/network/q3http.h @@ -52,8 +52,7 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_MODULE(Qt3Support) - -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef QT_NO_HTTP class Q3Socket; class QTimerEvent; @@ -269,7 +268,7 @@ private: friend class Q3HttpPGHRequest; }; -#endif // QT_NO_NETWORKPROTOCOL_HTTP +#endif // QT_NO_HTTP QT_END_NAMESPACE diff --git a/src/qt3support/network/q3network.cpp b/src/qt3support/network/q3network.cpp index 3a6a6f0..1f918d1 100644 --- a/src/qt3support/network/q3network.cpp +++ b/src/qt3support/network/q3network.cpp @@ -63,7 +63,7 @@ void q3InitNetworkProtocols() #ifndef QT_NO_NETWORKPROTOCOL_FTP Q3NetworkProtocol::registerNetworkProtocol( QLatin1String("ftp"), new Q3NetworkProtocolFactory< Q3Ftp > ); #endif -#ifndef QT_NO_NETWORKPROTOCOL_HTTP +#ifndef QT_NO_HTTP Q3NetworkProtocol::registerNetworkProtocol( QLatin1String("http"), new Q3NetworkProtocolFactory< Q3Http > ); #endif } diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 3d7abdc..d3e295b 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -4,7 +4,7 @@ TEMPLATE = subdirs !wince*:SUBDIRS += \ headers -SUBDIRS += _networkselftest \ +SUBDIRS += \ bic \ collections \ compile \ @@ -17,6 +17,7 @@ SUBDIRS += _networkselftest \ # mediaobject_wince_ds9 \ This is Windows CE only (we test the second phonon backend ds9 here) moc \ modeltest \ + networkselftest \ q3accel \ q3action \ q3actiongroup \ @@ -238,8 +239,8 @@ SUBDIRS += _networkselftest \ qpixmapfilter \ qplaintextedit \ qpoint \ - qpointarray \ qpointer \ + qpolygon \ qprinter \ qprinterinfo \ qprocess \ @@ -263,9 +264,9 @@ SUBDIRS += _networkselftest \ qscriptcontextinfo \ qscriptengine \ qscriptengineagent \ + qscriptextqobject \ qscriptjstestsuite \ qscriptv8testsuite \ - qscriptqobject \ qscriptstring \ qscriptvalue \ qscriptvalueiterator \ diff --git a/tests/auto/macgui/macgui.pro b/tests/auto/macgui/macgui.pro index dc64627..0ed2350 100644 --- a/tests/auto/macgui/macgui.pro +++ b/tests/auto/macgui/macgui.pro @@ -4,12 +4,8 @@ DEPENDPATH += . INCLUDEPATH += . # Input -SOURCES += tst_gui.cpp - -mac { - SOURCES += guitest.cpp - HEADERS += guitest.h -} - +SOURCES += tst_macgui.cpp guitest.cpp +HEADERS += guitest.h +requires(mac) diff --git a/tests/auto/macgui/tst_gui.cpp b/tests/auto/macgui/tst_macgui.cpp index 635023a..627dc82 100644 --- a/tests/auto/macgui/tst_gui.cpp +++ b/tests/auto/macgui/tst_macgui.cpp @@ -52,7 +52,7 @@ #ifdef Q_OS_MAC -class tst_gui : public GuiTester +class tst_MacGui : public GuiTester { Q_OBJECT private slots: @@ -76,7 +76,7 @@ QPixmap grabWindowContents(QWidget * widget) Test that vertical and horizontal mac-style scrollbars paint their entire area. */ -void tst_gui::scrollbarPainting() +void tst_MacGui::scrollbarPainting() { ColorWidget colorWidget; colorWidget.resize(400, 400); @@ -108,7 +108,7 @@ void tst_gui::scrollbarPainting() // When running the auto-tests on scruffy, the first enter-the-event-loop-and-wait-for-a-click // test that runs always times out, so we have this dummy test. -void tst_gui::dummy() +void tst_MacGui::dummy() { QPixmap pix(100, 100); QSplashScreen splash(pix); @@ -133,7 +133,7 @@ void tst_gui::dummy() /* Test that a message box pops up in front of a QSplashScreen. */ -void tst_gui::splashScreenModality() +void tst_MacGui::splashScreenModality() { QPixmap pix(300, 300); QSplashScreen splash(pix); @@ -162,7 +162,7 @@ void tst_gui::splashScreenModality() Test that a non-modal dialog created as a child of a modal dialog is shown in front. */ -void tst_gui::dialogModality() +void tst_MacGui::dialogModality() { QDialog d; d.setModal(true); @@ -222,7 +222,7 @@ void PrimaryWindowDialog::test() of the dialog even if the dialog becomes modal after the child window is created. */ -void tst_gui::nonModalOrder() +void tst_MacGui::nonModalOrder() { clearSequence(); PrimaryWindowDialog primary; @@ -235,7 +235,7 @@ void tst_gui::nonModalOrder() /* Test that the QSpinBox buttons are correctly positioned with the Mac style. */ -void tst_gui::spinBoxArrowButtons() +void tst_MacGui::spinBoxArrowButtons() { ColorWidget colorWidget; colorWidget.resize(200, 200); @@ -266,7 +266,7 @@ void tst_gui::spinBoxArrowButtons() QVERIFY(noFocus.copy(compareRect) == focus.copy(compareRect)); } -QTEST_MAIN(tst_gui) +QTEST_MAIN(tst_MacGui) #else @@ -274,4 +274,5 @@ QTEST_NOOP_MAIN #endif -#include "tst_gui.moc" +#include "tst_macgui.moc" + diff --git a/tests/auto/_networkselftest/_networkselftest.pro b/tests/auto/networkselftest/networkselftest.pro index 9e2ad0e..9e2ad0e 100644 --- a/tests/auto/_networkselftest/_networkselftest.pro +++ b/tests/auto/networkselftest/networkselftest.pro diff --git a/tests/auto/_networkselftest/tst_networkselftest.cpp b/tests/auto/networkselftest/tst_networkselftest.cpp index cb82733..cb82733 100644 --- a/tests/auto/_networkselftest/tst_networkselftest.cpp +++ b/tests/auto/networkselftest/tst_networkselftest.cpp diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro index b6829dc..b32a7e5 100644 --- a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro +++ b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro @@ -4,21 +4,20 @@ TARGET = tst_qaccessibility_mac RESOURCES = qaccessibility_mac.qrc -mac { +requires(mac) + # this setup should support both building as an autotest # (where uilib isn't built by default), and when running shadow # builds (where QTDIR points to the build directory). # autotest + shadow build is not supported :) - exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) { - include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) - INCLUDEPATH += $$(QTDIR)/tools/designer/src/uitools - SOURCES += $$(QTDIR)/tools/designer/src/uitools/quiloader.cpp - HEADERS += $$(QTDIR)/tools/designer/src/uitools/quiloader.h - } else { - CONFIG += uitools - } - QT += xml - LIBS += -framework ApplicationServices -framework Carbon +exists($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) { + include($$(QTDIR)/tools/designer/src/lib/uilib/uilib.pri) + INCLUDEPATH += $$(QTDIR)/tools/designer/src/uitools + SOURCES += $$(QTDIR)/tools/designer/src/uitools/quiloader.cpp + HEADERS += $$(QTDIR)/tools/designer/src/uitools/quiloader.h +} else { + CONFIG += uitools } - +QT += xml +LIBS += -framework ApplicationServices -framework Carbon diff --git a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp index deb6c8d..b32aa0e 100644 --- a/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp +++ b/tests/auto/qaccessibility_mac/tst_qaccessibility_mac.cpp @@ -73,7 +73,7 @@ Q_DECLARE_METATYPE(AXUIElementRef); typedef QCFType<CFArrayRef> QCFArrayRef; -class tst_accessibility_mac : public QObject +class tst_qaccessibility_mac : public QObject { Q_OBJECT public slots: @@ -665,7 +665,7 @@ void testAppAndForm(AXUIElementRef application) VERIFY_ELEMENT(form, application, "AXWindow"); } -void tst_accessibility_mac::printInfo() +void tst_qaccessibility_mac::printInfo() { AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); printElementInfo(currentApplication); @@ -674,7 +674,7 @@ void tst_accessibility_mac::printInfo() /* Tests for form.ui */ -void tst_accessibility_mac::testForm() +void tst_qaccessibility_mac::testForm() { // Get reference to the current application. AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); @@ -685,7 +685,7 @@ void tst_accessibility_mac::testForm() /* Tests for buttons.ui */ -void tst_accessibility_mac::testButtons() +void tst_qaccessibility_mac::testButtons() { // Get reference to the current application. AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); @@ -714,7 +714,7 @@ void tst_accessibility_mac::testButtons() VERIFY_ROLE_DESCRIPTION(brain, "button"); } -void tst_accessibility_mac::testLabel() +void tst_qaccessibility_mac::testLabel() { // Get reference to the current application. AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); @@ -731,7 +731,7 @@ void tst_accessibility_mac::testLabel() /* Tests for lineedit.ui */ -void tst_accessibility_mac::testLineEdit() +void tst_qaccessibility_mac::testLineEdit() { // Get reference to the current application. AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); @@ -746,7 +746,7 @@ void tst_accessibility_mac::testLineEdit() /* Tests for groups.ui */ -void tst_accessibility_mac::testGroups() +void tst_qaccessibility_mac::testGroups() { // Get reference to the current application. AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); @@ -769,7 +769,7 @@ void tst_accessibility_mac::testGroups() /* Tests for tabs.ui */ -void tst_accessibility_mac::testTabWidget() +void tst_qaccessibility_mac::testTabWidget() { { // Test that the QTabWidget hierarchy is what we expect it to be. QTabWidget tabWidget; @@ -878,7 +878,7 @@ void tst_accessibility_mac::testTabWidget() } } -void tst_accessibility_mac::testTabBar() +void tst_qaccessibility_mac::testTabBar() { QTabBar tabBar; tabBar.addTab("Tab A"); @@ -929,7 +929,7 @@ void tst_accessibility_mac::testTabBar() } } -void tst_accessibility_mac::testComboBox() +void tst_qaccessibility_mac::testComboBox() { // Get reference to the current application. AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); @@ -945,7 +945,7 @@ void tst_accessibility_mac::testComboBox() QVERIFY(performAction(comboBox, "AXPress")); } -void tst_accessibility_mac::testDeleteWidget() +void tst_qaccessibility_mac::testDeleteWidget() { const QString buttonTitle = "Hi there"; QWidget *form = new QWidget(0, Qt::Window); @@ -969,7 +969,7 @@ void tst_accessibility_mac::testDeleteWidget() delete form; } -void tst_accessibility_mac::testDeleteWidgets() +void tst_qaccessibility_mac::testDeleteWidgets() { const QString buttonTitle = "Hi there"; const int repeats = 10; @@ -1052,7 +1052,7 @@ void tst_accessibility_mac::testDeleteWidgets() } -void tst_accessibility_mac::testMultipleWindows() +void tst_qaccessibility_mac::testMultipleWindows() { const QString formATitle("FormA"); const QString formBTitle("FormB"); @@ -1082,7 +1082,7 @@ void tst_accessibility_mac::testMultipleWindows() delete formA; } -void tst_accessibility_mac::testHiddenWidgets() +void tst_qaccessibility_mac::testHiddenWidgets() { const QString windowTitle ="a widget"; QWidget * const window = new QWidget(0); @@ -1113,7 +1113,7 @@ void tst_accessibility_mac::testHiddenWidgets() delete window; }; -void tst_accessibility_mac::testActions() +void tst_qaccessibility_mac::testActions() { // create a window with a push button const QString windowTitle ="a widget"; @@ -1150,7 +1150,7 @@ void tst_accessibility_mac::testActions() delete window; }; -void tst_accessibility_mac::testChangeState() +void tst_qaccessibility_mac::testChangeState() { const QString windowTitle ="a widget"; QWidget * const window = new QWidget(); @@ -1220,7 +1220,7 @@ void tst_accessibility_mac::testChangeState() delete window; } -void tst_accessibility_mac::testSlider() +void tst_qaccessibility_mac::testSlider() { const QString windowTitle = "a widget"; QWidget * const window = new QWidget(); @@ -1246,7 +1246,7 @@ void tst_accessibility_mac::testSlider() delete slider; } -void tst_accessibility_mac::testScrollArea() +void tst_qaccessibility_mac::testScrollArea() { QWidget window; const QString windowTitle = "window"; @@ -1373,7 +1373,7 @@ void tst_accessibility_mac::testScrollArea() } } -void tst_accessibility_mac::testListView() +void tst_qaccessibility_mac::testListView() { QWidget window; const QString windowTitle("window"); @@ -1457,7 +1457,7 @@ void tst_accessibility_mac::testListView() QVERIFY(contains(listElement, C)); } -void tst_accessibility_mac::testTableView() +void tst_qaccessibility_mac::testTableView() { QWidget window; const QString windowTitle("window"); @@ -1653,7 +1653,7 @@ void tst_accessibility_mac::testTableView() // QTest::qWait(1000000); } -void tst_accessibility_mac::testScrollBar() +void tst_qaccessibility_mac::testScrollBar() { { QScrollBar scrollBar; @@ -1699,7 +1699,7 @@ void tst_accessibility_mac::testScrollBar() } } -void tst_accessibility_mac::testSplitter() +void tst_qaccessibility_mac::testSplitter() { const AXUIElementRef currentApplication = AXUIElementCreateApplication(getpid()); testAppAndForm(currentApplication); @@ -1736,7 +1736,7 @@ void tst_accessibility_mac::testSplitter() } } -void tst_accessibility_mac::testTextEdit() +void tst_qaccessibility_mac::testTextEdit() { QWidget window; const QString windowTitle("window"); @@ -1802,13 +1802,13 @@ void testModelLessItemView(QAbstractItemView *itemView, const QByteArray &role) delete itemView; } -void tst_accessibility_mac::testItemViewsWithoutModel() +void tst_qaccessibility_mac::testItemViewsWithoutModel() { testModelLessItemView(new QListView(), "AXList"); testModelLessItemView(new QTableView(), "AXTable"); } -void tst_accessibility_mac::testQAElement() +void tst_qaccessibility_mac::testQAElement() { { QAElement element; @@ -1831,7 +1831,7 @@ void tst_accessibility_mac::testQAElement() } -void tst_accessibility_mac::testQAInterface() +void tst_qaccessibility_mac::testQAInterface() { { QAInterface interface; @@ -1861,7 +1861,7 @@ void tst_accessibility_mac::testQAInterface() } } -void tst_accessibility_mac::uitests_data() +void tst_qaccessibility_mac::uitests_data() { QTest::addColumn<QString>("uiFilename"); QTest::addColumn<QString>("testSlot"); @@ -1877,7 +1877,7 @@ void tst_accessibility_mac::uitests_data() QTest::newRow("splitters") << "splitters.ui" << SLOT(testSplitter()); } -void tst_accessibility_mac::uitests() +void tst_qaccessibility_mac::uitests() { QFETCH(QString, uiFilename); QFETCH(QString, testSlot); @@ -1907,7 +1907,7 @@ void tst_accessibility_mac::uitests() delete window; } -void tst_accessibility_mac::tests_data() +void tst_qaccessibility_mac::tests_data() { QTest::addColumn<QString>("testSlot"); QTest::newRow("deleteWidget") << SLOT(testDeleteWidget()); @@ -1925,7 +1925,7 @@ void tst_accessibility_mac::tests_data() QTest::newRow("tabbar") << SLOT(testTabBar()); } -void tst_accessibility_mac::tests() +void tst_qaccessibility_mac::tests() { QFETCH(QString, testSlot); runTest(testSlot); @@ -1936,7 +1936,7 @@ void tst_accessibility_mac::tests() kAXErrorAPIDisabled error, indicating that the accessible API is disabled, which it isn't.) To work around this, we run the tests in a callback slot called from the main event loop. */ -void tst_accessibility_mac::runTest(const QString &testSlot) +void tst_qaccessibility_mac::runTest(const QString &testSlot) { // The Accessibility interface must be enabled to run this test. if (!AXAPIEnabled()) @@ -1953,7 +1953,7 @@ void tst_accessibility_mac::runTest(const QString &testSlot) } -QTEST_APPLESS_MAIN(tst_accessibility_mac) +QTEST_APPLESS_MAIN(tst_qaccessibility_mac) #else // defined(Q_WS_MAC) && !defined (QT_MAC_USE_COCOA) diff --git a/tests/auto/qcopchannel/qcopchannel.pro b/tests/auto/qcopchannel/qcopchannel.pro index 29f7834..427430f 100644 --- a/tests/auto/qcopchannel/qcopchannel.pro +++ b/tests/auto/qcopchannel/qcopchannel.pro @@ -3,4 +3,5 @@ SUBDIRS = testSend SUBDIRS += test +requires(embedded) diff --git a/tests/auto/qcopchannel/test/test.pro b/tests/auto/qcopchannel/test/test.pro index 48a218e..8c7cc5b 100644 --- a/tests/auto/qcopchannel/test/test.pro +++ b/tests/auto/qcopchannel/test/test.pro @@ -3,12 +3,4 @@ load(qttest_p4) SOURCES += ../tst_qcopchannel.cpp TARGET = ../tst_qcopchannel -win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qcopchannel -} else { - TARGET = ../../release/tst_qcopchannel - } -} - diff --git a/tests/auto/qcopchannel/testSend/testSend.pro b/tests/auto/qcopchannel/testSend/testSend.pro index f78341c..ebce3dd 100644 --- a/tests/auto/qcopchannel/testSend/testSend.pro +++ b/tests/auto/qcopchannel/testSend/testSend.pro @@ -2,4 +2,5 @@ load(qttest_p4) SOURCES = main.cpp TARGET = testSend +requires(embedded) diff --git a/tests/auto/qcssparser/qcssparser.pro b/tests/auto/qcssparser/qcssparser.pro index 723e4d3..fb1f17e 100644 --- a/tests/auto/qcssparser/qcssparser.pro +++ b/tests/auto/qcssparser/qcssparser.pro @@ -1,5 +1,5 @@ load(qttest_p4) -SOURCES += tst_cssparser.cpp +SOURCES += tst_qcssparser.cpp DEFINES += SRCDIR=\\\"$$PWD\\\" QT += xml diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp index cd2c0f4..c3bcdf2 100644 --- a/tests/auto/qcssparser/tst_cssparser.cpp +++ b/tests/auto/qcssparser/tst_qcssparser.cpp @@ -46,7 +46,7 @@ #include "private/qcssparser_p.h" -class tst_CssParser : public QObject +class tst_QCssParser : public QObject { Q_OBJECT private slots: @@ -93,7 +93,7 @@ private slots: void quotedAndUnquotedIdentifiers(); }; -void tst_CssParser::scanner_data() +void tst_QCssParser::scanner_data() { QTest::addColumn<QString>("input"); QTest::addColumn<QString>("output"); @@ -166,7 +166,7 @@ static void debug(const QVector<QCss::Symbol> &symbols, int index = -1) //static void debug(const QCss::Parser &p) { debug(p.symbols); } -void tst_CssParser::scanner() +void tst_QCssParser::scanner() { QFETCH(QString, input); QFETCH(QString, output); @@ -215,7 +215,7 @@ void tst_CssParser::scanner() Q_DECLARE_METATYPE(QCss::Value) -void tst_CssParser::term_data() +void tst_QCssParser::term_data() { QTest::addColumn<bool>("parseSuccess"); QTest::addColumn<QString>("css"); @@ -330,7 +330,7 @@ void tst_CssParser::term_data() QTest::newRow("ItaLIc") << true << "ItaLIc" << val; } -void tst_CssParser::term() +void tst_QCssParser::term() { QFETCH(bool, parseSuccess); QFETCH(QString, css); @@ -351,7 +351,7 @@ void tst_CssParser::term() Q_DECLARE_METATYPE(QVector<QCss::Value>) -void tst_CssParser::expr_data() +void tst_QCssParser::expr_data() { QTest::addColumn<bool>("parseSuccess"); QTest::addColumn<QString>("css"); @@ -376,7 +376,7 @@ void tst_CssParser::expr_data() values.clear(); } -void tst_CssParser::expr() +void tst_QCssParser::expr() { QFETCH(bool, parseSuccess); QFETCH(QString, css); @@ -396,7 +396,7 @@ void tst_CssParser::expr() } } -void tst_CssParser::import() +void tst_QCssParser::import() { QCss::Parser parser("@import \"plainstring\";"); QVERIFY(parser.testImport()); @@ -413,7 +413,7 @@ void tst_CssParser::import() QCOMPARE(rule.media.at(1), QString("screen")); } -void tst_CssParser::media() +void tst_QCssParser::media() { QCss::Parser parser("@media print/*comment*/,screen /*comment to ignore*/{ }"); QVERIFY(parser.testMedia()); @@ -425,7 +425,7 @@ void tst_CssParser::media() QVERIFY(rule.styleRules.isEmpty()); } -void tst_CssParser::page() +void tst_QCssParser::page() { QCss::Parser parser("@page :first/*comment to ignore*/{ }"); QVERIFY(parser.testPage()); @@ -435,7 +435,7 @@ void tst_CssParser::page() QVERIFY(rule.declarations.isEmpty()); } -void tst_CssParser::ruleset() +void tst_QCssParser::ruleset() { { QCss::Parser parser("p/*foo*/{ }"); @@ -483,7 +483,7 @@ void tst_CssParser::ruleset() Q_DECLARE_METATYPE(QCss::Selector) -void tst_CssParser::selector_data() +void tst_QCssParser::selector_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QCss::Selector>("expectedSelector"); @@ -685,7 +685,7 @@ void tst_CssParser::selector_data() } } -void tst_CssParser::selector() +void tst_QCssParser::selector() { QFETCH(QString, css); QFETCH(QCss::Selector, expectedSelector); @@ -717,7 +717,7 @@ void tst_CssParser::selector() } } -void tst_CssParser::prio() +void tst_QCssParser::prio() { { QCss::Parser parser("!important"); @@ -739,14 +739,14 @@ void tst_CssParser::prio() } } -void tst_CssParser::escapes() +void tst_QCssParser::escapes() { QCss::Parser parser("\\hello"); parser.test(QCss::IDENT); QCOMPARE(parser.lexem(), QString("hello")); } -void tst_CssParser::malformedDeclarations_data() +void tst_QCssParser::malformedDeclarations_data() { QTest::addColumn<QString>("css"); @@ -759,7 +759,7 @@ void tst_CssParser::malformedDeclarations_data() QTest::newRow("7") << QString("p { color:red; color{;color:maroon}; color:green } /* same with recovery */"); } -void tst_CssParser::malformedDeclarations() +void tst_QCssParser::malformedDeclarations() { QFETCH(QString, css); QCss::Parser parser(css); @@ -778,7 +778,7 @@ void tst_CssParser::malformedDeclarations() QCOMPARE(rule.declarations.last().d->values.at(0).variant.toString(), QString("green")); } -void tst_CssParser::invalidAtKeywords() +void tst_QCssParser::invalidAtKeywords() { QCss::Parser parser("" "@three-dee {" @@ -810,7 +810,7 @@ void tst_CssParser::invalidAtKeywords() Q_DECLARE_METATYPE(QColor) -void tst_CssParser::colorValue_data() +void tst_QCssParser::colorValue_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QColor>("expectedColor"); @@ -831,7 +831,7 @@ void tst_CssParser::colorValue_data() QTest::newRow("transparent") << "color: transparent" << QColor(Qt::transparent); } -void tst_CssParser::colorValue() +void tst_QCssParser::colorValue() { QFETCH(QString, css); QFETCH(QColor, expectedColor); @@ -886,7 +886,7 @@ private: Q_DECLARE_METATYPE(QDomDocument); -void tst_CssParser::marginValue_data() +void tst_QCssParser::marginValue_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QString>("expectedMargin"); @@ -914,7 +914,7 @@ void tst_CssParser::marginValue_data() QTest::newRow("crap") << "margin: crap" << "0 0 0 0"; } -void tst_CssParser::marginValue() +void tst_QCssParser::marginValue() { QFETCH(QString, css); QFETCH(QString, expectedMargin); @@ -947,7 +947,7 @@ void tst_CssParser::marginValue() } } -void tst_CssParser::styleSelector_data() +void tst_QCssParser::styleSelector_data() { QTest::addColumn<bool>("match"); QTest::addColumn<QString>("selector"); @@ -1062,7 +1062,7 @@ void tst_CssParser::styleSelector_data() QTest::newRow("unknown-pseudo") << false << QString("p:enabled:foobar") << QString("<p/>") << QString(); } -void tst_CssParser::styleSelector() +void tst_QCssParser::styleSelector() { QFETCH(bool, match); QFETCH(QString, selector); @@ -1106,7 +1106,7 @@ void tst_CssParser::styleSelector() } } -void tst_CssParser::specificity_data() +void tst_QCssParser::specificity_data() { QTest::addColumn<QString>("selector"); QTest::addColumn<int>("specificity"); @@ -1129,7 +1129,7 @@ void tst_CssParser::specificity_data() QTest::newRow("id") << QString("#x34y") << 1 * 0x100; } -void tst_CssParser::specificity() +void tst_QCssParser::specificity() { QFETCH(QString, selector); @@ -1146,7 +1146,7 @@ void tst_CssParser::specificity() QTEST(rule.selectors.at(0).specificity(), "specificity"); } -void tst_CssParser::specificitySort_data() +void tst_QCssParser::specificitySort_data() { QTest::addColumn<QString>("firstSelector"); QTest::addColumn<QString>("secondSelector"); @@ -1159,7 +1159,7 @@ void tst_CssParser::specificitySort_data() QTest::newRow("class") << QString("p") << QString(".hey") << QString("<p class=\"hey\" />"); } -void tst_CssParser::specificitySort() +void tst_QCssParser::specificitySort() { QFETCH(QString, firstSelector); QFETCH(QString, secondSelector); @@ -1205,7 +1205,7 @@ void tst_CssParser::specificitySort() } } -void tst_CssParser::rulesForNode_data() +void tst_QCssParser::rulesForNode_data() { QTest::addColumn<QString>("xml"); QTest::addColumn<QString>("css"); @@ -1249,7 +1249,7 @@ void tst_CssParser::rulesForNode_data() << quint64(QCss::PseudoClass_Pressed) << 1 << "blue" << ""; } -void tst_CssParser::rulesForNode() +void tst_QCssParser::rulesForNode() { QFETCH(QString, xml); QFETCH(QString, css); @@ -1291,7 +1291,7 @@ void tst_CssParser::rulesForNode() QCOMPARE(decls.at(1).d->values.at(0).variant.toString(), value1); } -void tst_CssParser::shorthandBackgroundProperty_data() +void tst_QCssParser::shorthandBackgroundProperty_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QBrush>("expectedBrush"); @@ -1311,7 +1311,7 @@ void tst_CssParser::shorthandBackgroundProperty_data() QTest::newRow("multi3") << "background: url(blah.png) top right" << QBrush() << QString("blah.png") << int(QCss::Repeat_XY) << int(Qt::AlignTop | Qt::AlignRight); } -void tst_CssParser::shorthandBackgroundProperty() +void tst_QCssParser::shorthandBackgroundProperty() { QFETCH(QString, css); @@ -1350,7 +1350,7 @@ void tst_CssParser::shorthandBackgroundProperty() QTEST(int(alignment), "expectedAlignment"); } -void tst_CssParser::pseudoElement_data() +void tst_QCssParser::pseudoElement_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QString>("pseudoElement"); @@ -1384,7 +1384,7 @@ void tst_CssParser::pseudoElement_data() << "pe2" << 1; } -void tst_CssParser::pseudoElement() +void tst_QCssParser::pseudoElement() { QFETCH(QString, css); QFETCH(QString, pseudoElement); @@ -1413,7 +1413,7 @@ void tst_CssParser::pseudoElement() QVERIFY(decls.count() == declCount); } -void tst_CssParser::gradient_data() +void tst_QCssParser::gradient_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QString>("type"); @@ -1458,7 +1458,7 @@ void tst_CssParser::gradient_data() */ } -void tst_CssParser::gradient() +void tst_QCssParser::gradient() { QFETCH(QString, css); QFETCH(QString, type); @@ -1506,7 +1506,7 @@ void tst_CssParser::gradient() QVERIFY(g->stops().at(1).second == color1); } -void tst_CssParser::extractFontFamily_data() +void tst_QCssParser::extractFontFamily_data() { QTest::addColumn<QString>("css"); QTest::addColumn<QString>("expectedFamily"); @@ -1522,7 +1522,7 @@ void tst_CssParser::extractFontFamily_data() QTest::newRow("shorthand multiple") << "font: 12pt invalid, Times New Roman " << QString("Times New Roman"); } -void tst_CssParser::extractFontFamily() +void tst_QCssParser::extractFontFamily() { QFETCH(QString, css); css.prepend("dummy {"); @@ -1547,7 +1547,7 @@ void tst_CssParser::extractFontFamily() QTEST(info.family(), "expectedFamily"); } -void tst_CssParser::extractBorder_data() +void tst_QCssParser::extractBorder_data() { QTest::addColumn<QString>("css"); QTest::addColumn<int>("expectedTopWidth"); @@ -1575,7 +1575,7 @@ void tst_CssParser::extractBorder_data() QTest::newRow("top-width+color") << "border-top: 3px green" << 3 << (int)QCss::BorderStyle_None << QColor("green"); } -void tst_CssParser::extractBorder() +void tst_QCssParser::extractBorder() { QFETCH(QString, css); QFETCH(int, expectedTopWidth); @@ -1607,7 +1607,7 @@ void tst_CssParser::extractBorder() QVERIFY(colors[QCss::TopEdge] == expectedTopColor); } -void tst_CssParser::noTextDecoration() +void tst_QCssParser::noTextDecoration() { QCss::Parser parser("dummy { text-decoration: none; }"); QCss::StyleSheet sheet; @@ -1632,7 +1632,7 @@ void tst_CssParser::noTextDecoration() QVERIFY(!f.strikeOut()); } -void tst_CssParser::quotedAndUnquotedIdentifiers() +void tst_QCssParser::quotedAndUnquotedIdentifiers() { QCss::Parser parser("foo { font-style: \"italic\"; font-weight: bold }"); QCss::StyleSheet sheet; @@ -1653,5 +1653,6 @@ void tst_CssParser::quotedAndUnquotedIdentifiers() QCOMPARE(decls.at(1).d->values.first().toString(), QLatin1String("bold")); } -QTEST_MAIN(tst_CssParser) -#include "tst_cssparser.moc" +QTEST_MAIN(tst_QCssParser) +#include "tst_qcssparser.moc" + diff --git a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro index 65e8f13..dd8f141 100644 --- a/tests/auto/qdbuspendingcall/qdbuspendingcall.pro +++ b/tests/auto/qdbuspendingcall/qdbuspendingcall.pro @@ -1,4 +1,5 @@ load(qttest_p4) -QT = core -contains(QT_CONFIG, dbus):QT += dbus +requires(contains(QT_CONFIG, dbus)) +QT = core dbus SOURCES += tst_qdbuspendingcall.cpp + diff --git a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro b/tests/auto/qdbuspendingreply/qdbuspendingreply.pro index 94e7acf..c649e4a 100644 --- a/tests/auto/qdbuspendingreply/qdbuspendingreply.pro +++ b/tests/auto/qdbuspendingreply/qdbuspendingreply.pro @@ -1,4 +1,4 @@ load(qttest_p4) -QT = core -contains(QT_CONFIG, dbus):QT += dbus +requires(contains(QT_CONFIG, dbus)) +QT = core dbus SOURCES += tst_qdbuspendingreply.cpp diff --git a/tests/auto/qdirectpainter/qdirectpainter.pro b/tests/auto/qdirectpainter/qdirectpainter.pro index 8967194..e86b342 100644 --- a/tests/auto/qdirectpainter/qdirectpainter.pro +++ b/tests/auto/qdirectpainter/qdirectpainter.pro @@ -1,7 +1,5 @@ -load(qttest_p4) -SOURCES += tst_qdirectpainter.cpp - TEMPLATE = subdirs SUBDIRS = test runDirectPainter +requires(embedded) diff --git a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro index 9e5131c..09524e9 100644 --- a/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro +++ b/tests/auto/qdirectpainter/runDirectPainter/runDirectPainter.pro @@ -2,4 +2,5 @@ load(qttest_p4) SOURCES = main.cpp TARGET = runDirectPainter +requires(embedded) diff --git a/tests/auto/qdirectpainter/test/test.pro b/tests/auto/qdirectpainter/test/test.pro index 98c74e4..6d820b1 100644 --- a/tests/auto/qdirectpainter/test/test.pro +++ b/tests/auto/qdirectpainter/test/test.pro @@ -3,12 +3,5 @@ load(qttest_p4) SOURCES += ../tst_qdirectpainter.cpp TARGET = ../tst_qdirectpainter -win32 { - CONFIG(debug, debug|release) { - TARGET = ../../debug/tst_qdirectpainter -} else { - TARGET = ../../release/tst_qdirectpainter - } -} - +requires(embedded) diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro index 19c13b7..9a347d7 100644 --- a/tests/auto/qicoimageformat/qicoimageformat.pro +++ b/tests/auto/qicoimageformat/qicoimageformat.pro @@ -1,5 +1,5 @@ load(qttest_p4) -SOURCES+= tst_qticoimageformat.cpp +SOURCES+= tst_qicoimageformat.cpp wince*: { DEFINES += SRCDIR=\\\".\\\" diff --git a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp index fbd3821..95d2a6d 100644 --- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp +++ b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp @@ -42,13 +42,13 @@ #include <QtGui> #include <QtCore> -class tst_QtIcoImageFormat : public QObject +class tst_QIcoImageFormat : public QObject { Q_OBJECT public: - tst_QtIcoImageFormat(); - virtual ~tst_QtIcoImageFormat(); + tst_QIcoImageFormat(); + virtual ~tst_QIcoImageFormat(); public slots: @@ -78,45 +78,45 @@ private: }; -tst_QtIcoImageFormat::tst_QtIcoImageFormat() +tst_QIcoImageFormat::tst_QIcoImageFormat() { m_IconPath = QLatin1String(SRCDIR) + "/icons"; qDebug() << m_IconPath; } -tst_QtIcoImageFormat::~tst_QtIcoImageFormat() +tst_QIcoImageFormat::~tst_QIcoImageFormat() { } -void tst_QtIcoImageFormat::init() +void tst_QIcoImageFormat::init() { } -void tst_QtIcoImageFormat::cleanup() +void tst_QIcoImageFormat::cleanup() { } -void tst_QtIcoImageFormat::initTestCase() +void tst_QIcoImageFormat::initTestCase() { } -void tst_QtIcoImageFormat::cleanupTestCase() +void tst_QIcoImageFormat::cleanupTestCase() { } -void tst_QtIcoImageFormat::format() +void tst_QIcoImageFormat::format() { QImageReader reader(m_IconPath + "/valid/35FLOPPY.ICO", "ico"); QByteArray fmt = reader.format(); QCOMPARE(const_cast<const char*>(fmt.data()), "ico" ); } -void tst_QtIcoImageFormat::canRead_data() +void tst_QIcoImageFormat::canRead_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("isValid"); @@ -135,7 +135,7 @@ void tst_QtIcoImageFormat::canRead_data() QTest::newRow("PNG compression") << "valid/Qt.ico" << 1; } -void tst_QtIcoImageFormat::canRead() +void tst_QIcoImageFormat::canRead() { QFETCH(QString, fileName); QFETCH(int, isValid); @@ -157,7 +157,7 @@ public: }; -void tst_QtIcoImageFormat::SequentialFile_data() +void tst_QIcoImageFormat::SequentialFile_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("isValid"); @@ -169,7 +169,7 @@ void tst_QtIcoImageFormat::SequentialFile_data() } -void tst_QtIcoImageFormat::SequentialFile() +void tst_QIcoImageFormat::SequentialFile() { QFETCH(QString, fileName); QFETCH(int, isValid); @@ -187,7 +187,7 @@ void tst_QtIcoImageFormat::SequentialFile() } -void tst_QtIcoImageFormat::imageCount_data() +void tst_QIcoImageFormat::imageCount_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("count"); @@ -206,7 +206,7 @@ void tst_QtIcoImageFormat::imageCount_data() } -void tst_QtIcoImageFormat::imageCount() +void tst_QIcoImageFormat::imageCount() { QFETCH(QString, fileName); QFETCH(int, count); @@ -216,7 +216,7 @@ void tst_QtIcoImageFormat::imageCount() } -void tst_QtIcoImageFormat::jumpToNextImage_data() +void tst_QIcoImageFormat::jumpToNextImage_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("count"); @@ -233,7 +233,7 @@ void tst_QtIcoImageFormat::jumpToNextImage_data() QTest::newRow("PNG compression") << "valid/Qt.ico" << 4; } -void tst_QtIcoImageFormat::jumpToNextImage() +void tst_QIcoImageFormat::jumpToNextImage() { QFETCH(QString, fileName); QFETCH(int, count); @@ -247,7 +247,7 @@ void tst_QtIcoImageFormat::jumpToNextImage() QCOMPARE(count, 0); } -void tst_QtIcoImageFormat::loopCount_data() +void tst_QIcoImageFormat::loopCount_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("count"); @@ -256,7 +256,7 @@ void tst_QtIcoImageFormat::loopCount_data() QTest::newRow("invalid floppy (first 8 bytes = 0xff)") << "invalid/35floppy.ico" << 0; } -void tst_QtIcoImageFormat::loopCount() +void tst_QIcoImageFormat::loopCount() { QFETCH(QString, fileName); QFETCH(int, count); @@ -265,7 +265,7 @@ void tst_QtIcoImageFormat::loopCount() QCOMPARE(reader.loopCount(), count); } -void tst_QtIcoImageFormat::nextImageDelay_data() +void tst_QIcoImageFormat::nextImageDelay_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("count"); @@ -283,7 +283,7 @@ void tst_QtIcoImageFormat::nextImageDelay_data() QTest::newRow("PNG compression") << "valid/Qt.ico" << 4; } -void tst_QtIcoImageFormat::nextImageDelay() +void tst_QIcoImageFormat::nextImageDelay() { QFETCH(QString, fileName); QFETCH(int, count); @@ -300,7 +300,7 @@ void tst_QtIcoImageFormat::nextImageDelay() } } -void tst_QtIcoImageFormat::pngCompression_data() +void tst_QIcoImageFormat::pngCompression_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("index"); @@ -310,7 +310,7 @@ void tst_QtIcoImageFormat::pngCompression_data() QTest::newRow("PNG compression") << "valid/Qt.ico" << 4 << 256 << 256; } -void tst_QtIcoImageFormat::pngCompression() +void tst_QIcoImageFormat::pngCompression() { QFETCH(QString, fileName); QFETCH(int, index); @@ -327,5 +327,6 @@ void tst_QtIcoImageFormat::pngCompression() QCOMPARE(image.height(), height); } -QTEST_MAIN(tst_QtIcoImageFormat) -#include "tst_qticoimageformat.moc" +QTEST_MAIN(tst_QIcoImageFormat) +#include "tst_qicoimageformat.moc" + diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp index e581bd3..422c7d5 100644 --- a/tests/auto/qlistwidget/tst_qlistwidget.cpp +++ b/tests/auto/qlistwidget/tst_qlistwidget.cpp @@ -128,6 +128,8 @@ private slots: void setSortingEnabled(); void task199503_crashWhenCleared(); void task217070_scrollbarsAdjusted(); + void task258949_keypressHangup(); + protected slots: void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last) @@ -1009,7 +1011,7 @@ void tst_QListWidget::sortHiddenItems() for (int k = 0; k < tw->count(); ++k) QCOMPARE(persistent.at(k).row(), expectedRows.at(k)); - + delete tw; } @@ -1513,5 +1515,24 @@ void tst_QListWidget::task217070_scrollbarsAdjusted() } } +void tst_QListWidget::task258949_keypressHangup() +{ + QListWidget lw; + for (int y = 0; y < 5; y++) { + QListWidgetItem *lwi = new QListWidgetItem(&lw); + lwi->setText(y ? "1" : "0"); + if (y) + lwi->setFlags(Qt::ItemIsSelectable); + } + + lw.show(); + lw.setCurrentIndex(lw.model()->index(0,0)); + QCOMPARE(lw.currentIndex(), lw.model()->index(0,0)); + QTest::qWait(30); + QTest::keyPress(&lw, '1'); //this used to freeze + QTest::qWait(30); + QCOMPARE(lw.currentIndex(), lw.model()->index(0,0)); +} + QTEST_MAIN(tst_QListWidget) #include "tst_qlistwidget.moc" diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/qmultiscreen/qmultiscreen.pro index 810c05f..30666d7 100644 --- a/tests/auto/qmultiscreen/qmultiscreen.pro +++ b/tests/auto/qmultiscreen/qmultiscreen.pro @@ -1,5 +1,5 @@ load(qttest_p4) SOURCES += tst_qmultiscreen.cpp - +requires(embedded) diff --git a/tests/auto/qpointarray/.gitignore b/tests/auto/qpolygon/.gitignore index 7c9d48c..7c9d48c 100644 --- a/tests/auto/qpointarray/.gitignore +++ b/tests/auto/qpolygon/.gitignore diff --git a/tests/auto/qpointarray/qpointarray.pro b/tests/auto/qpolygon/qpolygon.pro index d864337..311958d 100644 --- a/tests/auto/qpointarray/qpointarray.pro +++ b/tests/auto/qpolygon/qpolygon.pro @@ -1,5 +1,5 @@ load(qttest_p4) -SOURCES += tst_qpointarray.cpp +SOURCES += tst_qpolygon.cpp unix:!mac:LIBS+=-lm diff --git a/tests/auto/qpointarray/tst_qpointarray.cpp b/tests/auto/qpolygon/tst_qpolygon.cpp index f46c96d..6b20dae 100644 --- a/tests/auto/qpointarray/tst_qpointarray.cpp +++ b/tests/auto/qpolygon/tst_qpolygon.cpp @@ -92,4 +92,4 @@ void tst_QPolygon::makeEllipse() } QTEST_APPLESS_MAIN(tst_QPolygon) -#include "tst_qpointarray.moc" +#include "tst_qpolygon.moc" diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro index 8f3ca5c..1d53e19 100644 --- a/tests/auto/qresourceengine/qresourceengine.pro +++ b/tests/auto/qresourceengine/qresourceengine.pro @@ -6,7 +6,7 @@ load(qttest_p4) load(resources) # Input -SOURCES += tst_resourceengine.cpp +SOURCES += tst_qresourceengine.cpp RESOURCES += testqrc/test.qrc runtime_resource.target = runtime_resource.rcc diff --git a/tests/auto/qresourceengine/tst_resourceengine.cpp b/tests/auto/qresourceengine/tst_qresourceengine.cpp index e133a72..8857dd8 100644 --- a/tests/auto/qresourceengine/tst_resourceengine.cpp +++ b/tests/auto/qresourceengine/tst_qresourceengine.cpp @@ -43,7 +43,7 @@ #include <QtTest/QtTest> #include <QtCore> -class tst_ResourceEngine: public QObject +class tst_QResourceEngine: public QObject { Q_OBJECT @@ -66,7 +66,7 @@ private: Q_DECLARE_METATYPE(QLocale) Q_DECLARE_METATYPE(qlonglong) -void tst_ResourceEngine::initTestCase() +void tst_QResourceEngine::initTestCase() { QVERIFY(QResource::registerResource("runtime_resource.rcc")); QVERIFY(QResource::registerResource("runtime_resource.rcc", "/secondary_root/")); @@ -79,7 +79,7 @@ void tst_ResourceEngine::initTestCase() } } -void tst_ResourceEngine::cleanupTestCase() +void tst_QResourceEngine::cleanupTestCase() { if (!builddir.isEmpty()) { QDir::setCurrent(builddir); @@ -90,7 +90,7 @@ void tst_ResourceEngine::cleanupTestCase() QVERIFY(QResource::unregisterResource("runtime_resource.rcc", "/secondary_root/")); } -void tst_ResourceEngine::checkStructure_data() +void tst_QResourceEngine::checkStructure_data() { QTest::addColumn<QString>("pathName"); QTest::addColumn<QString>("contents"); @@ -306,7 +306,7 @@ void tst_ResourceEngine::checkStructure_data() } } -void tst_ResourceEngine::checkStructure() +void tst_QResourceEngine::checkStructure() { QFETCH(QString, pathName); QFETCH(QString, contents); @@ -376,7 +376,7 @@ void tst_ResourceEngine::checkStructure() QLocale::setDefault(QLocale::system()); } -void tst_ResourceEngine::searchPath_data() +void tst_QResourceEngine::searchPath_data() { QTest::addColumn<QString>("searchPath"); QTest::addColumn<QString>("file"); @@ -396,7 +396,7 @@ void tst_ResourceEngine::searchPath_data() << QByteArray("path2\n"); } -void tst_ResourceEngine::searchPath() +void tst_QResourceEngine::searchPath() { QFETCH(QString, searchPath); QFETCH(QString, file); @@ -414,7 +414,7 @@ void tst_ResourceEngine::searchPath() qf.close(); } -void tst_ResourceEngine::checkUnregisterResource_data() +void tst_QResourceEngine::checkUnregisterResource_data() { QTest::addColumn<QString>("rcc_file"); QTest::addColumn<QString>("root"); @@ -426,7 +426,7 @@ void tst_ResourceEngine::checkUnregisterResource_data() << (int)QFileInfo("testqrc/currentdir.txt").size(); } -void tst_ResourceEngine::checkUnregisterResource() +void tst_QResourceEngine::checkUnregisterResource() { QFETCH(QString, rcc_file); QFETCH(QString, root); @@ -450,12 +450,13 @@ void tst_ResourceEngine::checkUnregisterResource() QCOMPARE((int)fileInfo.size(), size); } -void tst_ResourceEngine::doubleSlashInRoot() +void tst_QResourceEngine::doubleSlashInRoot() { QVERIFY(QFile::exists(":/secondary_root/runtime_resource/search_file.txt")); QVERIFY(QFile::exists("://secondary_root/runtime_resource/search_file.txt")); } -QTEST_MAIN(tst_ResourceEngine) +QTEST_MAIN(tst_QResourceEngine) + +#include "tst_qresourceengine.moc" -#include "tst_resourceengine.moc" diff --git a/tests/auto/qscriptqobject/.gitignore b/tests/auto/qscriptextqobject/.gitignore index bff799f..bff799f 100644 --- a/tests/auto/qscriptqobject/.gitignore +++ b/tests/auto/qscriptextqobject/.gitignore diff --git a/tests/auto/qscriptqobject/qscriptqobject.pro b/tests/auto/qscriptextqobject/qscriptextqobject.pro index be3a980..87ab1b7 100644 --- a/tests/auto/qscriptqobject/qscriptqobject.pro +++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro @@ -1,5 +1,5 @@ load(qttest_p4) QT = core gui script -SOURCES += tst_qscriptqobject.cpp +SOURCES += tst_qscriptextqobject.cpp diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp index ee914ab..85693dc 100644 --- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp +++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp @@ -2880,4 +2880,4 @@ void tst_QScriptExtQObject::connectToDestroyedSignal() } QTEST_MAIN(tst_QScriptExtQObject) -#include "tst_qscriptqobject.moc" +#include "tst_qscriptextqobject.moc" diff --git a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp index 0194730..92068dc 100644 --- a/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp +++ b/tests/auto/qscriptjstestsuite/tst_qscriptjstestsuite.cpp @@ -785,6 +785,8 @@ tst_Suite::tst_Suite() addFileExclusion("regress-322135-04.js", "takes forever"); addFileExclusion("ecma_3/RegExp/regress-375715-04.js", "bug"); + static const char klass[] = "tst_QScriptJsTestSuite"; + QVector<uint> *data = qt_meta_data_tst_Suite(); // content: *data << 1 // revision @@ -796,7 +798,7 @@ tst_Suite::tst_Suite() ; QVector<char> *stringdata = qt_meta_stringdata_tst_Suite(); - appendCString(stringdata, "tst_Suite"); + appendCString(stringdata, klass); appendCString(stringdata, ""); // don't execute any tests on slow machines @@ -814,11 +816,12 @@ tst_Suite::tst_Suite() // slot: signature, parameters, type, tag, flags QString data_slot = QString::fromLatin1("%0/%1_data()") .arg(testSuiteDir.dirName()).arg(ssdi.fileName()); - *data << stringdata->size() << 10 << 10 << 10 << 0x08; + static const int nullbyte = sizeof(klass); + *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08; appendCString(stringdata, data_slot.toLatin1()); QString slot = QString::fromLatin1("%0/%1()") .arg(testSuiteDir.dirName()).arg(ssdi.fileName()); - *data << stringdata->size() << 10 << 10 << 10 << 0x08; + *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08; appendCString(stringdata, slot.toLatin1()); } } diff --git a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp index 50eb19f..e022ccd 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -254,6 +254,8 @@ tst_Suite::tst_Suite() addTestExclusion("mul-exhaustive", "Demands too much memory on WinCE"); #endif + static const char klass[] = "tst_QScriptV8TestSuite"; + QVector<uint> *data = qt_meta_data_tst_Suite(); // content: *data << 1 // revision @@ -265,7 +267,7 @@ tst_Suite::tst_Suite() ; QVector<char> *stringdata = qt_meta_stringdata_tst_Suite(); - appendCString(stringdata, "tst_Suite"); + appendCString(stringdata, klass); appendCString(stringdata, ""); QFileInfoList testFileInfos; @@ -275,7 +277,8 @@ tst_Suite::tst_Suite() QString name = tfi.baseName(); // slot: signature, parameters, type, tag, flags QString slot = QString::fromLatin1("%0()").arg(name); - *data << stringdata->size() << 10 << 10 << 10 << 0x08; + static const int nullbyte = sizeof(klass); + *data << stringdata->size() << nullbyte << nullbyte << nullbyte << 0x08; appendCString(stringdata, slot.toLatin1()); testNames.append(name); } diff --git a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp index 30f97ba..13d0f34 100644 --- a/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp +++ b/tests/auto/qtextscriptengine/tst_qtextscriptengine.cpp @@ -76,13 +76,13 @@ // This test depends on the fonts in the following package being installed: // http://people.freedesktop.org/~hausmann/harfbuzz-test-fonts-0.1.tar.bz2 -class tst_QScriptEngine : public QObject +class tst_QTextScriptEngine : public QObject { Q_OBJECT public: - tst_QScriptEngine(); - virtual ~tst_QScriptEngine(); + tst_QTextScriptEngine(); + virtual ~tst_QTextScriptEngine(); public slots: @@ -104,19 +104,19 @@ private slots: void linearB(); }; -tst_QScriptEngine::tst_QScriptEngine() +tst_QTextScriptEngine::tst_QTextScriptEngine() { } -tst_QScriptEngine::~tst_QScriptEngine() +tst_QTextScriptEngine::~tst_QTextScriptEngine() { } -void tst_QScriptEngine::init() +void tst_QTextScriptEngine::init() { } -void tst_QScriptEngine::cleanup() +void tst_QTextScriptEngine::cleanup() { } @@ -172,7 +172,7 @@ static bool shaping( const QFont &f, const ShapeTable *s) } #endif -void tst_QScriptEngine::devanagari() +void tst_QTextScriptEngine::devanagari() { #if defined(Q_WS_X11) { @@ -284,7 +284,7 @@ void tst_QScriptEngine::devanagari() #endif } -void tst_QScriptEngine::bengali() +void tst_QTextScriptEngine::bengali() { #if defined(Q_WS_X11) { @@ -531,7 +531,7 @@ void tst_QScriptEngine::bengali() #endif } -void tst_QScriptEngine::gurmukhi() +void tst_QTextScriptEngine::gurmukhi() { #if defined(Q_WS_X11) { @@ -556,7 +556,7 @@ void tst_QScriptEngine::gurmukhi() #endif } -void tst_QScriptEngine::oriya() +void tst_QTextScriptEngine::oriya() { #if defined(Q_WS_X11) { @@ -596,7 +596,7 @@ void tst_QScriptEngine::oriya() } -void tst_QScriptEngine::tamil() +void tst_QTextScriptEngine::tamil() { #if defined(Q_WS_X11) { @@ -667,7 +667,7 @@ void tst_QScriptEngine::tamil() } -void tst_QScriptEngine::telugu() +void tst_QTextScriptEngine::telugu() { #if defined(Q_WS_X11) { @@ -713,7 +713,7 @@ void tst_QScriptEngine::telugu() } -void tst_QScriptEngine::kannada() +void tst_QTextScriptEngine::kannada() { #if defined(Q_WS_X11) { @@ -783,7 +783,7 @@ void tst_QScriptEngine::kannada() -void tst_QScriptEngine::malayalam() +void tst_QTextScriptEngine::malayalam() { #if defined(Q_WS_X11) { @@ -838,7 +838,7 @@ void tst_QScriptEngine::malayalam() -void tst_QScriptEngine::khmer() +void tst_QTextScriptEngine::khmer() { #if defined(Q_WS_X11) { @@ -881,7 +881,7 @@ void tst_QScriptEngine::khmer() #endif } -void tst_QScriptEngine::linearB() +void tst_QTextScriptEngine::linearB() { #if defined(Q_WS_X11) { @@ -909,5 +909,5 @@ void tst_QScriptEngine::linearB() } -QTEST_MAIN(tst_QScriptEngine) +QTEST_MAIN(tst_QTextScriptEngine) #include "tst_qtextscriptengine.moc" diff --git a/tests/auto/qwidget_window/tst_qwidget_window.cpp b/tests/auto/qwidget_window/tst_qwidget_window.cpp index f059abe..6dddfe8 100644 --- a/tests/auto/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/qwidget_window/tst_qwidget_window.cpp @@ -78,6 +78,7 @@ private slots: void tst_windowFilePath(); void tst_showWithoutActivating(); + void tst_paintEventOnSecondShow(); }; void tst_QWidget_window::initTestCase() @@ -150,7 +151,9 @@ class TestWidget : public QWidget { public: int m_first, m_next; - void reset(){ m_first = m_next = 0; } + bool paintEventReceived; + + void reset(){ m_first = m_next = 0; paintEventReceived = false; } bool event(QEvent *event) { switch (event->type()) { @@ -162,6 +165,10 @@ public: m_next = event->type(); else m_first = event->type(); + break; + case QEvent::Paint: + paintEventReceived = true; + break; default: break; } @@ -300,5 +307,20 @@ void tst_QWidget_window::tst_showWithoutActivating() #endif // Q_WS_X11 } +void tst_QWidget_window::tst_paintEventOnSecondShow() +{ + TestWidget w; + w.show(); + w.hide(); + + w.reset(); + w.show(); +#ifdef Q_WS_X11 + QTest::qWait(500); +#endif + QApplication::processEvents(); + QVERIFY(w.paintEventReceived); +} + QTEST_MAIN(tst_QWidget_window) #include "tst_qwidget_window.moc" diff --git a/tools/assistant/tools/assistant/installdialog.cpp b/tools/assistant/tools/assistant/installdialog.cpp index 5a8dfea..2574f1f 100644 --- a/tools/assistant/tools/assistant/installdialog.cpp +++ b/tools/assistant/tools/assistant/installdialog.cpp @@ -56,6 +56,7 @@ #include <QtNetwork/QHttp> QT_BEGIN_NAMESPACE +#ifndef QT_NO_HTTP #define QCH_FILENAME 92943 #define QCH_NAMESPACE 92944 @@ -335,4 +336,5 @@ void InstallDialog::browseDirectories() m_ui.pathLineEdit->setText(dir); } +#endif QT_END_NAMESPACE diff --git a/tools/assistant/tools/assistant/installdialog.h b/tools/assistant/tools/assistant/installdialog.h index 62759ec..9e18a22b9 100644 --- a/tools/assistant/tools/assistant/installdialog.h +++ b/tools/assistant/tools/assistant/installdialog.h @@ -47,6 +47,8 @@ #include <QtNetwork/QHttpResponseHeader> #include "ui_installdialog.h" +#ifndef QT_NO_HTTP + QT_BEGIN_NAMESPACE class QHttp; @@ -98,4 +100,6 @@ private: QT_END_NAMESPACE +#endif + #endif // INSTALLDIALOG_H |