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>

2 files changed, 1 insertions, 3 deletions

diff --git a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
index 2542496f14..32c26b5078 100644
--- a/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
+++ b/tests/auto/widgets/itemviews/qstringlistmodel/tst_qstringlistmodel.cpp
@@ -169,7 +169,7 @@ void tst_QStringListModel::rowsAboutToBeRemoved_rowsRemoved_data()
 
     QStringList strings3;   strings3    << "One" << "Two" << "Three" << "Four" << "Five";
     QStringList aboutto3;   aboutto3    << "One" << "Two" << "Three" << "Four" << "Five";
-    QStringList res3;       res3        ;
+    QStringList res3;
     QTest::newRow( "data3" )   << strings3 << 0 << 5 << aboutto3 << res3;
 
     /* Not sure if this is a valid test */
diff --git a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
index 71a82cf2bb..ca358d39c4 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/widgets/itemviews/qtreewidget/tst_qtreewidget.cpp
@@ -3280,8 +3280,6 @@ void tst_QTreeWidget::taskQTBUG2844_visualItemRect()
     tree.setColumnCount(3);
     QTreeWidgetItem item(&tree);
 
-    QRect itemRect = tree.visualItemRect(&item);
-
     QRect rectCol0 = tree.visualRect(tree.indexFromItem(&item, 0));
     QRect rectCol1 = tree.visualRect(tree.indexFromItem(&item, 1));
     QRect rectCol2 = tree.visualRect(tree.indexFromItem(&item, 2));