Regenerate tests/auto/widgets/itemviews

Change-Id: Ia95c89cde7faf5d3edb69cc8969bda2becd7b51d
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

16 files changed, 244 insertions, 38 deletions

diff --git a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
index dbabcecf8a..3379fafcb0 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qabstractitemview/CMakeLists.txt
@@ -1,5 +1,15 @@
-add_qt_test("tst_qabstractitemview" SOURCES tst_qabstractitemview.cpp
+# Generated from qabstractitemview.pro.
+
+#####################################################################
+## tst_qabstractitemview Test:
+#####################################################################
+
+add_qt_test(tst_qabstractitemview
+    SOURCES
+        tst_qabstractitemview.cpp
     LIBRARIES
-        Qt::Widgets
         Qt::TestPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
diff --git a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
index 07ae31be61..47e6a1ee35 100644
--- a/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qcolumnview/CMakeLists.txt
@@ -1,11 +1,19 @@
-add_qt_test("tst_qcolumnview"
+# Generated from qcolumnview.pro.
+
+#####################################################################
+## tst_qcolumnview Test:
+#####################################################################
+
+add_qt_test(tst_qcolumnview
     SOURCES
         ../../../../shared/fakedirmodel.h
         tst_qcolumnview.cpp
     LIBRARIES
-        Qt::Widgets
-        Qt::WidgetsPrivate
-        Qt::GuiPrivate
         Qt::CorePrivate
+        Qt::GuiPrivate
         Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
diff --git a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
index ef7d9cf63e..f3e4af0c23 100644
--- a/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qdatawidgetmapper/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qdatawidgetmapper" SOURCES tst_qdatawidgetmapper.cpp LIBRARIES Qt::Widgets)
+# Generated from qdatawidgetmapper.pro.
+
+#####################################################################
+## tst_qdatawidgetmapper Test:
+#####################################################################
+
+add_qt_test(tst_qdatawidgetmapper
+    SOURCES
+        tst_qdatawidgetmapper.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt b/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt
index 29ffde1801..d47cc3457d 100644
--- a/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qdirmodel/CMakeLists.txt
@@ -1,19 +1,49 @@
-add_qt_test("tst_qdirmodel"
+# Generated from qdirmodel.pro.
+
+#####################################################################
+## tst_qdirmodel Test:
+#####################################################################
+
+add_qt_test(tst_qdirmodel
     SOURCES
         ../../../../shared/emulationdetector.h
         tst_qdirmodel.cpp
     INCLUDE_DIRECTORIES
-        ../../../../shared/
-    LIBRARIES
+        ../../../../shared
+    PUBLIC_LIBRARIES
+        Qt::Gui
         Qt::Widgets
 )
 
-extend_target("tst_qdirmodel" CONDITION ANDROID DEFINES SRCDIR="./")
+## Scopes:
+#####################################################################
 
-extend_target("tst_qdirmodel" CONDITION NOT ANDROID
-    DEFINES SRCDIR="${CMAKE_CURRENT_SOURCE_DIR}/"
+extend_target(tst_qdirmodel CONDITION ANDROID
+    DEFINES
+        SRCDIR=\\\"./\\\"
 )
 
-extend_target("tst_qdirmodel" CONDITION ANDROID AND NOT ANDROID_EMBEDDED
-    SOURCES testdata.qrc
+extend_target(tst_qdirmodel CONDITION NOT ANDROID
+    DEFINES
+        SRCDIR=\\\"${CMAKE_CURRENT_SOURCE_DIR}/\\\"
 )
+
+if(ANDROID AND NOT ANDROID_EMBEDDED)
+    # Resources:
+    set(testdata_resource_files
+        "dirtest/test1/dummy"
+        "dirtest/test1/test"
+        "test/file01.tst"
+        "test/file02.tst"
+        "test/file03.tst"
+        "test/file04.tst"
+        "tst_qdirmodel.cpp"
+    )
+
+    add_qt_resource(tst_qdirmodel "testdata"
+        PREFIX
+            "/android_testdata"
+        FILES
+            ${testdata_resource_files}
+    )
+endif()
diff --git a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
index c1aa9a8d3f..024519ad9c 100644
--- a/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qfileiconprovider/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qfileiconprovider" SOURCES tst_qfileiconprovider.cpp LIBRARIES Qt::Widgets)
+# Generated from qfileiconprovider.pro.
+
+#####################################################################
+## tst_qfileiconprovider Test:
+#####################################################################
+
+add_qt_test(tst_qfileiconprovider
+    SOURCES
+        tst_qfileiconprovider.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
index 512179bcca..8a4cebe7d5 100644
--- a/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qheaderview/CMakeLists.txt
@@ -1,6 +1,19 @@
-add_qt_test("tst_qheaderview" SOURCES tst_qheaderview.cpp
+# Generated from qheaderview.pro.
+
+#####################################################################
+## tst_qheaderview Test:
+#####################################################################
+
+add_qt_test(tst_qheaderview
+    SOURCES
+        tst_qheaderview.cpp
+    DEFINES
+        QT_DISABLE_DEPRECATED_BEFORE=0
     LIBRARIES
-        Qt::WidgetsPrivate
         Qt::CorePrivate
         Qt::GuiPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
diff --git a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
index 70cc1a7540..f97940b28a 100644
--- a/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemdelegate/CMakeLists.txt
@@ -1,3 +1,23 @@
-add_qt_test("tst_qitemdelegate" SOURCES tst_qitemdelegate.cpp LIBRARIES Qt::WidgetsPrivate)
+# Generated from qitemdelegate.pro.
 
-extend_target("tst_qitemdelegate" CONDITION WIN32 AND NOT WINRT LIBRARIES -luser32)
+#####################################################################
+## tst_qitemdelegate Test:
+#####################################################################
+
+add_qt_test(tst_qitemdelegate
+    SOURCES
+        tst_qitemdelegate.cpp
+    LIBRARIES
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
+
+## Scopes:
+#####################################################################
+
+extend_target(tst_qitemdelegate CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
+)
diff --git a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
index 7100fb802f..4dfb46ff4d 100644
--- a/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemeditorfactory/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qitemeditorfactory" SOURCES tst_qitemeditorfactory.cpp LIBRARIES Qt::Widgets)
+# Generated from qitemeditorfactory.pro.
+
+#####################################################################
+## tst_qitemeditorfactory Test:
+#####################################################################
+
+add_qt_test(tst_qitemeditorfactory
+    SOURCES
+        tst_qitemeditorfactory.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
index 9b298d97f3..b27f456246 100644
--- a/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qitemview/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qitemview" SOURCES tst_qitemview.cpp LIBRARIES Qt::Widgets)
+# Generated from qitemview.pro.
+
+#####################################################################
+## tst_qitemview Test:
+#####################################################################
+
+add_qt_test(tst_qitemview
+    SOURCES
+        tst_qitemview.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
index 56812234c8..1c7c5ae7fe 100644
--- a/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qlistview/CMakeLists.txt
@@ -1,13 +1,26 @@
-add_qt_test("tst_qlistview"
+# Generated from qlistview.pro.
+
+#####################################################################
+## tst_qlistview Test:
+#####################################################################
+
+add_qt_test(tst_qlistview
     SOURCES
         tst_qlistview.cpp
     LIBRARIES
-        Qt::GuiPrivate
-        Qt::WidgetsPrivate
         Qt::CorePrivate
+        Qt::GuiPrivate
         Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
 
-extend_target("tst_qlistview" CONDITION WIN32 AND NOT WINRT
-    LIBRARIES -luser32
+## Scopes:
+#####################################################################
+
+extend_target(tst_qlistview CONDITION WIN32 AND NOT WINRT
+    PUBLIC_LIBRARIES
+        user32
 )
diff --git a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
index 5b16aa61a6..853b463893 100644
--- a/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qlistwidget/CMakeLists.txt
@@ -1,8 +1,17 @@
-add_qt_test("tst_qlistwidget"
+# Generated from qlistwidget.pro.
+
+#####################################################################
+## tst_qlistwidget Test:
+#####################################################################
+
+add_qt_test(tst_qlistwidget
     SOURCES
         tst_qlistwidget.cpp
     LIBRARIES
-        Qt::WidgetsPrivate
         Qt::CorePrivate
         Qt::GuiPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
diff --git a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
index 655d91d300..0906f4c5a1 100644
--- a/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtableview/CMakeLists.txt
@@ -1,7 +1,18 @@
-add_qt_test("tst_qtableview" SOURCES tst_qtableview.cpp
+# Generated from qtableview.pro.
+
+#####################################################################
+## tst_qtableview Test:
+#####################################################################
+
+add_qt_test(tst_qtableview
+    SOURCES
+        tst_qtableview.cpp
     LIBRARIES
-        Qt::WidgetsPrivate
         Qt::CorePrivate
         Qt::GuiPrivate
         Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
diff --git a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
index f8bcef068e..66344e9d32 100644
--- a/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtablewidget/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qtablewidget" SOURCES tst_qtablewidget.cpp LIBRARIES Qt::Widgets)
+# Generated from qtablewidget.pro.
+
+#####################################################################
+## tst_qtablewidget Test:
+#####################################################################
+
+add_qt_test(tst_qtablewidget
+    SOURCES
+        tst_qtablewidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
index 582b45ef78..4914f705ab 100644
--- a/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtreeview/CMakeLists.txt
@@ -1,11 +1,19 @@
-add_qt_test("tst_qtreeview"
+# Generated from qtreeview.pro.
+
+#####################################################################
+## tst_qtreeview Test:
+#####################################################################
+
+add_qt_test(tst_qtreeview
     SOURCES
         ../../../../shared/fakedirmodel.h
         tst_qtreeview.cpp
     LIBRARIES
-        Qt::Widgets
-        Qt::WidgetsPrivate
-        Qt::GuiPrivate
         Qt::CorePrivate
+        Qt::GuiPrivate
         Qt::TestPrivate
+        Qt::WidgetsPrivate
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
 )
diff --git a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt
index 6d180e2167..dde2e9d4ab 100644
--- a/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtreewidget/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qtreewidget" SOURCES tst_qtreewidget.cpp LIBRARIES Qt::Widgets)
+# Generated from qtreewidget.pro.
+
+#####################################################################
+## tst_qtreewidget Test:
+#####################################################################
+
+add_qt_test(tst_qtreewidget
+    SOURCES
+        tst_qtreewidget.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)
diff --git a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt
index c29cb76bc8..65ac8cda8b 100644
--- a/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt
+++ b/tests/auto/widgets/itemviews/qtreewidgetitemiterator/CMakeLists.txt
@@ -1 +1,13 @@
-add_qt_test("tst_qtreewidgetitemiterator" SOURCES tst_qtreewidgetitemiterator.cpp LIBRARIES Qt::Widgets)
+# Generated from qtreewidgetitemiterator.pro.
+
+#####################################################################
+## tst_qtreewidgetitemiterator Test:
+#####################################################################
+
+add_qt_test(tst_qtreewidgetitemiterator
+    SOURCES
+        tst_qtreewidgetitemiterator.cpp
+    PUBLIC_LIBRARIES
+        Qt::Gui
+        Qt::Widgets
+)