Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Fix incorrect \since tag
  XQuery test suite (and others): remove p4 dependency
  add docu about pixmaps being invalidated on qapp destruction
  remove somewhat misleading warning about x11 pixmap leak
  Disabled item view items use incorrect background color
  Update the mkspec for linux-icc: don't use jump tables in shlibs
  Update the linux-icc mkspec
  make corewlan more namespace friendly
  Add convenience constructor to QTextOption::Tab
  Make qbswap() use glibc's fast bswap_*() functions if available.
  Fix in Addressbook tutorial
  Avoid timer starvation during high posted event activity
  fix for using .lnk files when running app from UNC

4 files changed, 5 insertions, 22 deletions

diff --git a/tests/auto/qtextformat/tst_qtextformat.cpp b/tests/auto/qtextformat/tst_qtextformat.cpp
index ee1f4b5..9b71481 100644
--- a/tests/auto/qtextformat/tst_qtextformat.cpp
+++ b/tests/auto/qtextformat/tst_qtextformat.cpp
@@ -308,10 +308,7 @@ void tst_QTextFormat::getSetTabs()
     format.setTabPositions(tabs);
     Comparator c2(tabs, format.tabPositions());
 
-    QTextOption::Tab tab2;
-    tab2.position = 3456;
-    tab2.type = QTextOption::RightTab;
-    tab2.delimiter = QChar('x');
+    QTextOption::Tab tab2(3456, QTextOption::RightTab, QChar('x'));
     tabs.append(tab2);
     format.setTabPositions(tabs);
     Comparator c3(tabs, format.tabPositions());
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index 1a5f493..a631f3d 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -980,9 +980,7 @@ void tst_QTextLayout::testCenteredTab()
     // test if centering the tab works.  We expect the center of 'Bar.' to be at the tab point.
     QTextOption option = layout.textOption();
     QList<QTextOption::Tab> tabs;
-    QTextOption::Tab tab;
-    tab.type = QTextOption::CenterTab;
-    tab.position = 150;
+    QTextOption::Tab tab(150, QTextOption::CenterTab);
     tabs.append(tab);
     option.setTabs(tabs);
     layout.setTextOption(option);
@@ -1002,10 +1000,7 @@ void tst_QTextLayout::testDelimiterTab()
     // try the different delimiter characters to see if the alignment works there.
     QTextOption option = layout.textOption();
     QList<QTextOption::Tab> tabs;
-    QTextOption::Tab tab;
-    tab.type = QTextOption::DelimiterTab;
-    tab.delimiter = QChar('.');
-    tab.position = 100;
+    QTextOption::Tab tab(100, QTextOption::DelimiterTab, QChar('.'));
     tabs.append(tab);
     option.setTabs(tabs);
     layout.setTextOption(option);
diff --git a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
index 64c42bb..a463d86 100644
--- a/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
+++ b/tests/auto/qtextodfwriter/tst_qtextodfwriter.cpp
@@ -198,14 +198,9 @@ void tst_QTextOdfWriter::testWriteStyle2()
 {
     QTextBlockFormat bf; // = cursor.blockFormat();
     QList<QTextOption::Tab> tabs;
-    QTextOption::Tab tab1;
-    tab1.position = 40;
-    tab1.type = QTextOption::RightTab;
+    QTextOption::Tab tab1(40, QTextOption::RightTab);
     tabs << tab1;
-    QTextOption::Tab tab2;
-    tab2.position = 80;
-    tab2.type = QTextOption::DelimiterTab;
-    tab2.delimiter = 'o';
+    QTextOption::Tab tab2(80, QTextOption::DelimiterTab, 'o');
     tabs << tab2;
     bf.setTabPositions(tabs);
 
diff --git a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
index ec63858..6e10e3f 100644
--- a/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
+++ b/tests/auto/xmlpatternsxqts/tst_suitetest.cpp
@@ -141,8 +141,6 @@ void tst_SuiteTest::checkTestSuiteResult() const
     /* Passed to ResultThreader so it knows what kind of file it is handling. */
     ResultThreader::Type type = ResultThreader::Baseline;
 
-    QProcess::execute(QLatin1String("p4 edit ") + m_existingBaseline);
-
     for(QFileInfoList::const_iterator it(list.constBegin()); it != end; ++it)
     {
         QFileInfo i(*it);
@@ -167,8 +165,6 @@ void tst_SuiteTest::checkTestSuiteResult() const
 
     const int exitCode = eventLoop.exec();
 
-    QProcess::execute(QLatin1String("p4 revert -a ") + m_existingBaseline);
-
     QCOMPARE(exitCode, 0);
 }