diff options
Diffstat (limited to 'tests/auto')
184 files changed, 1344 insertions, 629 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index 7fcbf46..a048bc7 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -5,7 +5,7 @@ TEMPLATE = subdirs !wince*:SUBDIRS += \ headers -SUBDIRS += _networkselftest \ +SUBDIRS += \ bic \ collections \ compile \ @@ -14,10 +14,11 @@ SUBDIRS += _networkselftest \ linguist \ macgui \ macplist \ - mediaobject \ -# mediaobject_wince_ds9 \ This is Windows CE only (we test the second phonon backend ds9 here) + mediaobject \ +# mediaobject_wince_ds9 \ This is Windows CE only (we test the second phonon backend ds9 here) moc \ modeltest \ + networkselftest \ q3accel \ q3action \ q3actiongroup \ @@ -106,8 +107,8 @@ SUBDIRS += _networkselftest \ qdate \ qdatetime \ qdatetimeedit \ - qdbuspendingcall \ - qdbuspendingreply \ + qdbuspendingcall \ + qdbuspendingreply \ qdebug \ qdesktopservices \ qdesktopwidget \ @@ -141,6 +142,7 @@ SUBDIRS += _networkselftest \ qgetputenv \ qgl \ qglobal \ + qgraphicsgridlayout \ qgraphicsitem \ qgraphicsitemanimation \ qgraphicslayout \ @@ -148,13 +150,14 @@ SUBDIRS += _networkselftest \ qgraphicslinearlayout \ qgraphicsobject \ qgraphicspixmapitem \ - qgraphicspolygonitem \ - qgraphicsproxywidget \ + qgraphicspolygonitem \ + qgraphicsproxywidget \ qgraphicsscene \ qgraphicssceneindex \ + qgraphicstransform \ qgraphicsview \ qgraphicswidget \ - qgridlayout \ + qgridlayout \ qgroupbox \ qguivariant \ qhash \ @@ -167,8 +170,8 @@ SUBDIRS += _networkselftest \ qhostaddress \ qhostinfo \ qhttp \ - qhttpnetworkreply \ - qhttpnetworkconnection \ + qhttpnetworkreply \ + qhttpnetworkconnection \ qicon \ qicoimageformat \ qimage \ @@ -191,7 +194,7 @@ SUBDIRS += _networkselftest \ qlibrary \ qline \ qlineedit \ - qlist \ + qlist \ q3listbox \ qlistview \ qlistwidget \ @@ -213,12 +216,12 @@ SUBDIRS += _networkselftest \ qmutex \ qmutexlocker \ qnativesocketengine \ - qnetworkcookie \ - qnetworkcookiejar \ + qnetworkcookie \ + qnetworkcookiejar \ qnetworkinterface \ qnetworkproxy \ - qnetworkrequest \ - qnetworkreply \ + qnetworkrequest \ + qnetworkreply \ qnetworkaccessmanager_and_qprogressdialog \ qnumeric \ qobject \ @@ -237,8 +240,8 @@ SUBDIRS += _networkselftest \ qpixmapfilter \ qplaintextedit \ qpoint \ - qpointarray \ qpointer \ + qpolygon \ qprinter \ qprinterinfo \ qprocess \ @@ -263,16 +266,17 @@ SUBDIRS += _networkselftest \ qscriptcontextinfo \ qscriptengine \ qscriptengineagent \ + qscriptextqobject \ qscriptjstestsuite \ qscriptv8testsuite \ - qscriptqobject \ qscriptstring \ qscriptvalue \ qscriptvalueiterator \ qscriptenginedebugger \ qscrollarea \ qsemaphore \ - qsharedpointer \ + qsharedpointer \ + qsharedpointer_and_qwidget \ qsequentialanimationgroup \ qset \ qsettings \ @@ -353,7 +357,7 @@ SUBDIRS += _networkselftest \ qtextstream \ qtexttable \ qthread \ - qthreadonce \ + qthreadonce \ qthreadstorage \ qtime \ qtimeline \ @@ -455,7 +459,7 @@ unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \ qdbusmarshall \ qdbusmetaobject \ qdbusmetatype \ - qdbusperformance \ + qdbusperformance \ qdbusreply \ qdbusthreading \ qdbusxmlparser diff --git a/tests/auto/linguist/lconvert/.gitignore b/tests/auto/linguist/lconvert/.gitignore new file mode 100644 index 0000000..042d7ac --- /dev/null +++ b/tests/auto/linguist/lconvert/.gitignore @@ -0,0 +1,2 @@ +tst_lconvert +data/plural-?.po diff --git a/tests/auto/linguist/lrelease/.gitignore b/tests/auto/linguist/lrelease/.gitignore new file mode 100644 index 0000000..cf7059c --- /dev/null +++ b/tests/auto/linguist/lrelease/.gitignore @@ -0,0 +1,2 @@ +tst_lrelease +testdata/*.qm diff --git a/tests/auto/linguist/lrelease/testdata/idbased.ts b/tests/auto/linguist/lrelease/testdata/idbased.ts new file mode 100644 index 0000000..61497de --- /dev/null +++ b/tests/auto/linguist/lrelease/testdata/idbased.ts @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!DOCTYPE TS> +<TS version="2.0"> +<context> + <name></name> + <message id="test_id"> + <source>Completely irrelevant source text</source> + <translation>This is a test string.</translation> + </message> + <message id="untranslated_id"> + <source>This has no translation.</source> + </message> + <message id="this_another_id"> + <source>Foo bar.</source> + <comment>Warn me!</comment> + </message> + <message> + <source>Drop me!</source> + </message> +</context> +</TS> diff --git a/tests/auto/linguist/lupdate/.gitignore b/tests/auto/linguist/lupdate/.gitignore new file mode 100644 index 0000000..4ba5b79 --- /dev/null +++ b/tests/auto/linguist/lupdate/.gitignore @@ -0,0 +1,4 @@ +tst_lupdate +testdata/good/*/project.ts +testdata/output_ts/toplevel/library/tools/translations/project.ts +testdata/recursivescan/*.ts diff --git a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result index 151a18e..f2d109b 100644 --- a/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result +++ b/tests/auto/linguist/lupdate/testdata/good/backslashes/project.ts.result @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <!DOCTYPE TS> -<TS version="1.1"> +<TS version="2.0"> <context> <name>QApplication</name> <message> - <location filename="../src/main.cpp" line="13"/> + <location filename="../src/main.cpp" line="10"/> <source>QT_LAYOUT_DIRECTION</source> <comment>Translate this string to the string 'LTR' in left-to-right languages or to 'RTL' in right-to-left languages (such as Hebrew and Arabic) to get proper widget layout.</comment> <translation type="unfinished"></translation> diff --git a/tests/auto/linguist/lupdate/tst_lupdate.cpp b/tests/auto/linguist/lupdate/tst_lupdate.cpp index fcf8582..97400d9 100644 --- a/tests/auto/linguist/lupdate/tst_lupdate.cpp +++ b/tests/auto/linguist/lupdate/tst_lupdate.cpp @@ -93,13 +93,24 @@ void tst_lupdate::doCompare(const QStringList &actual, const QString &expectedFn } else if (i == ei) { ei = 0; break; - } else if (err ? !QRegExp(expected.at(i)).exactMatch(actual.at(i)) : - (actual.at(i) != expected.at(i))) { - while ((ei - 1) >= i && (gi - 1) >= i && - (err ? QRegExp(expected.at(ei - 1)).exactMatch(actual.at(gi - 1)) : - (actual.at(gi - 1) == expected.at(ei - 1)))) - ei--, gi--; - break; + } else { + QString act = actual.at(i); + act.remove('\r'); + if (err ? !QRegExp(expected.at(i)).exactMatch(act) : + (act != expected.at(i))) { + bool cond = true; + while (cond) { + act = actual.at(gi - 1); + act.remove('\r'); + cond = (ei - 1) >= i && (gi - 1) >= i && + (err ? QRegExp(expected.at(ei - 1)).exactMatch(act) : + (act == expected.at(ei - 1))); + if (cond) { + ei--, gi--; + } + } + break; + } } } QByteArray diff; 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 a2e1adf..a2e1adf 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 2c57e83..2c57e83 100644 --- a/tests/auto/_networkselftest/tst_networkselftest.cpp +++ b/tests/auto/networkselftest/tst_networkselftest.cpp diff --git a/tests/auto/q3progressbar/tst_q3progressbar.cpp b/tests/auto/q3progressbar/tst_q3progressbar.cpp index 0378d15..549c8a4 100644 --- a/tests/auto/q3progressbar/tst_q3progressbar.cpp +++ b/tests/auto/q3progressbar/tst_q3progressbar.cpp @@ -102,7 +102,7 @@ void tst_Q3ProgressBar::setProgress() { MyCustomProgressBar * m_progressBar = new MyCustomProgressBar(); m_progressBar->show(); - QTest::qWait(500); + QApplication::processEvents(); //case with total steps = 0 m_progressBar->setTotalSteps(0); @@ -110,15 +110,16 @@ void tst_Q3ProgressBar::setProgress() m_progressBar->paintNumber = 0; m_progressBar->setProgress(m_progressBar->progress() + 1); QCOMPARE(oldValue + 1,m_progressBar->progress()); - QCOMPARE(m_progressBar->paintNumber,1); + QApplication::processEvents(); + QVERIFY(m_progressBar->paintNumber >= 1); //it might be more than 1 because it is animated //standard case m_progressBar->setTotalSteps(3); m_progressBar->setProgress(0); m_progressBar->paintNumber = 0; m_progressBar->setProgress(m_progressBar->progress() + 1); + QApplication::processEvents(); QCOMPARE(m_progressBar->paintNumber,1); - } QTEST_MAIN(tst_Q3ProgressBar) diff --git a/tests/auto/qaccessibility_mac/qaccessibility_mac.pro b/tests/auto/qaccessibility_mac/qaccessibility_mac.pro index b6829dc..47f72d1 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, "", true) + 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/qboxlayout/tst_qboxlayout.cpp b/tests/auto/qboxlayout/tst_qboxlayout.cpp index be6f3dd..5803985 100644 --- a/tests/auto/qboxlayout/tst_qboxlayout.cpp +++ b/tests/auto/qboxlayout/tst_qboxlayout.cpp @@ -222,6 +222,8 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing() QHBoxLayout *hbox = new QHBoxLayout(window); QPushButton *pb1 = new QPushButton(tr("The spacing between this")); QPushButton *pb2 = new QPushButton(tr("and this button should depend on the style of the parent widget"));; + pb1->setAttribute(Qt::WA_LayoutUsesWidgetRect); + pb2->setAttribute(Qt::WA_LayoutUsesWidgetRect); hbox->addWidget(pb1); hbox->addWidget(pb2); CustomLayoutStyle *style1 = new CustomLayoutStyle; @@ -238,7 +240,6 @@ void tst_QBoxLayout::setStyleShouldChangeSpacing() window->setStyle(style2); QTest::qWait(100); spacing = pb2->geometry().left() - pb1->geometry().right() - 1; - QEXPECT_FAIL("", "Fix for next minor release", Continue); QCOMPARE(spacing, 10); delete window; diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 0ed02f1..9ecfe39 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -139,6 +139,7 @@ private slots: void task190205_setModelAdjustToContents(); void task248169_popupWithMinimalSize(); void task247863_keyBoardSelection(); + void task220195_keyBoardSelection2(); void setModelColumn(); void noScrollbar_data(); void noScrollbar(); @@ -2095,7 +2096,7 @@ void tst_QComboBox::task190205_setModelAdjustToContents() #endif // box should be resized to the same size as correctBox - QCOMPARE(box.size(), correctBox.size()); + QTRY_COMPARE(box.size(), correctBox.size()); } void tst_QComboBox::task248169_popupWithMinimalSize() @@ -2141,6 +2142,40 @@ void tst_QComboBox::task247863_keyBoardSelection() QCOMPARE(spy.count(), 1); } +void tst_QComboBox::task220195_keyBoardSelection2() +{ + QComboBox combo; + combo.setEditable(false); + combo.addItem( QLatin1String("foo1")); + combo.addItem( QLatin1String("foo2")); + combo.addItem( QLatin1String("foo3")); + combo.show(); + QApplication::setActiveWindow(&combo); + QTest::qWait(100); + + combo.setCurrentIndex(-1); + QVERIFY(combo.currentText().isNull()); + + QTest::keyClick(&combo, 'f'); + QCOMPARE(combo.currentText(), QLatin1String("foo1")); + QTest::qWait(QApplication::keyboardInputInterval() + 30); + QTest::keyClick(&combo, 'f'); + QCOMPARE(combo.currentText(), QLatin1String("foo2")); + QTest::qWait(QApplication::keyboardInputInterval() + 30); + QTest::keyClick(&combo, 'f'); + QCOMPARE(combo.currentText(), QLatin1String("foo3")); + QTest::qWait(QApplication::keyboardInputInterval() + 30); + QTest::keyClick(&combo, 'f'); + QCOMPARE(combo.currentText(), QLatin1String("foo1")); + QTest::qWait(QApplication::keyboardInputInterval() + 30); + + combo.setCurrentIndex(1); + QCOMPARE(combo.currentText(), QLatin1String("foo2")); + QTest::keyClick(&combo, 'f'); + QCOMPARE(combo.currentText(), QLatin1String("foo3")); +} + + void tst_QComboBox::setModelColumn() { QStandardItemModel model(5,3); @@ -2241,5 +2276,6 @@ void tst_QComboBox::task253944_itemDelegateIsReset() QCOMPARE(static_cast<QStyledItemDelegate*>(comboBox.itemDelegate()), itemDelegate); } + QTEST_MAIN(tst_QComboBox) #include "tst_qcombobox.moc" diff --git a/tests/auto/qcompleter/tst_qcompleter.cpp b/tests/auto/qcompleter/tst_qcompleter.cpp index 8ce59a4..8d14b3b 100644 --- a/tests/auto/qcompleter/tst_qcompleter.cpp +++ b/tests/auto/qcompleter/tst_qcompleter.cpp @@ -1319,14 +1319,20 @@ void tst_QCompleter::task253125_lineEditCompletion() edit.show(); edit.setFocus(); - QTest::qWait(100); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&edit); +#endif + QTest::qWait(100); QTest::keyClick(&edit, 'i'); QCOMPARE(edit.completer()->currentCompletion(), QString("iota")); QTest::keyClick(edit.completer()->popup(), Qt::Key_Down); QTest::keyClick(edit.completer()->popup(), Qt::Key_Enter); QCOMPARE(edit.text(), QString("iota")); + + delete completer; + delete model; } void tst_QCompleter::task247560_keyboardNavigation() @@ -1348,6 +1354,10 @@ void tst_QCompleter::task247560_keyboardNavigation() edit.show(); edit.setFocus(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(&edit); +#endif + QTest::qWait(100); QTest::keyClick(&edit, 'r'); 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 84ee425..ce1281f 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 QT += xml requires(contains(QT_CONFIG,private_tests)) diff --git a/tests/auto/qcssparser/tst_cssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp index 9870ec2..fcb29b3 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,8 +1506,11 @@ void tst_CssParser::gradient() QVERIFY(g->stops().at(1).second == color1); } -void tst_CssParser::extractFontFamily_data() +void tst_QCssParser::extractFontFamily_data() { + if (QFontInfo(QFont("Times New Roman")).family() != "Times New Roman") + QSKIP("'Times New Roman' font not found ", SkipAll); + QTest::addColumn<QString>("css"); QTest::addColumn<QString>("expectedFamily"); @@ -1522,7 +1525,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 +1550,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 +1578,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 +1610,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 +1635,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 +1656,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/qdesktopwidget/tst_qdesktopwidget.cpp b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp index c6fac8d..d2b0d8a 100644 --- a/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp +++ b/tests/auto/qdesktopwidget/tst_qdesktopwidget.cpp @@ -99,9 +99,17 @@ void tst_QDesktopWidget::availableGeometry() { QDesktopWidget desktop; - QRect total = desktop.screenGeometry(); - QRect available = desktop.availableGeometry(); + QRect total; + QRect available; + for (int i = 0; i < desktop.screenCount(); ++i) { + total = desktop.screenGeometry(i); + available = desktop.availableGeometry(i); + QVERIFY(total.contains(available)); + } + + total = desktop.screenGeometry(); + available = desktop.availableGeometry(); QVERIFY(total.contains(available)); QCOMPARE(desktop.availableGeometry(desktop.primaryScreen()), available); QCOMPARE(desktop.screenGeometry(desktop.primaryScreen()), total); 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/qdockwidget/tst_qdockwidget.cpp b/tests/auto/qdockwidget/tst_qdockwidget.cpp index 9b0e706..16bb12d 100644 --- a/tests/auto/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/qdockwidget/tst_qdockwidget.cpp @@ -91,6 +91,7 @@ private slots: void task169808_setFloating(); void task237438_setFloatingCrash(); void task248604_infiniteResize(); + void task258459_visibilityChanged(); }; // Testing get/set functions @@ -730,7 +731,7 @@ void tst_QDockWidget::task169808_setFloating() return QSize(20,20); } - void paintEvent(QPaintEvent *e) + void paintEvent(QPaintEvent *) { QPainter p(this); p.fillRect(rect(), Qt::red); @@ -798,5 +799,21 @@ void tst_QDockWidget::task248604_infiniteResize() } +void tst_QDockWidget::task258459_visibilityChanged() +{ + QMainWindow win; + QDockWidget dock1, dock2; + win.addDockWidget(Qt::RightDockWidgetArea, &dock1); + win.tabifyDockWidget(&dock1, &dock2); + QSignalSpy spy1(&dock1, SIGNAL(visibilityChanged(bool))); + QSignalSpy spy2(&dock2, SIGNAL(visibilityChanged(bool))); + win.show(); + QTest::qWait(200); + QCOMPARE(spy1.count(), 1); + QCOMPARE(spy1.first().first().toBool(), false); //dock1 is invisible + QCOMPARE(spy2.count(), 1); + QCOMPARE(spy2.first().first().toBool(), true); //dock1 is visible +} + QTEST_MAIN(tst_QDockWidget) #include "tst_qdockwidget.moc" diff --git a/tests/auto/qeventloop/tst_qeventloop.cpp b/tests/auto/qeventloop/tst_qeventloop.cpp index 6b113e0..fe0d1c2 100644 --- a/tests/auto/qeventloop/tst_qeventloop.cpp +++ b/tests/auto/qeventloop/tst_qeventloop.cpp @@ -222,6 +222,7 @@ void tst_QEventLoop::init() void tst_QEventLoop::cleanup() { } +#ifdef Q_OS_SYMBIAN class OnlySymbianActiveScheduler_helper : public QObject { Q_OBJECT @@ -243,10 +244,8 @@ public slots: // Let all the events occur twice so we know they reactivated after // each occurrence. if (++timerCount >= 2) { -#ifdef Q_OS_SYMBIAN // This will hopefully run last, so stop the active scheduler. CActiveScheduler::Stop(); -#endif } } void zeroTimerSlot() @@ -270,6 +269,7 @@ private: int zeroTimerCount; int notifierCount; }; +#endif void tst_QEventLoop::onlySymbianActiveScheduler() { #ifndef Q_OS_SYMBIAN diff --git a/tests/auto/qfile/tst_qfile.cpp b/tests/auto/qfile/tst_qfile.cpp index fd8fa98..b02e4de 100644 --- a/tests/auto/qfile/tst_qfile.cpp +++ b/tests/auto/qfile/tst_qfile.cpp @@ -925,6 +925,7 @@ void tst_QFile::copyAfterFail() QVERIFY(file1.open(QIODevice::ReadWrite) && "(test-precondition)"); QVERIFY(file2.open(QIODevice::ReadWrite) && "(test-precondition)"); + file2.close(); QVERIFY(!QFile::exists("copied-file-1.txt") && "(test-precondition)"); QVERIFY(!QFile::exists("copied-file-2.txt") && "(test-precondition)"); diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 86bf237..e3037a0 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -161,6 +161,7 @@ private slots: void task251341_sideBarRemoveEntries(); void task254490_selectFileMultipleTimes(); void task257579_sideBarWithNonCleanUrls(); + void task259105_filtersCornerCases(); private: QByteArray userSettings; @@ -2072,6 +2073,48 @@ void tst_QFiledialog::task257579_sideBarWithNonCleanUrls() #endif } +void tst_QFiledialog::task259105_filtersCornerCases() +{ + QNonNativeFileDialog fd(0, "TestFileDialog"); + fd.setNameFilter(QLatin1String("All Files! (*);;Text Files (*.txt)")); + fd.setOption(QFileDialog::HideNameFilterDetails, true); + fd.show(); + QTest::qWait(250); + + //Extensions are hidden + QComboBox *filters = qFindChild<QComboBox*>(&fd, "fileTypeCombo"); + QVERIFY(filters); + QCOMPARE(filters->currentText(), QLatin1String("All Files!")); + filters->setCurrentIndex(1); + QCOMPARE(filters->currentText(), QLatin1String("Text Files")); + + //We should have the full names + fd.setOption(QFileDialog::HideNameFilterDetails, false); + QTest::qWait(250); + filters->setCurrentIndex(0); + QCOMPARE(filters->currentText(), QLatin1String("All Files! (*)")); + filters->setCurrentIndex(1); + QCOMPARE(filters->currentText(), QLatin1String("Text Files (*.txt)")); + + //Corner case undocumented of the task + fd.setNameFilter(QLatin1String("\352 (I like cheese) All Files! (*);;Text Files (*.txt)")); + QCOMPARE(filters->currentText(), QLatin1String("\352 (I like cheese) All Files! (*)")); + filters->setCurrentIndex(1); + QCOMPARE(filters->currentText(), QLatin1String("Text Files (*.txt)")); + + fd.setOption(QFileDialog::HideNameFilterDetails, true); + filters->setCurrentIndex(0); + QTest::qWait(500); + QCOMPARE(filters->currentText(), QLatin1String("\352 (I like cheese) All Files!")); + filters->setCurrentIndex(1); + QCOMPARE(filters->currentText(), QLatin1String("Text Files")); + fd.setOption(QFileDialog::HideNameFilterDetails, true); + filters->setCurrentIndex(0); + QTest::qWait(500); + QCOMPARE(filters->currentText(), QLatin1String("\352 (I like cheese) All Files!")); + filters->setCurrentIndex(1); + QCOMPARE(filters->currentText(), QLatin1String("Text Files")); +} QTEST_MAIN(tst_QFiledialog) #include "tst_qfiledialog.moc" diff --git a/tests/auto/qfileinfo/tst_qfileinfo.cpp b/tests/auto/qfileinfo/tst_qfileinfo.cpp index 75b6100..4a091e3 100644 --- a/tests/auto/qfileinfo/tst_qfileinfo.cpp +++ b/tests/auto/qfileinfo/tst_qfileinfo.cpp @@ -756,7 +756,7 @@ void tst_QFileInfo::size() void tst_QFileInfo::systemFiles() { -#ifndef Q_OS_WIN +#if !defined(Q_OS_WIN) || defined(Q_OS_WINCE) QSKIP("This is a Windows only test", SkipAll); #endif QFileInfo fi("c:\\pagefile.sys"); @@ -1097,7 +1097,13 @@ void tst_QFileInfo::isWritable() QVERIFY(QFileInfo("tst_qfileinfo.cpp").isWritable()); #ifdef Q_OS_WIN - QVERIFY(!QFileInfo("c:\\pagefile.sys").isWritable()); +#ifdef Q_OS_WINCE + QFileInfo fi("\\Windows\\wince.nls"); +#else + QFileInfo fi("c:\\pagefile.sys"); +#endif + QVERIFY(fi.exists()); + QVERIFY(!fi.isWritable()); #endif #ifdef Q_OS_UNIX if (::getuid() == 0) diff --git a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp index a93a645..59c6413 100644 --- a/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp +++ b/tests/auto/qfilesystemwatcher/tst_qfilesystemwatcher.cpp @@ -402,6 +402,15 @@ void tst_QFileSystemWatcher::removePaths() watcher.removePaths(paths); } +#if 0 +class SignalTest : public QObject { + Q_OBJECT; + public slots: + void fileSlot(const QString &file) { qDebug() << "file " << file;} + void dirSlot(const QString &dir) { qDebug() << "dir" << dir;} +}; +#endif + void tst_QFileSystemWatcher::watchFileAndItsDirectory() { QFETCH(QString, backend); @@ -426,6 +435,12 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory() watcher.addPath(testDir.dirName()); watcher.addPath(testFileName); + /* + SignalTest signalTest; + QObject::connect(&watcher, SIGNAL(fileChanged(const QString &)), &signalTest, SLOT(fileSlot(const QString &))); + QObject::connect(&watcher, SIGNAL(directoryChanged(const QString &)), &signalTest, SLOT(dirSlot(const QString &))); + */ + QSignalSpy fileChangedSpy(&watcher, SIGNAL(fileChanged(const QString &))); QSignalSpy dirChangedSpy(&watcher, SIGNAL(directoryChanged(const QString &))); QEventLoop eventLoop; @@ -443,9 +458,12 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory() timer.start(3000); eventLoop.exec(); - QCOMPARE(fileChangedSpy.count(), 1); + QVERIFY(fileChangedSpy.count() > 0); QCOMPARE(dirChangedSpy.count(), 0); + if (backend == "dnotify") + QSKIP("dnotify is broken, skipping the rest of the test.", SkipSingle); + fileChangedSpy.clear(); QFile secondFile(secondFileName); secondFile.open(QIODevice::WriteOnly | QIODevice::Truncate); @@ -463,7 +481,7 @@ void tst_QFileSystemWatcher::watchFileAndItsDirectory() timer.start(3000); eventLoop.exec(); - QCOMPARE(fileChangedSpy.count(), 1); + QVERIFY(fileChangedSpy.count() > 0); QCOMPARE(dirChangedSpy.count(), 1); fileChangedSpy.clear(); diff --git a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp index 672b1f1..c9481da 100644 --- a/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp +++ b/tests/auto/qgraphicstransform/tst_qgraphicstransform.cpp @@ -137,7 +137,10 @@ void tst_QGraphicsTransform::rotation() void tst_QGraphicsTransform::rotation3d() { QGraphicsRotation3D rotation; - rotation.setOrigin(QPointF(10, 10)); + QCOMPARE(rotation.axis().x(), (qreal)0); + QCOMPARE(rotation.axis().y(), (qreal)0); + QCOMPARE(rotation.axis().z(), (qreal)1); + QCOMPARE(rotation.angle(), (qreal)0); QTransform t; rotation.applyTo(&t); @@ -147,6 +150,23 @@ void tst_QGraphicsTransform::rotation3d() rotation.setAngle(180); + QTransform t180; + t180.rotate(180.0f); + + QCOMPARE(t, QTransform()); + QVERIFY(qFuzzyCompare(rotation.transform(), t180)); + + rotation.setAxis(QVector3D(0, 0, 0)); + rotation.setOrigin(QPointF(10, 10)); + + t = QTransform(); + rotation.applyTo(&t); + + QCOMPARE(t, QTransform()); + QCOMPARE(rotation.transform(), QTransform()); + + rotation.setAngle(180); + QCOMPARE(t, QTransform()); QCOMPARE(rotation.transform(), QTransform()); diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index f4ad307..c990c44 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -222,10 +222,7 @@ void tst_QHostInfo::lookupIPv4_data() #else QTest::newRow("empty") << "" << "" << int(QHostInfo::HostNotFound); - QTest::newRow("lupinella_00") << "l" << lupinellaIp << int(QHostInfo::NoError); - QTest::newRow("lupinella_01") << "lupinella" << lupinellaIp << int(QHostInfo::NoError); - QTest::newRow("lupinella_02") << "lupinella.troll.no" << lupinellaIp << int(QHostInfo::NoError); - QTest::newRow("lupinella_03") << "lupinella.trolltech.com" << lupinellaIp << int(QHostInfo::NoError); + QTest::newRow("single_ip4") << "lupinella.troll.no" << lupinellaIp << int(QHostInfo::NoError); QTest::newRow("multiple_ip4") << "multi.dev.troll.no" << "1.2.3.4 1.2.3.5 10.3.3.31" << int(QHostInfo::NoError); QTest::newRow("literal_ip4") << lupinellaIp << lupinellaIp << int(QHostInfo::NoError); #endif diff --git a/tests/auto/qicoimageformat/qicoimageformat.pro b/tests/auto/qicoimageformat/qicoimageformat.pro index df121b6..45f616a 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 62cb4fe..1482f64 100644 --- a/tests/auto/qicoimageformat/tst_qticoimageformat.cpp +++ b/tests/auto/qicoimageformat/tst_qicoimageformat.cpp @@ -48,13 +48,13 @@ # define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" #endif -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: @@ -84,45 +84,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"); @@ -141,7 +141,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); @@ -163,7 +163,7 @@ public: }; -void tst_QtIcoImageFormat::SequentialFile_data() +void tst_QIcoImageFormat::SequentialFile_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("isValid"); @@ -175,7 +175,7 @@ void tst_QtIcoImageFormat::SequentialFile_data() } -void tst_QtIcoImageFormat::SequentialFile() +void tst_QIcoImageFormat::SequentialFile() { QFETCH(QString, fileName); QFETCH(int, isValid); @@ -193,7 +193,7 @@ void tst_QtIcoImageFormat::SequentialFile() } -void tst_QtIcoImageFormat::imageCount_data() +void tst_QIcoImageFormat::imageCount_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("count"); @@ -212,7 +212,7 @@ void tst_QtIcoImageFormat::imageCount_data() } -void tst_QtIcoImageFormat::imageCount() +void tst_QIcoImageFormat::imageCount() { QFETCH(QString, fileName); QFETCH(int, count); @@ -222,7 +222,7 @@ void tst_QtIcoImageFormat::imageCount() } -void tst_QtIcoImageFormat::jumpToNextImage_data() +void tst_QIcoImageFormat::jumpToNextImage_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("count"); @@ -239,7 +239,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); @@ -253,7 +253,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"); @@ -262,7 +262,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); @@ -271,7 +271,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"); @@ -289,7 +289,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); @@ -306,7 +306,7 @@ void tst_QtIcoImageFormat::nextImageDelay() } } -void tst_QtIcoImageFormat::pngCompression_data() +void tst_QIcoImageFormat::pngCompression_data() { QTest::addColumn<QString>("fileName"); QTest::addColumn<int>("index"); @@ -316,7 +316,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); @@ -333,5 +333,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/qitemdelegate/tst_qitemdelegate.cpp b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp index 31247b3..51b2b55 100644 --- a/tests/auto/qitemdelegate/tst_qitemdelegate.cpp +++ b/tests/auto/qitemdelegate/tst_qitemdelegate.cpp @@ -1156,7 +1156,7 @@ void tst_QItemDelegate::task257859_finalizeEdit() QTimer::singleShot(100, &dialog, SLOT(close())); dialog.exec(); - QTest::qWait(10); + QTest::qWait(100); QVERIFY(!editor); } diff --git a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp index 0541b46..05e23f1 100644 --- a/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp +++ b/tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp @@ -90,6 +90,7 @@ private slots: void merge(); void task119433_isRowSelected(); void task252069_rowIntersectsSelection(); + void task232634_childrenDeselectionSignal(); private: QAbstractItemModel *model; @@ -2187,5 +2188,28 @@ void tst_QItemSelectionModel::task252069_rowIntersectsSelection() QVERIFY(!selected.columnIntersectsSelection(5, QModelIndex())); } +void tst_QItemSelectionModel::task232634_childrenDeselectionSignal() +{ + QStandardItemModel model; + + QStandardItem *parentItem = model.invisibleRootItem(); + for (int i = 0; i < 4; ++i) { + QStandardItem *item = new QStandardItem(QString("item %0").arg(i)); + parentItem->appendRow(item); + parentItem = item; + } + + QModelIndex root = model.index(0,0); + QModelIndex par = root.child(0,0); + QModelIndex sel = par.child(0,0); + + QItemSelectionModel selectionModel(&model); + selectionModel.select(sel, QItemSelectionModel::SelectCurrent); + + QSignalSpy deselectSpy(&selectionModel, SIGNAL(selectionChanged(const QItemSelection& , const QItemSelection&))); + model.removeRows(0, 1, root); + QVERIFY(deselectSpy.count() == 1); +} + QTEST_MAIN(tst_QItemSelectionModel) #include "tst_qitemselectionmodel.moc" diff --git a/tests/auto/qitemview/tst_qitemview.cpp b/tests/auto/qitemview/tst_qitemview.cpp index 0ea7e0e..755f4c7 100644 --- a/tests/auto/qitemview/tst_qitemview.cpp +++ b/tests/auto/qitemview/tst_qitemview.cpp @@ -173,8 +173,6 @@ public: } QModelIndex index( int row, int column, const QModelIndex & parent = QModelIndex() ) const { - Q_ASSERT(row >= 0 && row <= rowCount(parent)); - Q_ASSERT(column >= 0 && column <= columnCount(parent)); return QStandardItemModel::index(row, column, parent); }; diff --git a/tests/auto/qlistwidget/tst_qlistwidget.cpp b/tests/auto/qlistwidget/tst_qlistwidget.cpp index 6f49a37..d2bc90a 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; } @@ -1517,5 +1519,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/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp index d1daf00..e414655 100644 --- a/tests/auto/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/qlocalsocket/tst_qlocalsocket.cpp @@ -582,14 +582,17 @@ void tst_QLocalSocket::readBufferOverflow() QVERIFY(server.hasPendingConnections()); QLocalSocket* serverSocket = server.nextPendingConnection(); - char* buffer = (char*)qMalloc(dataBufferSize); + char buffer[dataBufferSize]; memset(buffer, 0, dataBufferSize); serverSocket->write(buffer, dataBufferSize); serverSocket->flush(); - qFree(buffer); QVERIFY(client.waitForReadyRead()); - QCOMPARE(client.readAll().size(), dataBufferSize); + QCOMPARE(client.read(buffer, readBufferSize), qint64(readBufferSize)); +#ifdef QT_LOCALSOCKET_TCP + QTest::qWait(250); +#endif + QCOMPARE(client.read(buffer, readBufferSize), qint64(readBufferSize)); } // QLocalSocket/Server can take a name or path, check that it works as expected @@ -971,6 +974,7 @@ void tst_QLocalSocket::writeOnlySocket() QVERIFY(server.waitForNewConnection()); QLocalSocket* serverSocket = server.nextPendingConnection(); + QVERIFY(serverSocket); QCOMPARE(client.bytesAvailable(), qint64(0)); QCOMPARE(client.state(), QLocalSocket::ConnectedState); diff --git a/tests/auto/qmainwindow/tst_qmainwindow.cpp b/tests/auto/qmainwindow/tst_qmainwindow.cpp index 6ae7a3e..f81dd82 100644 --- a/tests/auto/qmainwindow/tst_qmainwindow.cpp +++ b/tests/auto/qmainwindow/tst_qmainwindow.cpp @@ -550,6 +550,9 @@ void tst_QMainWindow::menuBar() mw.setMenuBar(mb1); QVERIFY(mw.menuBar() != 0); QCOMPARE(mw.menuBar(), (QMenuBar *)mb1); +#ifdef Q_WS_WINCE_WM + QSKIP("With native menubar integration the menubar is not a child", SkipSingle); +#endif QCOMPARE(mb1->parentWidget(), (QWidget *)&mw); mw.setMenuBar(0); diff --git a/tests/auto/qmake/testdata/functions/functions.pro b/tests/auto/qmake/testdata/functions/functions.pro index 9ed92f96..5e089e4 100644 --- a/tests/auto/qmake/testdata/functions/functions.pro +++ b/tests/auto/qmake/testdata/functions/functions.pro @@ -46,7 +46,7 @@ isEmpty( CONFIG ) { } #include -include( infiletest.pro ) +include( infiletest.pro, "", true ) !contains( DEFINES, QT_DLL ) { message( "FAILED: include function: $$DEFINES" ) } diff --git a/tests/auto/qmenu/tst_qmenu.cpp b/tests/auto/qmenu/tst_qmenu.cpp index 4945d11..fc0da1a 100644 --- a/tests/auto/qmenu/tst_qmenu.cpp +++ b/tests/auto/qmenu/tst_qmenu.cpp @@ -50,6 +50,7 @@ #include <QStatusBar> #include <QListWidget> #include <QWidgetAction> +#include <QDesktopWidget> #include <qmenu.h> #include <qstyle.h> @@ -699,6 +700,12 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() }; QMenu sub; + + if (sub.style()->styleHint(QStyle::SH_Menu_Scrollable, 0, &sub)) { + //the style prevents the menus from getting columns + QSKIP("the style doesn't support multiple columns, it makes the menu scrollable", SkipSingle); + } + sub.addAction("Sub-Item1"); QAction *subAction = sub.addAction("Sub-Item2"); @@ -710,6 +717,7 @@ void tst_QMenu::task250673_activeMultiColumnSubMenuPosition() uint i = 2; while (main.columnCount() < 2) { main.addAction(QString("Item %1").arg(i)); + qDebug() << "adding action" << i; ++i; Q_ASSERT(i<1000); } @@ -791,7 +799,7 @@ void tst_QMenu::task258920_mouseBorder() Menu258920 menu; QAction *action = menu.addAction("test"); - menu.popup(QPoint()); + menu.popup(QApplication::desktop()->availableGeometry().center()); QTest::qWait(100); QRect actionRect = menu.actionGeometry(action); QTest::mouseMove(&menu, actionRect.center()); diff --git a/tests/auto/qmenubar/tst_qmenubar.cpp b/tests/auto/qmenubar/tst_qmenubar.cpp index 6e98c2a..18f8b1a 100644 --- a/tests/auto/qmenubar/tst_qmenubar.cpp +++ b/tests/auto/qmenubar/tst_qmenubar.cpp @@ -59,6 +59,8 @@ #include <qobject.h> +#include "../../shared/util.h" + QT_FORWARD_DECLARE_CLASS(QMainWindow) #include <qmenubar.h> @@ -1531,6 +1533,7 @@ void tst_QMenuBar::task223138_triggered() void tst_QMenuBar::task256322_highlight() { QMainWindow win; + win.menuBar()->setNativeMenuBar(false); //we can't check the geometry of native menubars QMenu menu; QAction *file = win.menuBar()->addMenu(&menu); file->setText("file"); @@ -1540,27 +1543,24 @@ void tst_QMenuBar::task256322_highlight() QAction *nothing = win.menuBar()->addAction("nothing"); win.show(); + QTest::qWait(200); + QTest::mouseMove(win.menuBar(), win.menuBar()->actionGeometry(file).center()); QTest::mouseClick(win.menuBar(), Qt::LeftButton, 0, win.menuBar()->actionGeometry(file).center()); - QVERIFY(menu.isVisible()); + QTRY_VERIFY(menu.isVisible()); QVERIFY(!menu2.isVisible()); QCOMPARE(win.menuBar()->activeAction(), file); QTest::mouseMove(win.menuBar(), win.menuBar()->actionGeometry(file2).center()); - QVERIFY(!menu.isVisible()); + QTRY_VERIFY(!menu.isVisible()); QVERIFY(menu2.isVisible()); QCOMPARE(win.menuBar()->activeAction(), file2); - QTest::mouseMove(win.menuBar(), win.menuBar()->actionGeometry(nothing).center()); + QPoint nothingCenter = win.menuBar()->actionGeometry(nothing).center(); + QTest::mouseMove(win.menuBar(), nothingCenter); + QTRY_VERIFY(!menu2.isVisible()); QVERIFY(!menu.isVisible()); - QVERIFY(!menu2.isVisible()); QCOMPARE(win.menuBar()->activeAction(), nothing); - - QTest::mouseMove(&win, win.menuBar()->geometry().bottomLeft() + QPoint(1,1)); - - QVERIFY(!menu.isVisible()); - QVERIFY(!menu2.isVisible()); - QVERIFY(!win.menuBar()->activeAction()); } void tst_QMenuBar::menubarSizeHint() @@ -1587,6 +1587,8 @@ void tst_QMenuBar::menubarSizeHint() } style; QMenuBar mb; + mb.setNativeMenuBar(false); //we can't check the geometry of native menubars + mb.setStyle(&style); //this is a list of arbitrary strings so that we check the geometry QStringList list = QStringList() << "trer" << "ezrfgtgvqd" << "sdgzgzerzerzer" << "eerzertz" << "er"; diff --git a/tests/auto/qmultiscreen/qmultiscreen.pro b/tests/auto/qmultiscreen/qmultiscreen.pro index fd42870..4e92a65 100644 --- a/tests/auto/qmultiscreen/qmultiscreen.pro +++ b/tests/auto/qmultiscreen/qmultiscreen.pro @@ -1,3 +1,6 @@ load(qttest_p4) SOURCES += tst_qmultiscreen.cpp QT = core + +requires(embedded) + diff --git a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp index 299a01e..b283a46 100644 --- a/tests/auto/qplaintextedit/tst_qplaintextedit.cpp +++ b/tests/auto/qplaintextedit/tst_qplaintextedit.cpp @@ -875,7 +875,12 @@ void tst_QPlainTextEdit::lineWrapModes() ed->setLineWrapMode(QPlainTextEdit::NoWrap); QCOMPARE(lineCount(), 1); ed->setLineWrapMode(QPlainTextEdit::WidgetWidth); - ed->resize(1, 1000); + + // QPlainTextEdit does lazy line layout on resize, only for the visible blocks. + // We thus need to make it wide enough to show something visible. + int minimumWidth = 2 * ed->document()->documentMargin(); + minimumWidth += ed->fontMetrics().width(QLatin1Char('a')); + ed->resize(minimumWidth, 1000); QCOMPARE(lineCount(), 26); ed->setParent(0); delete window; diff --git a/tests/auto/qpluginloader/tst/tst.pro b/tests/auto/qpluginloader/tst/tst.pro index ecc4ecb..2de0912 100644 --- a/tests/auto/qpluginloader/tst/tst.pro +++ b/tests/auto/qpluginloader/tst/tst.pro @@ -14,7 +14,7 @@ win32 { wince*: { - addFiles.sources = ../bin/*.dll + addFiles.sources = $$OUT_PWD/../bin/*.dll addFiles.path = bin DEPLOYMENT += addFiles } diff --git a/tests/auto/qpluginloader/tst_qpluginloader.cpp b/tests/auto/qpluginloader/tst_qpluginloader.cpp index d45acaf..1e475da 100644 --- a/tests/auto/qpluginloader/tst_qpluginloader.cpp +++ b/tests/auto/qpluginloader/tst_qpluginloader.cpp @@ -275,6 +275,7 @@ void tst_QPluginLoader::deleteinstanceOnUnload() if (pass == 0) loader1.load(); // not recommended, instance() should do the job. PluginInterface *instance1 = qobject_cast<PluginInterface*>(loader1.instance()); + QVERIFY(instance1); QCOMPARE(instance1->pluginName(), QLatin1String("Plugin ok")); QPluginLoader loader2; 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 9ddbf75..e832666 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:!symbian: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/qprocess/tst_qprocess.cpp b/tests/auto/qprocess/tst_qprocess.cpp index df36590..6059833 100644 --- a/tests/auto/qprocess/tst_qprocess.cpp +++ b/tests/auto/qprocess/tst_qprocess.cpp @@ -1321,7 +1321,7 @@ private: //----------------------------------------------------------------------------- void tst_QProcess::processInAThread() { - for (int i = 0; i < 3; ++i) { + for (int i = 0; i < 10; ++i) { TestThread thread; #if defined(Q_OS_SYMBIAN) thread.setStackSize(0x14000); diff --git a/tests/auto/qpushbutton/tst_qpushbutton.cpp b/tests/auto/qpushbutton/tst_qpushbutton.cpp index 7a81dbf..528f3bb 100644 --- a/tests/auto/qpushbutton/tst_qpushbutton.cpp +++ b/tests/auto/qpushbutton/tst_qpushbutton.cpp @@ -661,6 +661,7 @@ void tst_QPushButton::sizeHint() tabWidget->setCurrentWidget(tab2); tabWidget->setCurrentWidget(tab1); QTest::qWait(100); + QApplication::processEvents(); QCOMPARE(button1_2->size(), button2_2->size()); } diff --git a/tests/auto/qresourceengine/qresourceengine.pro b/tests/auto/qresourceengine/qresourceengine.pro index 1e8c5c7..3e47b52 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 symbian-sbsv2 { diff --git a/tests/auto/qresourceengine/tst_resourceengine.cpp b/tests/auto/qresourceengine/tst_qresourceengine.cpp index dfdc454..94b18bd 100644 --- a/tests/auto/qresourceengine/tst_resourceengine.cpp +++ b/tests/auto/qresourceengine/tst_qresourceengine.cpp @@ -47,7 +47,7 @@ #define SRCDIR "." #endif -class tst_ResourceEngine: public QObject +class tst_QResourceEngine: public QObject { Q_OBJECT @@ -70,7 +70,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/")); @@ -83,7 +83,7 @@ void tst_ResourceEngine::initTestCase() } } -void tst_ResourceEngine::cleanupTestCase() +void tst_QResourceEngine::cleanupTestCase() { if (!builddir.isEmpty()) { QDir::setCurrent(builddir); @@ -94,7 +94,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"); @@ -310,7 +310,7 @@ void tst_ResourceEngine::checkStructure_data() } } -void tst_ResourceEngine::checkStructure() +void tst_QResourceEngine::checkStructure() { QFETCH(QString, pathName); QFETCH(QString, contents); @@ -380,7 +380,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"); @@ -400,7 +400,7 @@ void tst_ResourceEngine::searchPath_data() << QByteArray("path2\n"); } -void tst_ResourceEngine::searchPath() +void tst_QResourceEngine::searchPath() { QFETCH(QString, searchPath); QFETCH(QString, file); @@ -418,7 +418,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"); @@ -430,7 +430,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); @@ -454,12 +454,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 d28fbef..9da7f47 100644 --- a/tests/auto/qscriptqobject/qscriptqobject.pro +++ b/tests/auto/qscriptextqobject/qscriptextqobject.pro @@ -1,6 +1,6 @@ load(qttest_p4) QT = core gui script -SOURCES += tst_qscriptqobject.cpp +SOURCES += tst_qscriptextqobject.cpp symbian: { TARGET.EPOCHEAPSIZE="0x100000 0x1000000 // Min 1Mb, max 16Mb" diff --git a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp index 5621696..3607ecd 100644 --- a/tests/auto/qscriptqobject/tst_qscriptqobject.cpp +++ b/tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp @@ -2884,4 +2884,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 c110076..ab0ddca 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 130133c..6604104 100644 --- a/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp +++ b/tests/auto/qscriptv8testsuite/tst_qscriptv8testsuite.cpp @@ -258,6 +258,7 @@ tst_Suite::tst_Suite() addTestExclusion("nested-repetition-count-overflow", "Demands too much memory on Symbian"); addTestExclusion("unicode-test", "Demands too much memory on Symbian"); #endif + static const char klass[] = "tst_QScriptV8TestSuite"; QVector<uint> *data = qt_meta_data_tst_Suite(); // content: @@ -270,7 +271,7 @@ tst_Suite::tst_Suite() ; QVector<char> *stringdata = qt_meta_stringdata_tst_Suite(); - appendCString(stringdata, "tst_Suite"); + appendCString(stringdata, klass); appendCString(stringdata, ""); QFileInfoList testFileInfos; @@ -280,7 +281,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/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp index 97ff04b..744ba52 100644 --- a/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp +++ b/tests/auto/qsequentialanimationgroup/tst_qsequentialanimationgroup.cpp @@ -88,6 +88,7 @@ private slots: void currentAnimationWithZeroDuration(); void insertAnimation(); void clearAnimations(); + void pauseResume(); }; tst_QSequentialAnimationGroup::tst_QSequentialAnimationGroup() @@ -1644,5 +1645,40 @@ void tst_QSequentialAnimationGroup::clearAnimations() QCOMPARE(group.state(), QAbstractAnimation::Running); } +void tst_QSequentialAnimationGroup::pauseResume() +{ + QObject dummy; + dummy.setProperty("foo", 0); + QParallelAnimationGroup group; + QPropertyAnimation *anim = new QPropertyAnimation(&dummy, "foo", &group); + anim->setDuration(250); + anim->setEndValue(250); + QSignalSpy spy(anim, SIGNAL(stateChanged(QAbstractAnimation::State, QAbstractAnimation::State))); + QCOMPARE(group.duration(), 250); + group.start(); + QTest::qWait(100); + QCOMPARE(group.state(), QAnimationGroup::Running); + QCOMPARE(anim->state(), QAnimationGroup::Running); + QCOMPARE(spy.count(), 1); + spy.clear(); + const int currentTime = group.currentTime(); + QCOMPARE(anim->currentTime(), currentTime); + + group.pause(); + QCOMPARE(group.state(), QAnimationGroup::Paused); + QCOMPARE(group.currentTime(), currentTime); + QCOMPARE(anim->state(), QAnimationGroup::Paused); + QCOMPARE(anim->currentTime(), currentTime); + QCOMPARE(spy.count(), 1); + spy.clear(); + + group.resume(); + QCOMPARE(group.state(), QAnimationGroup::Running); + QCOMPARE(group.currentTime(), currentTime); + QCOMPARE(anim->state(), QAnimationGroup::Running); + QCOMPARE(anim->currentTime(), currentTime); + QCOMPARE(spy.count(), 1); +} + QTEST_MAIN(tst_QSequentialAnimationGroup) #include "tst_qsequentialanimationgroup.moc" diff --git a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp index 98fbeb5..5fd2ae8 100644 --- a/tests/auto/qsharedpointer/tst_qsharedpointer.cpp +++ b/tests/auto/qsharedpointer/tst_qsharedpointer.cpp @@ -71,6 +71,9 @@ private slots: void memoryManagement(); void downCast(); void upCast(); + void qobjectWeakManagement(); + void noSharedPointerFromWeakQObject(); + void weakQObjectFromSharedPointer(); void objectCast(); void differentPointers(); void virtualBaseDifferentPointers(); @@ -83,6 +86,7 @@ private slots: void constCorrectness(); void customDeleter(); void creating(); + void creatingQObject(); void mixTrackingPointerCode(); void threadStressTest_data(); void threadStressTest(); @@ -507,6 +511,122 @@ class OtherObject: public QObject Q_OBJECT }; +void tst_QSharedPointer::qobjectWeakManagement() +{ + { + QObject *obj = new QObject; + QWeakPointer<QObject> weak(obj); + QVERIFY(!weak.isNull()); + QVERIFY(weak.data() == obj); + + // now delete + delete obj; + QVERIFY(weak.isNull()); + } + check(); + + { + // same, bit with operator= + QObject *obj = new QObject; + QWeakPointer<QObject> weak; + weak = obj; + QVERIFY(!weak.isNull()); + QVERIFY(weak.data() == obj); + + // now delete + delete obj; + QVERIFY(weak.isNull()); + } + check(); + + { + // delete triggered by parent + QObject *obj, *parent; + parent = new QObject; + obj = new QObject(parent); + QWeakPointer<QObject> weak(obj); + + // now delete the parent + delete parent; + QVERIFY(weak.isNull()); + } + check(); + + { + // same as above, but set the parent after QWeakPointer is created + QObject *obj, *parent; + obj = new QObject; + QWeakPointer<QObject> weak(obj); + + parent = new QObject; + obj->setParent(parent); + + // now delete the parent + delete parent; + QVERIFY(weak.isNull()); + } + check(); + + { + // with two QWeakPointers + QObject *obj = new QObject; + QWeakPointer<QObject> weak(obj); + + { + QWeakPointer<QObject> weak2(obj); + QVERIFY(!weak2.isNull()); + QVERIFY(weak == weak2); + } + QVERIFY(!weak.isNull()); + + delete obj; + QVERIFY(weak.isNull()); + } + check(); + + { + // same, but delete the pointer while two QWeakPointers exist + QObject *obj = new QObject; + QWeakPointer<QObject> weak(obj); + + { + QWeakPointer<QObject> weak2(obj); + QVERIFY(!weak2.isNull()); + + delete obj; + QVERIFY(weak.isNull()); + QVERIFY(weak2.isNull()); + } + QVERIFY(weak.isNull()); + } + check(); +} + +void tst_QSharedPointer::noSharedPointerFromWeakQObject() +{ + // you're not allowed to create a QSharedPointer from an unmanaged QObject + QObject obj; + QWeakPointer<QObject> weak(&obj); + + QSharedPointer<QObject> strong = weak.toStrongRef(); + QVERIFY(strong.isNull()); + + // is something went wrong, we'll probably crash here +} + +void tst_QSharedPointer::weakQObjectFromSharedPointer() +{ + // this is the inverse of the above: you're allowed to create a QWeakPointer + // from a managed QObject + QSharedPointer<QObject> shared(new QObject); + QWeakPointer<QObject> weak = shared.data(); + QVERIFY(!weak.isNull()); + + // delete: + shared.clear(); + QVERIFY(weak.isNull()); +} + void tst_QSharedPointer::objectCast() { { @@ -1085,6 +1205,13 @@ void tst_QSharedPointer::customDeleter() QCOMPARE(dataDeleter.callCount, 0); QCOMPARE(derivedDataDeleter.callCount, 1); QCOMPARE(refcount, 2); + check(); +} + +void customQObjectDeleterFn(QObject *obj) +{ + ++customDeleterFnCallCount; + delete obj; } void tst_QSharedPointer::creating() @@ -1151,7 +1278,10 @@ void tst_QSharedPointer::creating() QCOMPARE(baseptr->classLevel(), 4); } check(); +} +void tst_QSharedPointer::creatingQObject() +{ { QSharedPointer<QObject> ptr = QSharedPointer<QObject>::create(); QCOMPARE(ptr->metaObject(), &QObject::staticMetaObject); @@ -1281,7 +1411,11 @@ void tst_QSharedPointer::threadStressTest() base.clear(); +#ifdef Q_OS_WINCE + srand(QDateTime::currentDateTime().toTime_t()); +#else srand(time(NULL)); +#endif // start threads for (int i = 0; i < allThreads.count(); ++i) if (allThreads[i]) allThreads[i]->start(); @@ -1450,6 +1584,17 @@ void tst_QSharedPointer::invalidConstructs_data() << &QTest::QExternalTest::tryCompileFail << "QSharedPointer<Data> ptr1;\n" "QSharedPointer<int> ptr2 = qSharedPointerObjectCast<int>(ptr1);"; + + QTest::newRow("weak-pointer-from-regular-pointer") + << &QTest::QExternalTest::tryCompileFail + << "Data *ptr = 0;\n" + "QWeakPointer<Data> weakptr(ptr);\n"; + + QTest::newRow("shared-pointer-from-unmanaged-qobject") + << &QTest::QExternalTest::tryRunFail + << "QObject *ptr = new QObject;\n" + "QWeakPointer<QObject> weak = ptr;\n" // this makes the object unmanaged + "QSharedPointer<QObject> shared(ptr);\n"; } void tst_QSharedPointer::invalidConstructs() diff --git a/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro new file mode 100644 index 0000000..db647a5 --- /dev/null +++ b/tests/auto/qsharedpointer_and_qwidget/qsharedpointer_and_qwidget.pro @@ -0,0 +1,3 @@ +load(qttest_p4) +SOURCES += tst_qsharedpointer_and_qwidget.cpp +DEFINES += SRCDIR=\\\"$$PWD/\\\" diff --git a/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp new file mode 100644 index 0000000..66727c2 --- /dev/null +++ b/tests/auto/qsharedpointer_and_qwidget/tst_qsharedpointer_and_qwidget.cpp @@ -0,0 +1,150 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** No Commercial Usage +** This file contains pre-release code and may not be distributed. +** You may use this file in accordance with the terms and conditions +** contained in the either Technology Preview License Agreement or the +** Beta Release License Agreement. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain +** additional rights. These rights are described in the Nokia Qt LGPL +** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this +** package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** If you are unsure which license is appropriate for your use, please +** contact the sales department at http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <QtGui/QWidget> +#include <QtGui/QPushButton> +#include <QtTest/QtTest> + +namespace QtSharedPointer { + Q_CORE_EXPORT void internalSafetyCheckCleanCheck(); +} + +class tst_QSharedPointer_and_QWidget: public QObject +{ + Q_OBJECT +private slots: + void weak_externalDelete(); + void weak_parentDelete(); + void weak_parentDelete_setParent(); + + void strong_weak(); + + void strong_sharedptrDelete(); + +public slots: + void cleanup() { check(); } + +public: + inline void check() + { +#ifdef QT_BUILD_INTERNAL + QtSharedPointer::internalSafetyCheckCleanCheck(); +#endif + } +}; + +void tst_QSharedPointer_and_QWidget::weak_externalDelete() +{ + QWidget *w = new QWidget; + QWeakPointer<QWidget> ptr = w; + + QVERIFY(!ptr.isNull()); + + delete w; + QVERIFY(ptr.isNull()); +} + +void tst_QSharedPointer_and_QWidget::weak_parentDelete() +{ + QWidget *parent = new QWidget; + QWidget *w = new QWidget(parent); + QWeakPointer<QWidget> ptr = w; + + QVERIFY(!ptr.isNull()); + + delete parent; + QVERIFY(ptr.isNull()); +} + +void tst_QSharedPointer_and_QWidget::weak_parentDelete_setParent() +{ + QWidget *parent = new QWidget; + QWidget *w = new QWidget; + QWeakPointer<QWidget> ptr = w; + w->setParent(parent); + + QVERIFY(!ptr.isNull()); + + delete parent; + QVERIFY(ptr.isNull()); +} + +// -- mixed -- + +void tst_QSharedPointer_and_QWidget::strong_weak() +{ + QSharedPointer<QWidget> ptr(new QWidget); + QWeakPointer<QWidget> weak = ptr.data(); + QWeakPointer<QWidget> weak2 = ptr; + + QVERIFY(!weak.isNull()); + QVERIFY(!weak2.isNull()); + + ptr.clear(); // deletes + + QVERIFY(weak.isNull()); + QVERIFY(weak2.isNull()); +} + + +// ---- strong management ---- + +void tst_QSharedPointer_and_QWidget::strong_sharedptrDelete() +{ + QWidget *parent = new QWidget; + QSharedPointer<QWidget> ptr(new QWidget(parent)); + QWeakPointer<QWidget> weak = ptr; + QPointer<QWidget> check = ptr.data(); + + QVERIFY(!check.isNull()); + QVERIFY(!weak.isNull()); + + ptr.clear(); // deletes + + QVERIFY(check.isNull()); + QVERIFY(weak.isNull()); + + delete parent; // mustn't crash +} + +QTEST_MAIN(tst_QSharedPointer_and_QWidget) + +#include "tst_qsharedpointer_and_qwidget.moc" diff --git a/tests/auto/qstyle/tst_qstyle.cpp b/tests/auto/qstyle/tst_qstyle.cpp index 5076af6..a7e0d19 100644 --- a/tests/auto/qstyle/tst_qstyle.cpp +++ b/tests/auto/qstyle/tst_qstyle.cpp @@ -360,7 +360,7 @@ void tst_QStyle::testAllFunctions(QStyle *style) testScrollBarSubControls(style); } -void tst_QStyle::testScrollBarSubControls(QStyle *) +void tst_QStyle::testScrollBarSubControls(QStyle* style) { #ifdef Q_OS_WINCE_WM if (qobject_cast<QWindowsMobileStyle*>(style) && qt_wince_is_smartphone()) diff --git a/tests/auto/qtableview/tst_qtableview.cpp b/tests/auto/qtableview/tst_qtableview.cpp index 6fa57f0..eb39dd7 100644 --- a/tests/auto/qtableview/tst_qtableview.cpp +++ b/tests/auto/qtableview/tst_qtableview.cpp @@ -2542,7 +2542,7 @@ void tst_QTableView::span_data() << 2 << 1 << false; - /* This makes no sens. + /* This makes no sens. QTest::newRow("top left 2x0") << 10 << 10 << -1 << -1 @@ -2631,7 +2631,7 @@ void tst_QTableView::span() view.hideRow(hiddenRow); view.hideColumn(hiddenColumn); view.show(); - + QCOMPARE(view.rowSpan(row, column), expectedRowSpan); QCOMPARE(view.columnSpan(row, column), expectedColumnSpan); @@ -3110,14 +3110,14 @@ void tst_QTableView::task227953_setRootIndex() } tableView.setModel(&model); - + //show the first 10 rows of the first table QModelIndex root = model.indexFromItem(&item1); tableView.setRootIndex(root); for (int i = 10; i != 40; ++i) { tableView.setRowHidden(i, true); } - + QCOMPARE(tableView.verticalHeader()->count(), 40); QCOMPARE(tableView.verticalHeader()->hiddenSectionCount(), 30); @@ -3139,16 +3139,13 @@ void tst_QTableView::task240266_veryBigColumn() table.setColumnWidth(1, 100); //normal column table.setColumnWidth(2, 9000); //very big column table.show(); -#ifdef Q_WS_X11 - qt_x11_wait_for_window_manager(&view); -#endif QTest::qWait(100); QScrollBar *scroll = table.horizontalScrollBar(); QCOMPARE(scroll->minimum(), 0); QCOMPARE(scroll->maximum(), model.columnCount() - 1); QCOMPARE(scroll->singleStep(), 1); - + //1 is not always a very correct value for pageStep. Ideally this should be dynamic. //Maybe something for Qt 5 ;-) QCOMPARE(scroll->pageStep(), 1); 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/qtimeline/tst_qtimeline.cpp b/tests/auto/qtimeline/tst_qtimeline.cpp index e6e75ff..4ce1f4b 100644 --- a/tests/auto/qtimeline/tst_qtimeline.cpp +++ b/tests/auto/qtimeline/tst_qtimeline.cpp @@ -81,6 +81,7 @@ private slots: void outOfRange(); void stateInFinishedSignal(); void resume(); + void restart(); protected slots: void finishedSlot(); @@ -177,7 +178,7 @@ void tst_QTimeLine::currentTime() QCOMPARE(spy.count(), 1); spy.clear(); QCOMPARE(timeLine.currentTime(), timeLine.duration()/2); - timeLine.start(); + timeLine.resume(); // Let it update on its own QTest::qWait(timeLine.duration()/4); QCOMPARE(timeLine.state(), QTimeLine::Running); @@ -699,5 +700,43 @@ void tst_QTimeLine::resume() } } +void tst_QTimeLine::restart() +{ + QTimeLine timeLine(100); + timeLine.setFrameRange(0,9); + + timeLine.start(); + QTest::qWait(timeLine.duration()*2); + QCOMPARE(timeLine.currentFrame(), timeLine.endFrame()); + QCOMPARE(timeLine.state(), QTimeLine::NotRunning); + + // A restart with the same duration + timeLine.start(); + QCOMPARE(timeLine.state(), QTimeLine::Running); + QCOMPARE(timeLine.currentFrame(), timeLine.startFrame()); + QCOMPARE(timeLine.currentTime(), 0); + QTest::qWait(250); + QCOMPARE(timeLine.currentFrame(), timeLine.endFrame()); + QCOMPARE(timeLine.state(), QTimeLine::NotRunning); + + // Set a smaller duration and restart + timeLine.setDuration(50); + timeLine.start(); + QCOMPARE(timeLine.state(), QTimeLine::Running); + QCOMPARE(timeLine.currentFrame(), timeLine.startFrame()); + QCOMPARE(timeLine.currentTime(), 0); + QTest::qWait(250); + QCOMPARE(timeLine.currentFrame(), timeLine.endFrame()); + QCOMPARE(timeLine.state(), QTimeLine::NotRunning); + + // Set a longer duration and restart + timeLine.setDuration(150); + timeLine.start(); + QCOMPARE(timeLine.state(), QTimeLine::Running); + QCOMPARE(timeLine.currentFrame(), timeLine.startFrame()); + QCOMPARE(timeLine.currentTime(), 0); +} + QTEST_MAIN(tst_QTimeLine) + #include "tst_qtimeline.moc" diff --git a/tests/auto/qtreeview/tst_qtreeview.cpp b/tests/auto/qtreeview/tst_qtreeview.cpp index 65cb27a..87f78a9 100644 --- a/tests/auto/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/qtreeview/tst_qtreeview.cpp @@ -2927,8 +2927,7 @@ void tst_QTreeView::styleOptionViewItem() delegate.count = 0; view.showMaximized(); - QTest::qWait(30); - QVERIFY(delegate.count >= 13); + QTRY_VERIFY(delegate.count >= 13); } class task174627_TreeView : public QTreeView diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp index 7d79d56..fd0fdb1 100644 --- a/tests/auto/qtreewidget/tst_qtreewidget.cpp +++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp @@ -238,6 +238,9 @@ void tst_QTreeWidget::initTestCase() testWidget = new CustomTreeWidget(); testWidget->show(); +#ifdef Q_WS_X11 + qt_x11_wait_for_window_manager(testWidget); +#endif } void tst_QTreeWidget::cleanupTestCase() @@ -2017,7 +2020,7 @@ void tst_QTreeWidget::setHeaderItem() headerItem->setText(0, "0"); headerItem->setText(1, "1"); testWidget->setHeaderItem(headerItem); - qApp->processEvents(); + QTest::qWait(100); QCOMPARE(testWidget->headerItem(), headerItem); QCOMPARE(headerItem->treeWidget(), static_cast<QTreeWidget *>(testWidget)); @@ -2762,16 +2765,18 @@ void tst_QTreeWidget::defaultRowSizes() for (int j=0; j<tw->columnCount() - 1; ++j) { it->setText(j, "This is a test"); } + QPixmap icon = tw->style()->standardPixmap((QStyle::StandardPixmap)(i + QStyle::SP_TitleBarMenuButton)); + if (icon.isNull()) + QSKIP("No pixmap found on current style, skipping this test.", SkipSingle); it->setIcon(tw->columnCount() - 1, - tw->style()->standardPixmap((QStyle::StandardPixmap)(i + QStyle::SP_TitleBarMenuButton)). - scaled(tw->iconSize())); + icon.scaled(tw->iconSize())); } tw->resize(100,100); tw->show(); QApplication::processEvents(); QRect visualRect = tw->visualItemRect(tw->topLevelItem(0)); - QVERIFY(visualRect.height() >=50); + QVERIFY(visualRect.height() >= 50); } void tst_QTreeWidget::task191552_rtl() 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/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index fcec097..fe71b72 100644 --- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp +++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp @@ -48,6 +48,7 @@ #include <private/qwindowsurface_p.h> #include <QDesktopWidget> +#include <QX11Info> class tst_QWindowSurface : public QObject { @@ -138,6 +139,11 @@ void tst_QWindowSurface::getSetWindowSurface() void tst_QWindowSurface::flushOutsidePaintEvent() { +#ifdef Q_WS_X11 + if (QX11Info::isCompositingManagerRunning()) + QSKIP("Test is unreliable with composition manager", SkipAll); +#endif + #ifdef Q_WS_WIN if (QSysInfo::WindowsVersion & QSysInfo::WV_VISTA) { QTest::qWait(1000); diff --git a/tests/auto/qxmlquery/qxmlquery.pro b/tests/auto/qxmlquery/qxmlquery.pro index 386df05..92700c5 100644 --- a/tests/auto/qxmlquery/qxmlquery.pro +++ b/tests/auto/qxmlquery/qxmlquery.pro @@ -10,6 +10,12 @@ RESOURCES = input.qrc QT += network +!wince* { +DEFINES += SRCDIR=\\\"$$PWD/\\\" +} else { +DEFINES += SRCDIR=\\\"./\\\" +} + include (../xmlpatterns.pri) wince*|symbian*: { diff --git a/tests/auto/qxmlquery/tst_qxmlquery.cpp b/tests/auto/qxmlquery/tst_qxmlquery.cpp index ebf992d..32e1e16 100644 --- a/tests/auto/qxmlquery/tst_qxmlquery.cpp +++ b/tests/auto/qxmlquery/tst_qxmlquery.cpp @@ -260,7 +260,7 @@ void tst_QXmlQuery::checkBaseURI(const QUrl &baseURI, const QString &candidate) QVERIFY(QDir(baseURI.toLocalFile()).relativeFilePath(QFileInfo(candidate).canonicalFilePath()).startsWith("../")); } -const char *const tst_QXmlQuery::queriesDirectory = "../xmlpatterns/queries/"; +const char *const tst_QXmlQuery::queriesDirectory = SRCDIR "../xmlpatterns/queries/"; QStringList tst_QXmlQuery::queries() { @@ -739,7 +739,7 @@ void tst_QXmlQuery::bindVariableQStringQIODeviceWithString() const void tst_QXmlQuery::bindVariableQStringQIODeviceWithQFile() const { QXmlQuery query; - QFile inDevice(QLatin1String("input.xml")); + QFile inDevice(QLatin1String(SRCDIR "input.xml")); QVERIFY(inDevice.open(QIODevice::ReadOnly)); @@ -853,7 +853,7 @@ void tst_QXmlQuery::bindVariableXSLTSuccess() const stylesheet.bindVariable(QLatin1String("paramSelectWithTypeIntBoundWithBindVariableRequired"), QVariant(QLatin1String("param5"))); - stylesheet.setQuery(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/parameters.xsl")))); + stylesheet.setQuery(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/parameters.xsl")))); QVERIFY(stylesheet.isValid()); @@ -961,7 +961,7 @@ void tst_QXmlQuery::evaluateToReceiver() PushBaseliner push(stream, query.namePool()); query.evaluateTo(&push); - const QString baselineName(inputFile(QLatin1String("pushBaselines/") + inputQuery.left(inputQuery.length() - 2) + QString::fromLatin1("ref"))); + const QString baselineName(inputFile(QLatin1String(SRCDIR "pushBaselines/") + inputQuery.left(inputQuery.length() - 2) + QString::fromLatin1("ref"))); QFile baseline(baselineName); if(baseline.exists()) @@ -1301,7 +1301,7 @@ void tst_QXmlQuery::basicQtToXQueryTypeCheck() const // TODO Do with different QDateTime time specs query.bindVariable(QLatin1String("fromQDateTime"), QXmlItem(QDateTime(QDate(2001, 9, 10), QTime(1, 2, 3)))); query.bindVariable(QLatin1String("fromDouble"), QXmlItem(double(3))); - query.bindVariable(QLatin1String("fromFloat"), QXmlItem(float(4))); +// query.bindVariable(QLatin1String("fromFloat"), QXmlItem(float(4))); query.bindVariable(QLatin1String("integer"), QXmlItem(5)); query.bindVariable(QLatin1String("fromQString"), QXmlItem(QString::fromLatin1("A QString"))); query.bindVariable(QLatin1String("fromQChar"), QXmlItem(QChar::fromLatin1('C'))); @@ -1794,11 +1794,11 @@ void tst_QXmlQuery::setFocusQUrl() const { QXmlQuery query(QXmlQuery::XSLT20); - const TestURIResolver resolver(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/documentElement.xml")))); + const TestURIResolver resolver(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml")))); query.setUriResolver(&resolver); QVERIFY(query.setFocus(QUrl(QLatin1String("arbitraryURI")))); - query.setQuery(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/copyWholeDocument.xsl")))); + query.setQuery(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/copyWholeDocument.xsl")))); QVERIFY(query.isValid()); QBuffer result; @@ -2012,7 +2012,7 @@ void tst_QXmlQuery::fnDocNetworkAccessSuccess_data() const QTest::addColumn<QByteArray>("expectedOutput"); QTest::newRow("file scheme") - << inputFileAsURI(QLatin1String("input.xml")) + << inputFileAsURI(QLatin1String(SRCDIR "input.xml")) << QByteArray("<!-- This is just a file for testing. --><input/>"); QTest::newRow("data scheme with ASCII") @@ -2993,7 +2993,7 @@ void tst_QXmlQuery::setInitialTemplateNameQXmlName() const QCOMPARE(query.initialTemplateName(), name); - query.setQuery(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/namedTemplate.xsl")))); + query.setQuery(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/namedTemplate.xsl")))); QVERIFY(query.isValid()); QBuffer result; @@ -3055,7 +3055,7 @@ void tst_QXmlQuery::setNetworkAccessManager() const /* Ensure fn:doc() picks up the right QNetworkAccessManager. */ { NetworkOverrider networkOverrider(QUrl(QLatin1String("tag:example.com:DOESNOTEXIST")), - QUrl(inputFile(QLatin1String("../xmlpatterns/queries/simpleDocument.xml")))); + QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/queries/simpleDocument.xml")))); QXmlQuery query; query.setNetworkAccessManager(&networkOverrider); @@ -3071,7 +3071,7 @@ void tst_QXmlQuery::setNetworkAccessManager() const /* Ensure setQuery() is using the right network manager. */ { NetworkOverrider networkOverrider(QUrl(QLatin1String("tag:example.com:DOESNOTEXIST")), - QUrl(inputFile(QLatin1String("../xmlpatterns/queries/concat.xq")))); + QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/queries/concat.xq")))); QXmlQuery query; query.setNetworkAccessManager(&networkOverrider); @@ -3129,9 +3129,9 @@ void tst_QXmlQuery::multipleDocsAndFocus() const /* We use string concatenation, since variable bindings might disturb what * we're testing. */ query.setQuery(QLatin1String("string(doc('") + - inputFile(QLatin1String("../xmlpatterns/queries/simpleDocument.xml")) + + inputFile(QLatin1String(SRCDIR "../xmlpatterns/queries/simpleDocument.xml")) + QLatin1String("'))")); - query.setFocus(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/documentElement.xml")))); + query.setFocus(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml")))); query.setQuery(QLatin1String("string(.)")); QStringList result; @@ -3155,11 +3155,11 @@ void tst_QXmlQuery::multipleEvaluationsWithDifferentFocus() const QXmlQuery query; QStringList result; - query.setFocus(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/documentElement.xml")))); + query.setFocus(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml")))); query.setQuery(QLatin1String("string(.)")); QVERIFY(query.evaluateTo(&result)); - query.setFocus(QUrl(inputFile(QLatin1String("../xmlpatterns/stylesheets/documentElement.xml")))); + query.setFocus(QUrl(inputFile(QLatin1String(SRCDIR "../xmlpatterns/stylesheets/documentElement.xml")))); QVERIFY(query.evaluateTo(&result)); } diff --git a/tests/auto/runQtXmlPatternsTests.sh b/tests/auto/runQtXmlPatternsTests.sh deleted file mode 100755 index 41d6c83..0000000 --- a/tests/auto/runQtXmlPatternsTests.sh +++ /dev/null @@ -1,61 +0,0 @@ -#!/bin/sh -# Runs all the tests specific to QtXmlPatterns in one go. - -# If you add a test, remember to update ./auto.pro too. -# checkxmlfiles is not part of Patternist, but since it shares test code -# and use Patternist, we include it as well. -# -# Sorted alphabetically, with the difference that xmlpatternsxqts appears -# before xmlpattersview, xmlpatternsdiagnosticsts, and xmlpatternsxslts, since -# they have the former as dependency. -tests=" \ -checkxmlfiles \ -patternistexamplefiletree \ -patternistexamples \ -patternistheaders \ -qabstractmessagehandler \ -qabstracturiresolver \ -qabstractxmlforwarditerator \ -qabstractxmlnodemodel \ -qabstractxmlreceiver \ -qapplicationargumentparser \ -qautoptr \ -qsimplexmlnodemodel \ -qsourcelocation \ -qtokenautomaton \ -qxmlformatter \ -qxmlitem \ -qxmlname \ -qxmlnamepool \ -qxmlnodemodelindex \ -qxmlquery \ -qxmlresultitems \ -qxmlserializer \ -xmlpatterns \ -xmlpatternsxqts \ -xmlpatternsdiagnosticsts \ -xmlpatternsschema \ -xmlpatternsschemats \ -xmlpatternsview \ -xmlpatternsxslts" - -os=`uname` - -for test in $tests; do - cd $test - make distclean - qmake - make - - if [ $os = "Darwin" ]; then - ./tst_"$test".app/Contents/MacOS/tst_"$test" - else - ./tst_$test - fi - - if [ $? -ne 0 ]; then - exit $? - else - cd .. - fi -done diff --git a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp b/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp index de65599..8474144f 100644 --- a/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp +++ b/tests/auto/selftests/benchlibwalltime/tst_benchlibwalltime.cpp @@ -50,6 +50,7 @@ class tst_BenchlibWalltime: public QObject private slots: void waitForOneThousand(); void waitForFourThousand(); + void qbenchmark_once(); }; void tst_BenchlibWalltime::waitForOneThousand() @@ -66,6 +67,16 @@ void tst_BenchlibWalltime::waitForFourThousand() } } +void tst_BenchlibWalltime::qbenchmark_once() +{ + int iterations = 0; + QBENCHMARK_ONCE { + ++iterations; + } + QCOMPARE(iterations, 1); +} + + QTEST_MAIN(tst_BenchlibWalltime) #include "tst_benchlibwalltime.moc" diff --git a/tests/auto/selftests/expected_benchlibwalltime.txt b/tests/auto/selftests/expected_benchlibwalltime.txt index 03f2465..ec2d020 100644 --- a/tests/auto/selftests/expected_benchlibwalltime.txt +++ b/tests/auto/selftests/expected_benchlibwalltime.txt @@ -7,6 +7,9 @@ PASS : tst_BenchlibWalltime::waitForOneThousand() RESULT : tst_BenchlibWalltime::waitForFourThousand(): 4,000 msec per iteration (total: 4000, iterations: 1) PASS : tst_BenchlibWalltime::waitForFourThousand() +RESULT : tst_BenchlibWalltime::qbenchmark_once(): + 0 msec per iteration (total: 0, iterations: 1) +PASS : tst_BenchlibWalltime::qbenchmark_once() PASS : tst_BenchlibWalltime::cleanupTestCase() -Totals: 4 passed, 0 failed, 0 skipped +Totals: 5 passed, 0 failed, 0 skipped ********* Finished testing of tst_BenchlibWalltime ********* diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h index 6ce3579..166dc60 100644 --- a/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h +++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Bottom.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'Dialog_with_Buttons_Bottom.ui' +** Form generated from reading UI file 'Dialog_with_Buttons_Bottom.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DIALOG_WITH_BUTTONS_BOTTOM_H diff --git a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h index a2a9078..cbb3cc4 100644 --- a/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h +++ b/tests/auto/uic/baseline/Dialog_with_Buttons_Right.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'Dialog_with_Buttons_Right.ui' +** Form generated from reading UI file 'Dialog_with_Buttons_Right.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DIALOG_WITH_BUTTONS_RIGHT_H diff --git a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h index d89bbef..bb06a54 100644 --- a/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h +++ b/tests/auto/uic/baseline/Dialog_without_Buttons.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'Dialog_without_Buttons.ui' +** Form generated from reading UI file 'Dialog_without_Buttons.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DIALOG_WITHOUT_BUTTONS_H diff --git a/tests/auto/uic/baseline/Main_Window.ui.h b/tests/auto/uic/baseline/Main_Window.ui.h index 7404eca..07a8389 100644 --- a/tests/auto/uic/baseline/Main_Window.ui.h +++ b/tests/auto/uic/baseline/Main_Window.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'Main_Window.ui' +** Form generated from reading UI file 'Main_Window.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef MAIN_WINDOW_H diff --git a/tests/auto/uic/baseline/Widget.ui.h b/tests/auto/uic/baseline/Widget.ui.h index a7a3198..bba9fd9 100644 --- a/tests/auto/uic/baseline/Widget.ui.h +++ b/tests/auto/uic/baseline/Widget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'Widget.ui' +** Form generated from reading UI file 'Widget.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef WIDGET_H diff --git a/tests/auto/uic/baseline/addlinkdialog.ui.h b/tests/auto/uic/baseline/addlinkdialog.ui.h index 34caca9..920a8f7 100644 --- a/tests/auto/uic/baseline/addlinkdialog.ui.h +++ b/tests/auto/uic/baseline/addlinkdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'addlinkdialog.ui' +** Form generated from reading UI file 'addlinkdialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef ADDLINKDIALOG_H diff --git a/tests/auto/uic/baseline/addtorrentform.ui.h b/tests/auto/uic/baseline/addtorrentform.ui.h index fafcb16..185ce2e 100644 --- a/tests/auto/uic/baseline/addtorrentform.ui.h +++ b/tests/auto/uic/baseline/addtorrentform.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'addtorrentform.ui' +** Form generated from reading UI file 'addtorrentform.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef ADDTORRENTFORM_H diff --git a/tests/auto/uic/baseline/authenticationdialog.ui.h b/tests/auto/uic/baseline/authenticationdialog.ui.h index 33acd91..b46c05d 100644 --- a/tests/auto/uic/baseline/authenticationdialog.ui.h +++ b/tests/auto/uic/baseline/authenticationdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'authenticationdialog.ui' +** Form generated from reading UI file 'authenticationdialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef AUTHENTICATIONDIALOG_H diff --git a/tests/auto/uic/baseline/backside.ui.h b/tests/auto/uic/baseline/backside.ui.h index 7cc5ee9..6fdab4b 100644 --- a/tests/auto/uic/baseline/backside.ui.h +++ b/tests/auto/uic/baseline/backside.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'backside.ui' +** Form generated from reading UI file 'backside.ui' ** ** Created: Tue Jun 17 09:18:47 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef BACKSIDE_H diff --git a/tests/auto/uic/baseline/batchtranslation.ui.h b/tests/auto/uic/baseline/batchtranslation.ui.h index 4cdad44..2567fd9 100644 --- a/tests/auto/uic/baseline/batchtranslation.ui.h +++ b/tests/auto/uic/baseline/batchtranslation.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'batchtranslation.ui' +** Form generated from reading UI file 'batchtranslation.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef BATCHTRANSLATION_H diff --git a/tests/auto/uic/baseline/bookmarkdialog.ui.h b/tests/auto/uic/baseline/bookmarkdialog.ui.h index b5af0cf..1db7dca 100644 --- a/tests/auto/uic/baseline/bookmarkdialog.ui.h +++ b/tests/auto/uic/baseline/bookmarkdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'bookmarkdialog.ui' +** Form generated from reading UI file 'bookmarkdialog.ui' ** ** Created: Mon Jun 16 18:01:55 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef BOOKMARKDIALOG_H diff --git a/tests/auto/uic/baseline/bookwindow.ui.h b/tests/auto/uic/baseline/bookwindow.ui.h index eae06d9..776f9e9 100644 --- a/tests/auto/uic/baseline/bookwindow.ui.h +++ b/tests/auto/uic/baseline/bookwindow.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'bookwindow.ui' +** Form generated from reading UI file 'bookwindow.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef BOOKWINDOW_H diff --git a/tests/auto/uic/baseline/browserwidget.ui.h b/tests/auto/uic/baseline/browserwidget.ui.h index 67f637f..c1ca60f 100644 --- a/tests/auto/uic/baseline/browserwidget.ui.h +++ b/tests/auto/uic/baseline/browserwidget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'browserwidget.ui' +** Form generated from reading UI file 'browserwidget.ui' ** ** Created: Mon Jun 16 18:01:09 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef BROWSERWIDGET_H diff --git a/tests/auto/uic/baseline/calculator.ui.h b/tests/auto/uic/baseline/calculator.ui.h index aa70aff..f476d9b 100644 --- a/tests/auto/uic/baseline/calculator.ui.h +++ b/tests/auto/uic/baseline/calculator.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'calculator.ui' +** Form generated from reading UI file 'calculator.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CALCULATOR_H diff --git a/tests/auto/uic/baseline/calculatorform.ui.h b/tests/auto/uic/baseline/calculatorform.ui.h index 8e9e620..1c575e8 100644 --- a/tests/auto/uic/baseline/calculatorform.ui.h +++ b/tests/auto/uic/baseline/calculatorform.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'calculatorform.ui' +** Form generated from reading UI file 'calculatorform.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CALCULATORFORM_H diff --git a/tests/auto/uic/baseline/certificateinfo.ui.h b/tests/auto/uic/baseline/certificateinfo.ui.h index bbb5d5f..548bec5 100644 --- a/tests/auto/uic/baseline/certificateinfo.ui.h +++ b/tests/auto/uic/baseline/certificateinfo.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'certificateinfo.ui' +** Form generated from reading UI file 'certificateinfo.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CERTIFICATEINFO_H diff --git a/tests/auto/uic/baseline/chatdialog.ui.h b/tests/auto/uic/baseline/chatdialog.ui.h index 7d19376..c9f2693 100644 --- a/tests/auto/uic/baseline/chatdialog.ui.h +++ b/tests/auto/uic/baseline/chatdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'chatdialog.ui' +** Form generated from reading UI file 'chatdialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CHATDIALOG_H diff --git a/tests/auto/uic/baseline/chatmainwindow.ui.h b/tests/auto/uic/baseline/chatmainwindow.ui.h index 93ce435..87ac882 100644 --- a/tests/auto/uic/baseline/chatmainwindow.ui.h +++ b/tests/auto/uic/baseline/chatmainwindow.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'chatmainwindow.ui' +** Form generated from reading UI file 'chatmainwindow.ui' ** ** Created: Mon Sep 1 09:31:02 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CHATMAINWINDOW_H diff --git a/tests/auto/uic/baseline/chatsetnickname.ui.h b/tests/auto/uic/baseline/chatsetnickname.ui.h index c1fd62b..54f48e7 100644 --- a/tests/auto/uic/baseline/chatsetnickname.ui.h +++ b/tests/auto/uic/baseline/chatsetnickname.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'chatsetnickname.ui' +** Form generated from reading UI file 'chatsetnickname.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CHATSETNICKNAME_H diff --git a/tests/auto/uic/baseline/config.ui.h b/tests/auto/uic/baseline/config.ui.h index 20de66f..7933178 100644 --- a/tests/auto/uic/baseline/config.ui.h +++ b/tests/auto/uic/baseline/config.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'config.ui' +** Form generated from reading UI file 'config.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CONFIG_H diff --git a/tests/auto/uic/baseline/connectdialog.ui.h b/tests/auto/uic/baseline/connectdialog.ui.h index b90de56..d7e0eaf 100644 --- a/tests/auto/uic/baseline/connectdialog.ui.h +++ b/tests/auto/uic/baseline/connectdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'connectdialog.ui' +** Form generated from reading UI file 'connectdialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CONNECTDIALOG_H diff --git a/tests/auto/uic/baseline/controller.ui.h b/tests/auto/uic/baseline/controller.ui.h index 29985c1..c5cd1fe 100644 --- a/tests/auto/uic/baseline/controller.ui.h +++ b/tests/auto/uic/baseline/controller.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'controller.ui' +** Form generated from reading UI file 'controller.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef CONTROLLER_H diff --git a/tests/auto/uic/baseline/cookies.ui.h b/tests/auto/uic/baseline/cookies.ui.h index e4c70ec..0b4d88a 100644 --- a/tests/auto/uic/baseline/cookies.ui.h +++ b/tests/auto/uic/baseline/cookies.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'cookies.ui' +** Form generated from reading UI file 'cookies.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef COOKIES_H diff --git a/tests/auto/uic/baseline/cookiesexceptions.ui.h b/tests/auto/uic/baseline/cookiesexceptions.ui.h index 5a436eb..12e80d8 100644 --- a/tests/auto/uic/baseline/cookiesexceptions.ui.h +++ b/tests/auto/uic/baseline/cookiesexceptions.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'cookiesexceptions.ui' +** Form generated from reading UI file 'cookiesexceptions.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef COOKIESEXCEPTIONS_H diff --git a/tests/auto/uic/baseline/default.ui.h b/tests/auto/uic/baseline/default.ui.h index 7717694..f68a93e 100644 --- a/tests/auto/uic/baseline/default.ui.h +++ b/tests/auto/uic/baseline/default.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'default.ui' +** Form generated from reading UI file 'default.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DEFAULT_H diff --git a/tests/auto/uic/baseline/dialog.ui.h b/tests/auto/uic/baseline/dialog.ui.h index 307f2fc..d65c10a 100644 --- a/tests/auto/uic/baseline/dialog.ui.h +++ b/tests/auto/uic/baseline/dialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'dialog.ui' +** Form generated from reading UI file 'dialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DIALOG_H diff --git a/tests/auto/uic/baseline/downloaditem.ui.h b/tests/auto/uic/baseline/downloaditem.ui.h index 7df99df..341fdd2 100644 --- a/tests/auto/uic/baseline/downloaditem.ui.h +++ b/tests/auto/uic/baseline/downloaditem.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'downloaditem.ui' +** Form generated from reading UI file 'downloaditem.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DOWNLOADITEM_H diff --git a/tests/auto/uic/baseline/downloads.ui.h b/tests/auto/uic/baseline/downloads.ui.h index b4739f6..70a038a 100644 --- a/tests/auto/uic/baseline/downloads.ui.h +++ b/tests/auto/uic/baseline/downloads.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'downloads.ui' +** Form generated from reading UI file 'downloads.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef DOWNLOADS_H diff --git a/tests/auto/uic/baseline/embeddeddialog.ui.h b/tests/auto/uic/baseline/embeddeddialog.ui.h index 7df8ab8..3dd36a6 100644 --- a/tests/auto/uic/baseline/embeddeddialog.ui.h +++ b/tests/auto/uic/baseline/embeddeddialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'embeddeddialog.ui' +** Form generated from reading UI file 'embeddeddialog.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef EMBEDDEDDIALOG_H diff --git a/tests/auto/uic/baseline/filespage.ui.h b/tests/auto/uic/baseline/filespage.ui.h index f946002..15a0f5b 100644 --- a/tests/auto/uic/baseline/filespage.ui.h +++ b/tests/auto/uic/baseline/filespage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'filespage.ui' +** Form generated from reading UI file 'filespage.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef FILESPAGE_H diff --git a/tests/auto/uic/baseline/filternamedialog.ui.h b/tests/auto/uic/baseline/filternamedialog.ui.h index f4306ea..ad435c1 100644 --- a/tests/auto/uic/baseline/filternamedialog.ui.h +++ b/tests/auto/uic/baseline/filternamedialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'filternamedialog.ui' +** Form generated from reading UI file 'filternamedialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef FILTERNAMEDIALOG_H diff --git a/tests/auto/uic/baseline/filterpage.ui.h b/tests/auto/uic/baseline/filterpage.ui.h index ebac375..e7fb7fb 100644 --- a/tests/auto/uic/baseline/filterpage.ui.h +++ b/tests/auto/uic/baseline/filterpage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'filterpage.ui' +** Form generated from reading UI file 'filterpage.ui' ** ** Created: Mon Jun 16 17:58:59 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef FILTERPAGE_H diff --git a/tests/auto/uic/baseline/finddialog.ui.h b/tests/auto/uic/baseline/finddialog.ui.h index 091c54a..7a3620a 100644 --- a/tests/auto/uic/baseline/finddialog.ui.h +++ b/tests/auto/uic/baseline/finddialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'finddialog.ui' +** Form generated from reading UI file 'finddialog.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef FINDDIALOG_H diff --git a/tests/auto/uic/baseline/form.ui.h b/tests/auto/uic/baseline/form.ui.h index 3f85b03..60f5a14 100644 --- a/tests/auto/uic/baseline/form.ui.h +++ b/tests/auto/uic/baseline/form.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'form.ui' +** Form generated from reading UI file 'form.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef FORM_H diff --git a/tests/auto/uic/baseline/formwindowsettings.ui.h b/tests/auto/uic/baseline/formwindowsettings.ui.h index 9e97b48..2e29290 100644 --- a/tests/auto/uic/baseline/formwindowsettings.ui.h +++ b/tests/auto/uic/baseline/formwindowsettings.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'formwindowsettings.ui' +** Form generated from reading UI file 'formwindowsettings.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef FORMWINDOWSETTINGS_H diff --git a/tests/auto/uic/baseline/generalpage.ui.h b/tests/auto/uic/baseline/generalpage.ui.h index 0289f50..0dcc6ec 100644 --- a/tests/auto/uic/baseline/generalpage.ui.h +++ b/tests/auto/uic/baseline/generalpage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'generalpage.ui' +** Form generated from reading UI file 'generalpage.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef GENERALPAGE_H diff --git a/tests/auto/uic/baseline/gridpanel.ui.h b/tests/auto/uic/baseline/gridpanel.ui.h index f79ffa9..1bc2f04 100644 --- a/tests/auto/uic/baseline/gridpanel.ui.h +++ b/tests/auto/uic/baseline/gridpanel.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'gridpanel.ui' +** Form generated from reading UI file 'gridpanel.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef GRIDPANEL_H diff --git a/tests/auto/uic/baseline/helpdialog.ui.h b/tests/auto/uic/baseline/helpdialog.ui.h index 608dba3..b003e7d 100644 --- a/tests/auto/uic/baseline/helpdialog.ui.h +++ b/tests/auto/uic/baseline/helpdialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'helpdialog.ui' +** Form generated from reading UI file 'helpdialog.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef HELPDIALOG_H diff --git a/tests/auto/uic/baseline/history.ui.h b/tests/auto/uic/baseline/history.ui.h index 4b84e68..16553df 100644 --- a/tests/auto/uic/baseline/history.ui.h +++ b/tests/auto/uic/baseline/history.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'history.ui' +** Form generated from reading UI file 'history.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef HISTORY_H diff --git a/tests/auto/uic/baseline/identifierpage.ui.h b/tests/auto/uic/baseline/identifierpage.ui.h index 7839600..24aecf8 100644 --- a/tests/auto/uic/baseline/identifierpage.ui.h +++ b/tests/auto/uic/baseline/identifierpage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'identifierpage.ui' +** Form generated from reading UI file 'identifierpage.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef IDENTIFIERPAGE_H diff --git a/tests/auto/uic/baseline/imagedialog.ui.h b/tests/auto/uic/baseline/imagedialog.ui.h index 001532e..2f51b65 100644 --- a/tests/auto/uic/baseline/imagedialog.ui.h +++ b/tests/auto/uic/baseline/imagedialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'imagedialog.ui' +** Form generated from reading UI file 'imagedialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef IMAGEDIALOG_H diff --git a/tests/auto/uic/baseline/inputpage.ui.h b/tests/auto/uic/baseline/inputpage.ui.h index 917f91b..23f2a0b 100644 --- a/tests/auto/uic/baseline/inputpage.ui.h +++ b/tests/auto/uic/baseline/inputpage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'inputpage.ui' +** Form generated from reading UI file 'inputpage.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef INPUTPAGE_H diff --git a/tests/auto/uic/baseline/installdialog.ui.h b/tests/auto/uic/baseline/installdialog.ui.h index d61377d..e6180f7 100644 --- a/tests/auto/uic/baseline/installdialog.ui.h +++ b/tests/auto/uic/baseline/installdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'installdialog.ui' +** Form generated from reading UI file 'installdialog.ui' ** ** Created: Thu Jul 10 09:47:34 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef INSTALLDIALOG_H diff --git a/tests/auto/uic/baseline/languagesdialog.ui.h b/tests/auto/uic/baseline/languagesdialog.ui.h index fbe57ca..ff837c1 100644 --- a/tests/auto/uic/baseline/languagesdialog.ui.h +++ b/tests/auto/uic/baseline/languagesdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'languagesdialog.ui' +** Form generated from reading UI file 'languagesdialog.ui' ** ** Created: Fri May 15 16:58:03 2009 ** by: Qt User Interface Compiler version 4.5.2 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef LANGUAGESDIALOG_H diff --git a/tests/auto/uic/baseline/listwidgeteditor.ui.h b/tests/auto/uic/baseline/listwidgeteditor.ui.h index 127228c..50adea0 100644 --- a/tests/auto/uic/baseline/listwidgeteditor.ui.h +++ b/tests/auto/uic/baseline/listwidgeteditor.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'listwidgeteditor.ui' +** Form generated from reading UI file 'listwidgeteditor.ui' ** ** Created: Mon Jun 16 17:54:30 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef LISTWIDGETEDITOR_H diff --git a/tests/auto/uic/baseline/mainwindow.ui.h b/tests/auto/uic/baseline/mainwindow.ui.h index 73a9de2..11b0196 100644 --- a/tests/auto/uic/baseline/mainwindow.ui.h +++ b/tests/auto/uic/baseline/mainwindow.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'mainwindow.ui' +** Form generated from reading UI file 'mainwindow.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef MAINWINDOW_H diff --git a/tests/auto/uic/baseline/mainwindowbase.ui.h b/tests/auto/uic/baseline/mainwindowbase.ui.h index 4a49f95..aef2f3a 100644 --- a/tests/auto/uic/baseline/mainwindowbase.ui.h +++ b/tests/auto/uic/baseline/mainwindowbase.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'mainwindowbase.ui' +** Form generated from reading UI file 'mainwindowbase.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef MAINWINDOWBASE_H diff --git a/tests/auto/uic/baseline/mydialog.ui.h b/tests/auto/uic/baseline/mydialog.ui.h index 17cf6c5..ac7b458 100644 --- a/tests/auto/uic/baseline/mydialog.ui.h +++ b/tests/auto/uic/baseline/mydialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'mydialog.ui' +** Form generated from reading UI file 'mydialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef MYDIALOG_H diff --git a/tests/auto/uic/baseline/myform.ui.h b/tests/auto/uic/baseline/myform.ui.h index 07e1663..74c83f5 100644 --- a/tests/auto/uic/baseline/myform.ui.h +++ b/tests/auto/uic/baseline/myform.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'myform.ui' +** Form generated from reading UI file 'myform.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef MYFORM_H diff --git a/tests/auto/uic/baseline/newactiondialog.ui.h b/tests/auto/uic/baseline/newactiondialog.ui.h index 69f13fd..9c78f7b 100644 --- a/tests/auto/uic/baseline/newactiondialog.ui.h +++ b/tests/auto/uic/baseline/newactiondialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'newactiondialog.ui' +** Form generated from reading UI file 'newactiondialog.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef NEWACTIONDIALOG_H diff --git a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h index 69f1ed5..f8e5b51 100644 --- a/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h +++ b/tests/auto/uic/baseline/newdynamicpropertydialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'newdynamicpropertydialog.ui' +** Form generated from reading UI file 'newdynamicpropertydialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef NEWDYNAMICPROPERTYDIALOG_H diff --git a/tests/auto/uic/baseline/newform.ui.h b/tests/auto/uic/baseline/newform.ui.h index 37eb709..a011e9b 100644 --- a/tests/auto/uic/baseline/newform.ui.h +++ b/tests/auto/uic/baseline/newform.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'newform.ui' +** Form generated from reading UI file 'newform.ui' ** ** Created: Mon Jun 16 17:56:52 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef NEWFORM_H diff --git a/tests/auto/uic/baseline/orderdialog.ui.h b/tests/auto/uic/baseline/orderdialog.ui.h index 7460475..304a3df 100644 --- a/tests/auto/uic/baseline/orderdialog.ui.h +++ b/tests/auto/uic/baseline/orderdialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'orderdialog.ui' +** Form generated from reading UI file 'orderdialog.ui' ** ** Created: Mon Jun 16 17:55:54 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef ORDERDIALOG_H diff --git a/tests/auto/uic/baseline/outputpage.ui.h b/tests/auto/uic/baseline/outputpage.ui.h index 8199c57..0b68cb9 100644 --- a/tests/auto/uic/baseline/outputpage.ui.h +++ b/tests/auto/uic/baseline/outputpage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'outputpage.ui' +** Form generated from reading UI file 'outputpage.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef OUTPUTPAGE_H diff --git a/tests/auto/uic/baseline/pagefold.ui.h b/tests/auto/uic/baseline/pagefold.ui.h index 9c2a453..5cc5836 100644 --- a/tests/auto/uic/baseline/pagefold.ui.h +++ b/tests/auto/uic/baseline/pagefold.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'pagefold.ui' +** Form generated from reading UI file 'pagefold.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PAGEFOLD_H diff --git a/tests/auto/uic/baseline/paletteeditor.ui.h b/tests/auto/uic/baseline/paletteeditor.ui.h index 0dcefb3..9ef3920 100644 --- a/tests/auto/uic/baseline/paletteeditor.ui.h +++ b/tests/auto/uic/baseline/paletteeditor.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'paletteeditor.ui' +** Form generated from reading UI file 'paletteeditor.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PALETTEEDITOR_H diff --git a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h index bb2a959..419bc0f 100644 --- a/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h +++ b/tests/auto/uic/baseline/paletteeditoradvancedbase.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'paletteeditoradvancedbase.ui' +** Form generated from reading UI file 'paletteeditoradvancedbase.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PALETTEEDITORADVANCEDBASE_H diff --git a/tests/auto/uic/baseline/passworddialog.ui.h b/tests/auto/uic/baseline/passworddialog.ui.h index 267b5f2..be80298 100644 --- a/tests/auto/uic/baseline/passworddialog.ui.h +++ b/tests/auto/uic/baseline/passworddialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'passworddialog.ui' +** Form generated from reading UI file 'passworddialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PASSWORDDIALOG_H diff --git a/tests/auto/uic/baseline/pathpage.ui.h b/tests/auto/uic/baseline/pathpage.ui.h index 528fed8..257c191 100644 --- a/tests/auto/uic/baseline/pathpage.ui.h +++ b/tests/auto/uic/baseline/pathpage.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'pathpage.ui' +** Form generated from reading UI file 'pathpage.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PATHPAGE_H diff --git a/tests/auto/uic/baseline/phrasebookbox.ui.h b/tests/auto/uic/baseline/phrasebookbox.ui.h index f4abb1b..8c53463 100644 --- a/tests/auto/uic/baseline/phrasebookbox.ui.h +++ b/tests/auto/uic/baseline/phrasebookbox.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'phrasebookbox.ui' +** Form generated from reading UI file 'phrasebookbox.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PHRASEBOOKBOX_H diff --git a/tests/auto/uic/baseline/plugindialog.ui.h b/tests/auto/uic/baseline/plugindialog.ui.h index bb51f4a..961155b 100644 --- a/tests/auto/uic/baseline/plugindialog.ui.h +++ b/tests/auto/uic/baseline/plugindialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'plugindialog.ui' +** Form generated from reading UI file 'plugindialog.ui' ** ** Created: Mon Jun 16 17:52:32 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PLUGINDIALOG_H diff --git a/tests/auto/uic/baseline/preferencesdialog.ui.h b/tests/auto/uic/baseline/preferencesdialog.ui.h index 5412fe1..a1f5ac2 100644 --- a/tests/auto/uic/baseline/preferencesdialog.ui.h +++ b/tests/auto/uic/baseline/preferencesdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'preferencesdialog.ui' +** Form generated from reading UI file 'preferencesdialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PREFERENCESDIALOG_H diff --git a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h index 6d5247d..4a7b694 100644 --- a/tests/auto/uic/baseline/previewconfigurationwidget.ui.h +++ b/tests/auto/uic/baseline/previewconfigurationwidget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'previewconfigurationwidget.ui' +** Form generated from reading UI file 'previewconfigurationwidget.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PREVIEWCONFIGURATIONWIDGET_H diff --git a/tests/auto/uic/baseline/previewdialogbase.ui.h b/tests/auto/uic/baseline/previewdialogbase.ui.h index 93bfb69..822990c 100644 --- a/tests/auto/uic/baseline/previewdialogbase.ui.h +++ b/tests/auto/uic/baseline/previewdialogbase.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'previewdialogbase.ui' +** Form generated from reading UI file 'previewdialogbase.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PREVIEWDIALOGBASE_H diff --git a/tests/auto/uic/baseline/previewwidget.ui.h b/tests/auto/uic/baseline/previewwidget.ui.h index b76aa56..d8a596e 100644 --- a/tests/auto/uic/baseline/previewwidget.ui.h +++ b/tests/auto/uic/baseline/previewwidget.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'previewwidget.ui' +** Form generated from reading UI file 'previewwidget.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PREVIEWWIDGET_H diff --git a/tests/auto/uic/baseline/previewwidgetbase.ui.h b/tests/auto/uic/baseline/previewwidgetbase.ui.h index 82899b7..e131cd5 100644 --- a/tests/auto/uic/baseline/previewwidgetbase.ui.h +++ b/tests/auto/uic/baseline/previewwidgetbase.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'previewwidgetbase.ui' +** Form generated from reading UI file 'previewwidgetbase.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PREVIEWWIDGETBASE_H diff --git a/tests/auto/uic/baseline/proxy.ui.h b/tests/auto/uic/baseline/proxy.ui.h index 2ec63fa..d22edef 100644 --- a/tests/auto/uic/baseline/proxy.ui.h +++ b/tests/auto/uic/baseline/proxy.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'proxy.ui' +** Form generated from reading UI file 'proxy.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef PROXY_H diff --git a/tests/auto/uic/baseline/qfiledialog.ui.h b/tests/auto/uic/baseline/qfiledialog.ui.h index 3b3a626..ea5814f 100644 --- a/tests/auto/uic/baseline/qfiledialog.ui.h +++ b/tests/auto/uic/baseline/qfiledialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'qfiledialog.ui' +** Form generated from reading UI file 'qfiledialog.ui' ** ** Created: Mon Jun 16 17:51:48 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QFILEDIALOG_H diff --git a/tests/auto/uic/baseline/qpagesetupwidget.ui.h b/tests/auto/uic/baseline/qpagesetupwidget.ui.h index f2a68bd..4694409 100644 --- a/tests/auto/uic/baseline/qpagesetupwidget.ui.h +++ b/tests/auto/uic/baseline/qpagesetupwidget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qpagesetupwidget.ui' +** Form generated from reading UI file 'qpagesetupwidget.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QPAGESETUPWIDGET_H diff --git a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h index 16148ef..626fee7 100644 --- a/tests/auto/uic/baseline/qprintpropertieswidget.ui.h +++ b/tests/auto/uic/baseline/qprintpropertieswidget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qprintpropertieswidget.ui' +** Form generated from reading UI file 'qprintpropertieswidget.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QPRINTPROPERTIESWIDGET_H diff --git a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h index 307582a..a6360ee 100644 --- a/tests/auto/uic/baseline/qprintsettingsoutput.ui.h +++ b/tests/auto/uic/baseline/qprintsettingsoutput.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qprintsettingsoutput.ui' +** Form generated from reading UI file 'qprintsettingsoutput.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QPRINTSETTINGSOUTPUT_H diff --git a/tests/auto/uic/baseline/qprintwidget.ui.h b/tests/auto/uic/baseline/qprintwidget.ui.h index 7fa0b4f..99d6486 100644 --- a/tests/auto/uic/baseline/qprintwidget.ui.h +++ b/tests/auto/uic/baseline/qprintwidget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qprintwidget.ui' +** Form generated from reading UI file 'qprintwidget.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QPRINTWIDGET_H diff --git a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h index 846f34d..165c7d7 100644 --- a/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h +++ b/tests/auto/uic/baseline/qsqlconnectiondialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qsqlconnectiondialog.ui' +** Form generated from reading UI file 'qsqlconnectiondialog.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QSQLCONNECTIONDIALOG_H diff --git a/tests/auto/uic/baseline/qtgradientdialog.ui.h b/tests/auto/uic/baseline/qtgradientdialog.ui.h index 8a5d18c..0f2f581 100644 --- a/tests/auto/uic/baseline/qtgradientdialog.ui.h +++ b/tests/auto/uic/baseline/qtgradientdialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'qtgradientdialog.ui' +** Form generated from reading UI file 'qtgradientdialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QTGRADIENTDIALOG_H diff --git a/tests/auto/uic/baseline/qtgradienteditor.ui.h b/tests/auto/uic/baseline/qtgradienteditor.ui.h index 5eab3a8..4468552 100644 --- a/tests/auto/uic/baseline/qtgradienteditor.ui.h +++ b/tests/auto/uic/baseline/qtgradienteditor.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'qtgradienteditor.ui' +** Form generated from reading UI file 'qtgradienteditor.ui' ** ** Created: Mon Jun 16 17:50:21 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QTGRADIENTEDITOR_H diff --git a/tests/auto/uic/baseline/qtgradientview.ui.h b/tests/auto/uic/baseline/qtgradientview.ui.h index 6be5ed5..809cf5b 100644 --- a/tests/auto/uic/baseline/qtgradientview.ui.h +++ b/tests/auto/uic/baseline/qtgradientview.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qtgradientview.ui' +** Form generated from reading UI file 'qtgradientview.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QTGRADIENTVIEW_H diff --git a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h index 8836301..fd57bc6 100644 --- a/tests/auto/uic/baseline/qtgradientviewdialog.ui.h +++ b/tests/auto/uic/baseline/qtgradientviewdialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'qtgradientviewdialog.ui' +** Form generated from reading UI file 'qtgradientviewdialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QTGRADIENTVIEWDIALOG_H diff --git a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h index 03e7362..a08a16c 100644 --- a/tests/auto/uic/baseline/qtresourceeditordialog.ui.h +++ b/tests/auto/uic/baseline/qtresourceeditordialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qtresourceeditordialog.ui' +** Form generated from reading UI file 'qtresourceeditordialog.ui' ** ** Created: Mon Jun 16 17:45:38 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QTRESOURCEEDITORDIALOG_H diff --git a/tests/auto/uic/baseline/qttoolbardialog.ui.h b/tests/auto/uic/baseline/qttoolbardialog.ui.h index 7225eda..9099553 100644 --- a/tests/auto/uic/baseline/qttoolbardialog.ui.h +++ b/tests/auto/uic/baseline/qttoolbardialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'qttoolbardialog.ui' +** Form generated from reading UI file 'qttoolbardialog.ui' ** ** Created: Mon Jun 16 17:42:37 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QTTOOLBARDIALOG_H diff --git a/tests/auto/uic/baseline/querywidget.ui.h b/tests/auto/uic/baseline/querywidget.ui.h index 7697328..8afcf54 100644 --- a/tests/auto/uic/baseline/querywidget.ui.h +++ b/tests/auto/uic/baseline/querywidget.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'querywidget.ui' +** Form generated from reading UI file 'querywidget.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef QUERYWIDGET_H diff --git a/tests/auto/uic/baseline/remotecontrol.ui.h b/tests/auto/uic/baseline/remotecontrol.ui.h index 854a994..3d183f7 100644 --- a/tests/auto/uic/baseline/remotecontrol.ui.h +++ b/tests/auto/uic/baseline/remotecontrol.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'remotecontrol.ui' +** Form generated from reading UI file 'remotecontrol.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef REMOTECONTROL_H diff --git a/tests/auto/uic/baseline/saveformastemplate.ui.h b/tests/auto/uic/baseline/saveformastemplate.ui.h index 1bad01e..483239d 100644 --- a/tests/auto/uic/baseline/saveformastemplate.ui.h +++ b/tests/auto/uic/baseline/saveformastemplate.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'saveformastemplate.ui' +** Form generated from reading UI file 'saveformastemplate.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef SAVEFORMASTEMPLATE_H diff --git a/tests/auto/uic/baseline/settings.ui.h b/tests/auto/uic/baseline/settings.ui.h index 8fb0ef2..98cb6ee 100644 --- a/tests/auto/uic/baseline/settings.ui.h +++ b/tests/auto/uic/baseline/settings.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'settings.ui' +** Form generated from reading UI file 'settings.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef SETTINGS_H diff --git a/tests/auto/uic/baseline/signalslotdialog.ui.h b/tests/auto/uic/baseline/signalslotdialog.ui.h index 6adcf21..f3ce8bc 100644 --- a/tests/auto/uic/baseline/signalslotdialog.ui.h +++ b/tests/auto/uic/baseline/signalslotdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'signalslotdialog.ui' +** Form generated from reading UI file 'signalslotdialog.ui' ** ** Created: Mon Jun 16 16:18:52 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef SIGNALSLOTDIALOG_H diff --git a/tests/auto/uic/baseline/sslclient.ui.h b/tests/auto/uic/baseline/sslclient.ui.h index 1ca1c3f..aee0224 100644 --- a/tests/auto/uic/baseline/sslclient.ui.h +++ b/tests/auto/uic/baseline/sslclient.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'sslclient.ui' +** Form generated from reading UI file 'sslclient.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef SSLCLIENT_H diff --git a/tests/auto/uic/baseline/sslerrors.ui.h b/tests/auto/uic/baseline/sslerrors.ui.h index a1a46a1..f999be0 100644 --- a/tests/auto/uic/baseline/sslerrors.ui.h +++ b/tests/auto/uic/baseline/sslerrors.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'sslerrors.ui' +** Form generated from reading UI file 'sslerrors.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef SSLERRORS_H diff --git a/tests/auto/uic/baseline/statistics.ui.h b/tests/auto/uic/baseline/statistics.ui.h index b8257c4..713c1c2 100644 --- a/tests/auto/uic/baseline/statistics.ui.h +++ b/tests/auto/uic/baseline/statistics.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'statistics.ui' +** Form generated from reading UI file 'statistics.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef STATISTICS_H diff --git a/tests/auto/uic/baseline/stringlisteditor.ui.h b/tests/auto/uic/baseline/stringlisteditor.ui.h index e6daa52..23655d9 100644 --- a/tests/auto/uic/baseline/stringlisteditor.ui.h +++ b/tests/auto/uic/baseline/stringlisteditor.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'stringlisteditor.ui' +** Form generated from reading UI file 'stringlisteditor.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef STRINGLISTEDITOR_H diff --git a/tests/auto/uic/baseline/stylesheeteditor.ui.h b/tests/auto/uic/baseline/stylesheeteditor.ui.h index 7633d5b..a99f274 100644 --- a/tests/auto/uic/baseline/stylesheeteditor.ui.h +++ b/tests/auto/uic/baseline/stylesheeteditor.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'stylesheeteditor.ui' +** Form generated from reading UI file 'stylesheeteditor.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef STYLESHEETEDITOR_H diff --git a/tests/auto/uic/baseline/tabbedbrowser.ui.h b/tests/auto/uic/baseline/tabbedbrowser.ui.h index 1106f13..c234f64 100644 --- a/tests/auto/uic/baseline/tabbedbrowser.ui.h +++ b/tests/auto/uic/baseline/tabbedbrowser.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'tabbedbrowser.ui' +** Form generated from reading UI file 'tabbedbrowser.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TABBEDBROWSER_H diff --git a/tests/auto/uic/baseline/tablewidgeteditor.ui.h b/tests/auto/uic/baseline/tablewidgeteditor.ui.h index 4769c42..38fb832 100644 --- a/tests/auto/uic/baseline/tablewidgeteditor.ui.h +++ b/tests/auto/uic/baseline/tablewidgeteditor.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'tablewidgeteditor.ui' +** Form generated from reading UI file 'tablewidgeteditor.ui' ** ** Created: Mon Jun 16 17:48:45 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TABLEWIDGETEDITOR_H diff --git a/tests/auto/uic/baseline/tetrixwindow.ui.h b/tests/auto/uic/baseline/tetrixwindow.ui.h index a848545..50ed416 100644 --- a/tests/auto/uic/baseline/tetrixwindow.ui.h +++ b/tests/auto/uic/baseline/tetrixwindow.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'tetrixwindow.ui' +** Form generated from reading UI file 'tetrixwindow.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TETRIXWINDOW_H diff --git a/tests/auto/uic/baseline/textfinder.ui.h b/tests/auto/uic/baseline/textfinder.ui.h index f1d51f9..546ff17 100644 --- a/tests/auto/uic/baseline/textfinder.ui.h +++ b/tests/auto/uic/baseline/textfinder.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'textfinder.ui' +** Form generated from reading UI file 'textfinder.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TEXTFINDER_H diff --git a/tests/auto/uic/baseline/topicchooser.ui.h b/tests/auto/uic/baseline/topicchooser.ui.h index 8404d0c..65cf205 100644 --- a/tests/auto/uic/baseline/topicchooser.ui.h +++ b/tests/auto/uic/baseline/topicchooser.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'topicchooser.ui' +** Form generated from reading UI file 'topicchooser.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TOPICCHOOSER_H diff --git a/tests/auto/uic/baseline/translatedialog.ui.h b/tests/auto/uic/baseline/translatedialog.ui.h index b0df4b5..a85f5ed 100644 --- a/tests/auto/uic/baseline/translatedialog.ui.h +++ b/tests/auto/uic/baseline/translatedialog.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'translatedialog.ui' +** Form generated from reading UI file 'translatedialog.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TRANSLATEDIALOG_H diff --git a/tests/auto/uic/baseline/translationsettings.ui.h b/tests/auto/uic/baseline/translationsettings.ui.h index 7ce0485..e36545e 100644 --- a/tests/auto/uic/baseline/translationsettings.ui.h +++ b/tests/auto/uic/baseline/translationsettings.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'translationsettings.ui' +** Form generated from reading UI file 'translationsettings.ui' ** ** Created: Mon Sep 1 09:31:03 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TRANSLATIONSETTINGS_H diff --git a/tests/auto/uic/baseline/treewidgeteditor.ui.h b/tests/auto/uic/baseline/treewidgeteditor.ui.h index eb4875d..2fe6344 100644 --- a/tests/auto/uic/baseline/treewidgeteditor.ui.h +++ b/tests/auto/uic/baseline/treewidgeteditor.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'treewidgeteditor.ui' +** Form generated from reading UI file 'treewidgeteditor.ui' ** ** Created: Mon Jun 16 17:47:26 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TREEWIDGETEDITOR_H diff --git a/tests/auto/uic/baseline/trpreviewtool.ui.h b/tests/auto/uic/baseline/trpreviewtool.ui.h index 2575cda..5f92583 100644 --- a/tests/auto/uic/baseline/trpreviewtool.ui.h +++ b/tests/auto/uic/baseline/trpreviewtool.ui.h @@ -41,12 +41,12 @@ */ /******************************************************************************** -** Form generated from reading ui file 'trpreviewtool.ui' +** Form generated from reading UI file 'trpreviewtool.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef TRPREVIEWTOOL_H diff --git a/tests/auto/uic/baseline/validators.ui.h b/tests/auto/uic/baseline/validators.ui.h index 03bc898..07e114a 100644 --- a/tests/auto/uic/baseline/validators.ui.h +++ b/tests/auto/uic/baseline/validators.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'validators.ui' +** Form generated from reading UI file 'validators.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef VALIDATORS_H diff --git a/tests/auto/uic/baseline/wateringconfigdialog.ui.h b/tests/auto/uic/baseline/wateringconfigdialog.ui.h index 02de59b..43120a5 100644 --- a/tests/auto/uic/baseline/wateringconfigdialog.ui.h +++ b/tests/auto/uic/baseline/wateringconfigdialog.ui.h @@ -1,10 +1,10 @@ /******************************************************************************** -** Form generated from reading ui file 'wateringconfigdialog.ui' +** Form generated from reading UI file 'wateringconfigdialog.ui' ** ** Created: Thu Jul 10 09:47:35 2008 ** by: Qt User Interface Compiler version 4.5.0 ** -** WARNING! All changes made in this file will be lost when recompiling ui file! +** WARNING! All changes made in this file will be lost when recompiling UI file! ********************************************************************************/ #ifndef WATERINGCONFIGDIALOG_H diff --git a/tests/auto/uiloader/baseline/css_task259226_spinboxes.ui b/tests/auto/uiloader/baseline/css_task259226_spinboxes.ui new file mode 100644 index 0000000..eb9ade3 --- /dev/null +++ b/tests/auto/uiloader/baseline/css_task259226_spinboxes.ui @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +<ui version="4.0"> + <class>Form</class> + <widget class="QWidget" name="Form"> + <property name="geometry"> + <rect> + <x>0</x> + <y>0</y> + <width>320</width> + <height>116</height> + </rect> + </property> + <property name="windowTitle"> + <string>Form</string> + </property> + <property name="styleSheet"> + <string notr="true">#spinbox1::up-button{ + subcontrol-origin: border; + subcontrol-position: top left; + } +#spinbox1::down-button { + subcontrol-origin: border; + subcontrol-position: bottom left; + } + + +#spinbox2::up-button{ + subcontrol-origin: border; + subcontrol-position: center left; + left: 0px; + height: 100%; + top: 0px; + } +#spinbox2::down-button { + subcontrol-origin: border; + subcontrol-position: center right; + right: 0px; + height: 100%; + top: 0px; + } + + + +#spinbox3::up-button{ + subcontrol-origin: border; + subcontrol-position: top left; + } + + +#spinbox4 { padding: 20px 1px; } +#spinbox4::up-button{ + subcontrol-origin: border; + subcontrol-position: top center; + width:100%; + height: 20px; + } +#spinbox4::down-button { + subcontrol-origin: border; + subcontrol-position: bottom center; + width:100%; + height: 20px; + } + +</string> + </property> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QSpinBox" name="spinbox1"/> + </item> + <item row="0" column="1"> + <widget class="QSpinBox" name="spinbox2"/> + </item> + <item row="1" column="0"> + <widget class="QSpinBox" name="spinbox3"/> + </item> + <item row="1" column="1"> + <widget class="QSpinBox" name="spinbox4"/> + </item> + </layout> + </widget> + <resources/> + <connections/> +</ui> diff --git a/tests/auto/windowsmobile/test/test.pro b/tests/auto/windowsmobile/test/test.pro index 2420bf1..b7f65a9 100644 --- a/tests/auto/windowsmobile/test/test.pro +++ b/tests/auto/windowsmobile/test/test.pro @@ -8,8 +8,7 @@ RESOURCES += windowsmobile.qrc TARGET = tst_windowsmobile wincewm*: { - addFiles.sources = \ - ../testQMenuBar/*.exe + addFiles.sources = $$OUT_PWD/../testQMenuBar/*.exe addFiles.path = "\Program Files\tst_windowsmobile" diff --git a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp index 796f635..67ca3fa 100644 --- a/tests/auto/xmlpatterns/tst_xmlpatterns.cpp +++ b/tests/auto/xmlpatterns/tst_xmlpatterns.cpp @@ -156,7 +156,7 @@ void tst_XmlPatterns::xquerySupport() const QByteArray rawProducedStderr((process.readAllStandardError())); const QString fixedStderr(QString::fromLocal8Bit(rawProducedStderr).remove(m_filenameInStderr)); - const QString errorFileName(inputFile(QLatin1String("stderrBaselines/") + + const QString errorFileName(inputFile(QLatin1String(SRCDIR "stderrBaselines/") + QString::fromUtf8(QTest::currentDataTag()).remove(m_normalizeTestName) + QLatin1String(".txt"))); @@ -223,7 +223,7 @@ void tst_XmlPatterns::xquerySupport_data() const #endif /* Check one file for existence, to avoid possible false positives. */ - QVERIFY(QFile::exists(inputFile(QLatin1String("queries/onePlusOne.xq")))); + QVERIFY(QFile::exists(inputFile(QLatin1String(SRCDIR "queries/onePlusOne.xq")))); QTest::addColumn<int>("expectedExitCode"); QTest::addColumn<QByteArray>("expectedQueryOutput"); @@ -234,21 +234,21 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("A simple math query") << 0 << QByteArray("2\n") - << QStringList((QLatin1String("queries/onePlusOne.xq"))) + << QStringList((QLatin1String(SRCDIR "queries/onePlusOne.xq"))) << QString() << QString(); QTest::newRow("An unbound external variable") << 2 << QByteArray() - << QStringList(QLatin1String("queries/externalVariable.xq")) + << QStringList(QLatin1String(SRCDIR "queries/externalVariable.xq")) << QString() << QString(); QTest::newRow("Bind an external variable") << 0 << QByteArray("1 4<e>1</e>true\n") - << (QStringList() << QLatin1String("queries/externalVariable.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/externalVariable.xq") << QLatin1String("-param") << QLatin1String("externalVariable=1")) << QString() @@ -259,21 +259,21 @@ void tst_XmlPatterns::xquerySupport_data() const << QByteArray("1 4<e>1</e>true\n") << (QStringList() << QLatin1String("-param") << QLatin1String("externalVariable=1") - << QLatin1String("queries/externalVariable.xq")) + << QLatin1String(SRCDIR "queries/externalVariable.xq")) << QString() << QString(); QTest::newRow("Use fn:doc") << 0 << QByteArray("<e xmlns=\"http://example.com\" xmlns:p=\"http://example.com/P\" attr=\"1\" p:attr=\"\">\n <?target data?>\n <!-- a comment -->\n <e/>text <f/>text node</e>\n") - << QStringList(QLatin1String("queries/openDocument.xq")) + << QStringList(QLatin1String(SRCDIR "queries/openDocument.xq")) << QString() << QString(); QTest::newRow("Use fn:doc, together with -no-format, last") << 0 << QByteArray("<e xmlns=\"http://example.com\" xmlns:p=\"http://example.com/P\" attr=\"1\" p:attr=\"\"><?target data?><!-- a comment --><e/>text <f/>text node</e>") - << (QStringList() << QLatin1String("queries/openDocument.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/openDocument.xq") << QLatin1String("-no-format")) << QString() << QString(); @@ -282,7 +282,7 @@ void tst_XmlPatterns::xquerySupport_data() const << 0 << QByteArray("<e xmlns=\"http://example.com\" xmlns:p=\"http://example.com/P\" attr=\"1\" p:attr=\"\"><?target data?><!-- a comment --><e/>text <f/>text node</e>") << (QStringList() << QLatin1String("-no-format") - << QLatin1String("queries/openDocument.xq")) + << QLatin1String(SRCDIR "queries/openDocument.xq")) << QString() << QString(); @@ -290,28 +290,28 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Make sure query paths are resolved against CWD, not the location of the executable.") << 0 << QByteArray("2\n") - << QStringList(QLatin1String("onePlusOne.xq")) + << QStringList(QLatin1String(SRCDIR "queries/onePlusOne.xq")) << QString::fromLatin1("queries") << QString(); QTest::newRow("Call fn:error()") << 2 << QByteArray() - << QStringList(QLatin1String("queries/errorFunction.xq")) + << QStringList(QLatin1String(SRCDIR "queries/errorFunction.xq")) << QString() << QString(); QTest::newRow("Evaluate a library module") << 2 << QByteArray() - << QStringList(QLatin1String("queries/simpleLibraryModule.xq")) + << QStringList(QLatin1String(SRCDIR "queries/simpleLibraryModule.xq")) << QString() << QString(); QTest::newRow("Trigger a static error.") << 2 << QByteArray() - << QStringList(QLatin1String("queries/staticError.xq")) + << QStringList(QLatin1String(SRCDIR "queries/staticError.xq")) << QString() << QString(); @@ -325,7 +325,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Open an nonexistent file") << 2 << QByteArray() - << QStringList(QLatin1String("queries/ThisFileDoesNotExist.xq")) + << QStringList(QLatin1String(SRCDIR "queries/ThisFileDoesNotExist.xq")) << QString() << QString(); @@ -334,63 +334,63 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("XQuery-function message markups") << 2 << QByteArray() - << QStringList(QLatin1String("queries/wrongArity.xq")) + << QStringList(QLatin1String(SRCDIR "queries/wrongArity.xq")) << QString() << QString(); QTest::newRow("XQuery-type message markups") << 2 << QByteArray() - << QStringList(QLatin1String("queries/typeError.xq")) + << QStringList(QLatin1String(SRCDIR "queries/typeError.xq")) << QString() << QString(); QTest::newRow("XQuery-data & XQuery-keyword message markups") << 2 << QByteArray() - << QStringList(QLatin1String("queries/zeroDivision.xq")) + << QStringList(QLatin1String(SRCDIR "queries/zeroDivision.xq")) << QString() << QString(); QTest::newRow("XQuery-uri message markups") << 2 << QByteArray() - << QStringList(QLatin1String("queries/unsupportedCollation.xq")) + << QStringList(QLatin1String(SRCDIR "queries/unsupportedCollation.xq")) << QString() << QString(); QTest::newRow("XQuery-expression message markups") << 2 << QByteArray() - << QStringList(QLatin1String("queries/invalidRegexp.xq")) + << QStringList(QLatin1String(SRCDIR "queries/invalidRegexp.xq")) << QString() << QString(); QTest::newRow("Print a list of available regexp flags(The available flags are formatted in a complex way.)") << 2 << QByteArray() - << QStringList(QLatin1String("queries/invalidRegexpFlag.xq")) + << QStringList(QLatin1String(SRCDIR "queries/invalidRegexpFlag.xq")) << QString() << QString(); QTest::newRow("Trigger an assert in QPatternist::ColorOutput. The query naturally contains an error; XPTY0004.") << 2 << QByteArray() - << QStringList(QLatin1String("queries/flwor.xq")) + << QStringList(QLatin1String(SRCDIR "queries/flwor.xq")) << QString() << QString(); QTest::newRow("Trigger a second assert in QPatternist::ColorOutput. The query naturally contains XPST0003.") << 2 << QByteArray() - << QStringList(QLatin1String("queries/syntaxError.xq")) + << QStringList(QLatin1String(SRCDIR "queries/syntaxError.xq")) << QString() << QString(); QTest::newRow("-param is missing so multiple queries appear") << 2 << QByteArray() - << (QStringList() << QLatin1String("queries/reportGlobals.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/reportGlobals.xq") << QLatin1String("fileToOpen=globals.gccxml")) << QString() << QString(); @@ -405,7 +405,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Basic use of -output, query first") << 0 << QByteArray("2\n") - << (QStringList() << QLatin1String("queries/onePlusOne.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/onePlusOne.xq") << QLatin1String("-output") << QLatin1String("basicOutput.out")) << QString() @@ -416,22 +416,22 @@ void tst_XmlPatterns::xquerySupport_data() const << QByteArray("<e/>\n") << (QStringList() << QLatin1String("-output") << QLatin1String("basicOutput2.out") - << QLatin1String("queries/oneElement.xq")) + << QLatin1String(SRCDIR "queries/oneElement.xq")) << QString() << QString::fromLatin1("basicOutput2.out"); QTest::newRow("A single query, that does not exist") << 2 << QByteArray() - << (QStringList() << QLatin1String("doesNotExist.xq")) + << (QStringList() << QLatin1String(SRCDIR "doesNotExist.xq")) << QString() << QString(); QTest::newRow("Specify two identical query names") << 2 << QByteArray() - << (QStringList() << QLatin1String("query.xq") - << QLatin1String("query.xq")) + << (QStringList() << QLatin1String(SRCDIR "query.xq") + << QLatin1String(SRCDIR "query.xq")) << QString() << QString(); @@ -461,7 +461,7 @@ void tst_XmlPatterns::xquerySupport_data() const << QByteArray() << (QStringList() << QLatin1String("-output") << filename - << QLatin1String("queries/onePlusOne.xq")) + << QLatin1String(SRCDIR "queries/onePlusOne.xq")) << QString() << filename; } @@ -478,7 +478,7 @@ void tst_XmlPatterns::xquerySupport_data() const << QByteArray("2\n") << (QStringList() << QLatin1String("-output") << outName - << QLatin1String("queries/onePlusOne.xq")) + << QLatin1String(SRCDIR "queries/onePlusOne.xq")) << QString() << outName; } @@ -486,7 +486,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("one query, and a terminating dash at the end") << 0 << QByteArray("2\n") - << (QStringList() << QLatin1String("queries/onePlusOne.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/onePlusOne.xq") << QLatin1String("-")) << QString() << QString(); @@ -495,7 +495,7 @@ void tst_XmlPatterns::xquerySupport_data() const << 0 << QByteArray("2\n") << (QStringList() << QLatin1String("-") - << QLatin1String("queries/onePlusOne.xq")) + << QLatin1String(SRCDIR "queries/onePlusOne.xq")) << QString() << QString(); @@ -582,21 +582,21 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Run a query which evaluates to the empty sequence.") << 0 << QByteArray("\n") - << (QStringList() << QLatin1String("queries/emptySequence.xq")) + << (QStringList() << QLatin1String(SRCDIR "queries/emptySequence.xq")) << QString() << QString(); QTest::newRow("Run a query which evaluates to a single document node with no children.") << 0 << QByteArray("\n") - << (QStringList() << QLatin1String("queries/onlyDocumentNode.xq")) + << (QStringList() << QLatin1String(SRCDIR "queries/onlyDocumentNode.xq")) << QString() << QString(); QTest::newRow("Invoke with invalid -param value.") << 1 << QByteArray() - << (QStringList() << QLatin1String("queries/externalVariable.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/externalVariable.xq") << QLatin1String("-param") << QLatin1String("EqualSignIsMissing")) << QString() @@ -605,7 +605,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Invoke with colon in variable name.") << 1 << QByteArray() - << (QStringList() << QLatin1String("queries/externalVariable.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/externalVariable.xq") << QLatin1String("-param") << QLatin1String("xs:name=value")) << QString() @@ -614,7 +614,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Invoke with missing name in -param arg.") << 1 << QByteArray() - << (QStringList() << QLatin1String("queries/externalVariable.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/externalVariable.xq") << QLatin1String("-param") << QLatin1String("=value")) << QString() @@ -623,7 +623,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Invoke with -param that has two adjacent equal signs.") << 0 << QByteArray("START =text END\n") - << (QStringList() << QLatin1String("queries/externalStringVariable.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/externalStringVariable.xq") << QLatin1String("-param") << QLatin1String("externalString==text")) << QString() @@ -632,7 +632,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Pass in an external variable, but the query doesn't use it.") << 0 << QByteArray("2\n") - << (QStringList() << QLatin1String("queries/onePlusOne.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/onePlusOne.xq") << QLatin1String("-param") << QLatin1String("externalString==text")) << QString() @@ -642,7 +642,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Invoke with -param that has no value.") << 0 << QByteArray("START END\n") - << (QStringList() << QLatin1String("queries/externalStringVariable.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/externalStringVariable.xq") << QLatin1String("-param") << QLatin1String("externalString=")) << QString() @@ -658,7 +658,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Use a native path") << 0 << QByteArray("2\n") - << (QStringList() << QDir::toNativeSeparators(QLatin1String("queries/onePlusOne.xq"))) + << (QStringList() << QDir::toNativeSeparators(QLatin1String(SRCDIR "queries/onePlusOne.xq"))) << QString() << QString(); @@ -673,8 +673,8 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("A valid, existing query, followed by a bogus one") << 1 << QByteArray() - << (QStringList() << QLatin1String("queries/onePlusOne.xq") - << QLatin1String("doesNotExist.xq")) + << (QStringList() << QLatin1String(SRCDIR "queries/onePlusOne.xq") + << QLatin1String(SRCDIR "doesNotExist.xq")) << QString() << QString(); */ @@ -683,8 +683,8 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Specify two different query names") << 1 << QByteArray() - << (QStringList() << QLatin1String("query1.xq") - << QLatin1String("query2.xq")) + << (QStringList() << QLatin1String(SRCDIR "query1.xq") + << QLatin1String(SRCDIR "query2.xq")) << QString() << QString(); */ @@ -698,7 +698,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Use -param twice") << 0 << QByteArray("param1 param2\n") - << (QStringList() << QLatin1String("queries/twoVariables.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/twoVariables.xq") << QLatin1String("-param") << QLatin1String("var1=param1") << QLatin1String("-param") @@ -709,7 +709,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Use -param thrice") << 0 << QByteArray("param1 param2 third\n") - << (QStringList() << QLatin1String("queries/threeVariables.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/threeVariables.xq") << QLatin1String("-param") << QLatin1String("var1=param1") << QLatin1String("-param") @@ -722,7 +722,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Specify the same parameter twice, different values") << 1 << QByteArray() - << (QStringList() << QLatin1String("queries/onePlusOne.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/onePlusOne.xq") << QLatin1String("-param") << QLatin1String("duplicated=param1") << QLatin1String("-param") @@ -733,7 +733,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Specify the same parameter twice, same values") << 1 << QByteArray() - << (QStringList() << QLatin1String("queries/onePlusOne.xq") + << (QStringList() << QLatin1String(SRCDIR "queries/onePlusOne.xq") << QLatin1String("-param") << QLatin1String("duplicated=param1") << QLatin1String("-param") @@ -744,7 +744,7 @@ void tst_XmlPatterns::xquerySupport_data() const QTest::newRow("Open a non-existing collection.") << 2 << QByteArray() - << (QStringList() << QLatin1String("queries/nonexistingCollection.xq")) + << (QStringList() << QLatin1String(SRCDIR "queries/nonexistingCollection.xq")) << QString() << QString(); @@ -806,7 +806,7 @@ void tst_XmlPatterns::stdoutFailure() const //process.setStandardOutputFile(outName); process.setWorkingDirectory(QDir::current().absoluteFilePath(QString())); - process.start(m_command, QStringList("queries/onePlusOne.xq")); + process.start(m_command, QStringList(SRCDIR "queries/onePlusOne.xq")); QCOMPARE(process.exitStatus(), QProcess::NormalExit); QVERIFY(process.waitForFinished()); @@ -867,8 +867,8 @@ void tst_XmlPatterns::xsltSupport_data() const QTest::newRow("Pass in a stylesheet file which contains an XQuery query") << 2 << QByteArray() - << (QStringList() << QLatin1String("stylesheets/queryAsStylesheet.xsl") - << QLatin1String("queries/simpleDocument.xml")) + << (QStringList() << QLatin1String(SRCDIR "stylesheets/queryAsStylesheet.xsl") + << QLatin1String(SRCDIR "queries/simpleDocument.xml")) << QString() << QString(); @@ -885,7 +885,7 @@ void tst_XmlPatterns::xsltSupport_data() const << QByteArray() << (QStringList() << QLatin1String("-initial-template") << QLatin1String("name") - << QLatin1String("queries/onePlusOne.xq")) + << QLatin1String(SRCDIR "queries/onePlusOne.xq")) << QString() << QString(); @@ -920,8 +920,8 @@ void tst_XmlPatterns::xsltSupport_data() const << (QStringList() << QLatin1String("-no-format") << QLatin1String("-initial-template") << QLatin1String("main") - << QLatin1String("stylesheets/namedAndRootTemplate.xsl") - << QLatin1String("stylesheets/documentElement.xml")) + << QLatin1String(SRCDIR "stylesheets/namedAndRootTemplate.xsl") + << QLatin1String(SRCDIR "stylesheets/documentElement.xml")) << QString() << QString(); @@ -931,8 +931,8 @@ void tst_XmlPatterns::xsltSupport_data() const << (QStringList() << QLatin1String("-no-format") << QLatin1String("-initial-template") << QLatin1String("no-template-by-this-name") - << QLatin1String("stylesheets/namedAndRootTemplate.xsl") - << QLatin1String("stylesheets/documentElement.xml")) + << QLatin1String(SRCDIR "stylesheets/namedAndRootTemplate.xsl") + << QLatin1String(SRCDIR "stylesheets/documentElement.xml")) << QString() << QString(); @@ -942,7 +942,7 @@ void tst_XmlPatterns::xsltSupport_data() const << (QStringList() << QLatin1String("-no-format") << QLatin1String("-initial-template") << QLatin1String("main") - << QLatin1String("stylesheets/namedAndRootTemplate.xsl")) + << QLatin1String(SRCDIR "stylesheets/namedAndRootTemplate.xsl")) << QString() << QString(); @@ -952,7 +952,7 @@ void tst_XmlPatterns::xsltSupport_data() const << (QStringList() << QLatin1String("-no-format") << QLatin1String("-initial-template") << QLatin1String("{http://example.com/NS}main") - << QLatin1String("stylesheets/namedAndRootTemplate.xsl")) + << QLatin1String(SRCDIR "stylesheets/namedAndRootTemplate.xsl")) << QString() << QString(); @@ -961,7 +961,7 @@ void tst_XmlPatterns::xsltSupport_data() const << QByteArray("defParam overridedDefaultedParam implicitlyRequiredValue\n") << (QStringList() << QLatin1String("-initial-template") << QLatin1String("main") - << QLatin1String("stylesheets/useParameters.xsl") + << QLatin1String(SRCDIR "stylesheets/useParameters.xsl") << QLatin1String("-param") << QLatin1String("overridedDefaultedParam=overridedDefaultedParam") << QLatin1String("-param") @@ -972,24 +972,24 @@ void tst_XmlPatterns::xsltSupport_data() const QTest::newRow("Use a simplified stylesheet module") << 0 << QByteArray("<output>some text</output>\n") - << (QStringList() << QLatin1String("stylesheets/simplifiedStylesheetModule.xsl") - << QLatin1String("stylesheets/simplifiedStylesheetModule.xml")) + << (QStringList() << QLatin1String(SRCDIR "stylesheets/simplifiedStylesheetModule.xsl") + << QLatin1String(SRCDIR "stylesheets/simplifiedStylesheetModule.xml")) << QString() << QString(); QTest::newRow("Not well-formed stylesheet, causes crash in coloring code.") << 2 << QByteArray() - << (QStringList() << QLatin1String("stylesheets/notWellformed.xsl") - << QLatin1String("queries/simpleDocument.xml")) + << (QStringList() << QLatin1String(SRCDIR "stylesheets/notWellformed.xsl") + << QLatin1String(SRCDIR "queries/simpleDocument.xml")) << QString() << QString(); QTest::newRow("Not well-formed instance document, causes crash in coloring code.") << 2 << QByteArray() - << (QStringList() << QLatin1String("stylesheets/bool070.xsl") - << QLatin1String("stylesheets/bool070.xml")) + << (QStringList() << QLatin1String(SRCDIR "stylesheets/bool070.xsl") + << QLatin1String(SRCDIR "stylesheets/bool070.xml")) << QString() << QString(); diff --git a/tests/auto/xmlpatterns/xmlpatterns.pro b/tests/auto/xmlpatterns/xmlpatterns.pro index 569e23f..01e3b2b 100644 --- a/tests/auto/xmlpatterns/xmlpatterns.pro +++ b/tests/auto/xmlpatterns/xmlpatterns.pro @@ -2,4 +2,10 @@ load(qttest_p4) SOURCES += tst_xmlpatterns.cpp \ ../qxmlquery/TestFundament.cpp +!wince* { +DEFINES += SRCDIR=\\\"$$PWD/\\\" +} else { +DEFINES += SRCDIR=\\\"./\\\" +} + include (../xmlpatterns.pri) |