qtbase tests: Fix some warnings

- Fix warnings about QAtomicPointer/Int usage
- Fix some gcc 4.6 warnings about assigned/unused variables

Change-Id: Ib4dbf9110f0dad93ad48e97278310f05fad3a82a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>

4 files changed, 9 insertions, 12 deletions

diff --git a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
index 69dd30b90b..85ff3b2aeb 100644
--- a/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
+++ b/tests/auto/gui/image/qimagereader/tst_qimagereader.cpp
@@ -718,7 +718,7 @@ void tst_QImageReader::sizeBeforeFormat()
 
     {
         QImageReader reader(prefix + fileName);
-        QSize size = reader.size();
+        reader.size();
         formatB = reader.format();
     }
 
diff --git a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
index d761b19542..674fa930ed 100644
--- a/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
+++ b/tests/auto/gui/kernel/qshortcut/tst_qshortcut.cpp
@@ -891,8 +891,8 @@ void tst_QShortcut::ambiguousItems()
     pb1.show();	// Must be show for QShortcutMap::correctSubWindow to trigger
     pb2.show();
 
-    QShortcut *cut1 = setupShortcut(&pb1, "shortcut1-pb1", TriggerSlot1, "M");
-    QShortcut *cut2 = setupShortcut(&pb1, "shortcut2-pb2", TriggerSlot2, "M");
+    setupShortcut(&pb1, "shortcut1-pb1", TriggerSlot1, "M");
+    setupShortcut(&pb1, "shortcut2-pb2", TriggerSlot2, "M");
 
     currentResult = NoResult;
     sendKeyEvents( Qt::Key_M, 'm' );
@@ -910,7 +910,6 @@ void tst_QShortcut::ambiguousItems()
     QCOMPARE( ambigResult, Slot1Triggered );
 
     clearAllShortcuts();
-    cut1 = 0; cut2 = 0;
 }
 
 
@@ -933,8 +932,8 @@ void tst_QShortcut::unicodeCompare()
 
     QKeySequence ks1("Ctrl+M");     // Unicode
     QKeySequence ks2(Qt::CTRL+Qt::Key_M);   // non-Unicode
-    QShortcut *cut1 = setupShortcut(&pb1, "shortcut1-pb1", TriggerSlot1, ks1);
-    QShortcut *cut2 = setupShortcut(&pb1, "shortcut2-pb2", TriggerSlot2, ks2);
+    setupShortcut(&pb1, "shortcut1-pb1", TriggerSlot1, ks1);
+    setupShortcut(&pb1, "shortcut2-pb2", TriggerSlot2, ks2);
 
     currentResult = NoResult;
     sendKeyEvents( Qt::CTRL+Qt::Key_M, 0 );
@@ -945,7 +944,6 @@ void tst_QShortcut::unicodeCompare()
     QVERIFY( !(ks1 != ks2) );
 
     clearAllShortcuts();
-    cut1 = 0; cut2 = 0;
 }
 
 // ------------------------------------------------------------------
diff --git a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
index c18d81a9af..51e659d5eb 100644
--- a/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
+++ b/tests/auto/gui/text/qtextdocumentfragment/tst_qtextdocumentfragment.cpp
@@ -3274,7 +3274,6 @@ void tst_QTextDocumentFragment::html_hrMargins()
 
     cursor.movePosition(QTextCursor::NextBlock);
     block = cursor.block();
-    QTextBlock hr = block;
     QVERIFY(qMax(first.blockFormat().bottomMargin(), block.blockFormat().topMargin()) > 0);
 
     cursor.movePosition(QTextCursor::NextBlock);
diff --git a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
index f1c2f6e4de..42aa300098 100644
--- a/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/gui/text/qtextlayout/tst_qtextlayout.cpp
@@ -1188,7 +1188,7 @@ void tst_QTextLayout::capitalization_allUpperCase()
     font.setCapitalization(QFont::AllUppercase);
     QTextLayout layout("Test", font);
     layout.beginLayout();
-    QTextLine line = layout.createLine();
+    layout.createLine();
     layout.endLayout();
 
     QTextEngine *engine = layout.engine();
@@ -1203,7 +1203,7 @@ void tst_QTextLayout::capitalization_allLowerCase()
     font.setCapitalization(QFont::AllLowercase);
     QTextLayout layout("Test", font);
     layout.beginLayout();
-    QTextLine line = layout.createLine();
+    layout.createLine();
     layout.endLayout();
 
     QTextEngine *engine = layout.engine();
@@ -1218,7 +1218,7 @@ void tst_QTextLayout::capitalization_smallCaps()
     font.setCapitalization(QFont::SmallCaps);
     QTextLayout layout("Test", font);
     layout.beginLayout();
-    QTextLine line = layout.createLine();
+    layout.createLine();
     layout.endLayout();
 
     QTextEngine *engine = layout.engine();
@@ -1234,7 +1234,7 @@ void tst_QTextLayout::capitalization_capitalize()
     font.setCapitalization(QFont::Capitalize);
     QTextLayout layout("hello\tworld", font);
     layout.beginLayout();
-    QTextLine line = layout.createLine();
+    layout.createLine();
     layout.endLayout();
 
     QTextEngine *engine = layout.engine();