Move uiloader test from tests/auto to tests/manual
authorSergio Ahumada <sergio.ahumada@digia.com>
Fri, 26 Jul 2013 14:27:43 +0000 (16:27 +0200)
committerThe Qt Project <gerrit-noreply@qt-project.org>
Mon, 29 Jul 2013 07:28:56 +0000 (09:28 +0200)
 - bring tst_screenshot test back
 - make tst_screenshot compile
 - make tst_uiloader compile

Change-Id: I12b584e834a5942699644637cce6071f0de58654
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
180 files changed:
tests/manual/manual.pro [new file with mode: 0644]
tests/manual/uiloader/.gitignore [moved from tests/auto/uiloader/.gitignore with 100% similarity]
tests/manual/uiloader/README.TXT [moved from tests/auto/uiloader/README.TXT with 100% similarity]
tests/manual/uiloader/WTC0090dca226c8.ini [moved from tests/auto/uiloader/WTC0090dca226c8.ini with 100% similarity]
tests/manual/uiloader/baseline/Dialog_with_Buttons_Bottom.ui [moved from tests/auto/uiloader/baseline/Dialog_with_Buttons_Bottom.ui with 100% similarity]
tests/manual/uiloader/baseline/Dialog_with_Buttons_Right.ui [moved from tests/auto/uiloader/baseline/Dialog_with_Buttons_Right.ui with 100% similarity]
tests/manual/uiloader/baseline/Dialog_without_Buttons.ui [moved from tests/auto/uiloader/baseline/Dialog_without_Buttons.ui with 100% similarity]
tests/manual/uiloader/baseline/Main_Window.ui [moved from tests/auto/uiloader/baseline/Main_Window.ui with 100% similarity]
tests/manual/uiloader/baseline/Widget.ui [moved from tests/auto/uiloader/baseline/Widget.ui with 100% similarity]
tests/manual/uiloader/baseline/addlinkdialog.ui [moved from tests/auto/uiloader/baseline/addlinkdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/addtorrentform.ui [moved from tests/auto/uiloader/baseline/addtorrentform.ui with 100% similarity]
tests/manual/uiloader/baseline/authenticationdialog.ui [moved from tests/auto/uiloader/baseline/authenticationdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/backside.ui [moved from tests/auto/uiloader/baseline/backside.ui with 100% similarity]
tests/manual/uiloader/baseline/batchtranslation.ui [moved from tests/auto/uiloader/baseline/batchtranslation.ui with 100% similarity]
tests/manual/uiloader/baseline/bookmarkdialog.ui [moved from tests/auto/uiloader/baseline/bookmarkdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/bookwindow.ui [moved from tests/auto/uiloader/baseline/bookwindow.ui with 100% similarity]
tests/manual/uiloader/baseline/browserwidget.ui [moved from tests/auto/uiloader/baseline/browserwidget.ui with 100% similarity]
tests/manual/uiloader/baseline/calculator.ui [moved from tests/auto/uiloader/baseline/calculator.ui with 100% similarity]
tests/manual/uiloader/baseline/calculatorform.ui [moved from tests/auto/uiloader/baseline/calculatorform.ui with 100% similarity]
tests/manual/uiloader/baseline/certificateinfo.ui [moved from tests/auto/uiloader/baseline/certificateinfo.ui with 100% similarity]
tests/manual/uiloader/baseline/chatdialog.ui [moved from tests/auto/uiloader/baseline/chatdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/chatmainwindow.ui [moved from tests/auto/uiloader/baseline/chatmainwindow.ui with 100% similarity]
tests/manual/uiloader/baseline/chatsetnickname.ui [moved from tests/auto/uiloader/baseline/chatsetnickname.ui with 100% similarity]
tests/manual/uiloader/baseline/config.ui [moved from tests/auto/uiloader/baseline/config.ui with 100% similarity]
tests/manual/uiloader/baseline/connectdialog.ui [moved from tests/auto/uiloader/baseline/connectdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/controller.ui [moved from tests/auto/uiloader/baseline/controller.ui with 100% similarity]
tests/manual/uiloader/baseline/cookies.ui [moved from tests/auto/uiloader/baseline/cookies.ui with 100% similarity]
tests/manual/uiloader/baseline/cookiesexceptions.ui [moved from tests/auto/uiloader/baseline/cookiesexceptions.ui with 100% similarity]
tests/manual/uiloader/baseline/css_borderimage.ui [moved from tests/auto/uiloader/baseline/css_borderimage.ui with 100% similarity]
tests/manual/uiloader/baseline/css_borderimage_allwidgets.ui [moved from tests/auto/uiloader/baseline/css_borderimage_allwidgets.ui with 100% similarity]
tests/manual/uiloader/baseline/css_borderradius_allwidgets.ui [moved from tests/auto/uiloader/baseline/css_borderradius_allwidgets.ui with 100% similarity]
tests/manual/uiloader/baseline/css_buttons_background.ui [moved from tests/auto/uiloader/baseline/css_buttons_background.ui with 100% similarity]
tests/manual/uiloader/baseline/css_combobox_background.ui [moved from tests/auto/uiloader/baseline/css_combobox_background.ui with 100% similarity]
tests/manual/uiloader/baseline/css_exemple_coffee.ui [moved from tests/auto/uiloader/baseline/css_exemple_coffee.ui with 100% similarity]
tests/manual/uiloader/baseline/css_exemple_pagefold.ui [moved from tests/auto/uiloader/baseline/css_exemple_pagefold.ui with 100% similarity]
tests/manual/uiloader/baseline/css_exemple_usage.ui [moved from tests/auto/uiloader/baseline/css_exemple_usage.ui with 100% similarity]
tests/manual/uiloader/baseline/css_frames.ui [moved from tests/auto/uiloader/baseline/css_frames.ui with 100% similarity]
tests/manual/uiloader/baseline/css_groupboxes.ui [moved from tests/auto/uiloader/baseline/css_groupboxes.ui with 100% similarity]
tests/manual/uiloader/baseline/css_itemview_task258382.ui [moved from tests/auto/uiloader/baseline/css_itemview_task258382.ui with 100% similarity]
tests/manual/uiloader/baseline/css_qprogressbar.ui [moved from tests/auto/uiloader/baseline/css_qprogressbar.ui with 100% similarity]
tests/manual/uiloader/baseline/css_qtabwidget.ui [moved from tests/auto/uiloader/baseline/css_qtabwidget.ui with 100% similarity]
tests/manual/uiloader/baseline/css_qtbug6855.ui [moved from tests/auto/uiloader/baseline/css_qtbug6855.ui with 100% similarity]
tests/manual/uiloader/baseline/css_qtbug7737_borderimageradius.ui [moved from tests/auto/uiloader/baseline/css_qtbug7737_borderimageradius.ui with 100% similarity]
tests/manual/uiloader/baseline/css_scroll.ui [moved from tests/auto/uiloader/baseline/css_scroll.ui with 100% similarity]
tests/manual/uiloader/baseline/css_scrollarea_base.ui [moved from tests/auto/uiloader/baseline/css_scrollarea_base.ui with 100% similarity]
tests/manual/uiloader/baseline/css_splitter.ui [moved from tests/auto/uiloader/baseline/css_splitter.ui with 100% similarity]
tests/manual/uiloader/baseline/css_tab_border.ui [moved from tests/auto/uiloader/baseline/css_tab_border.ui with 100% similarity]
tests/manual/uiloader/baseline/css_tab_closebutton.ui [moved from tests/auto/uiloader/baseline/css_tab_closebutton.ui with 100% similarity]
tests/manual/uiloader/baseline/css_tab_task213374.ui [moved from tests/auto/uiloader/baseline/css_tab_task213374.ui with 100% similarity]
tests/manual/uiloader/baseline/css_task255849_downarrow.ui [moved from tests/auto/uiloader/baseline/css_task255849_downarrow.ui with 100% similarity]
tests/manual/uiloader/baseline/css_task259226_spinboxes.ui [moved from tests/auto/uiloader/baseline/css_task259226_spinboxes.ui with 100% similarity]
tests/manual/uiloader/baseline/default.ui [moved from tests/auto/uiloader/baseline/default.ui with 100% similarity]
tests/manual/uiloader/baseline/dialog.ui [moved from tests/auto/uiloader/baseline/dialog.ui with 100% similarity]
tests/manual/uiloader/baseline/downloaditem.ui [moved from tests/auto/uiloader/baseline/downloaditem.ui with 100% similarity]
tests/manual/uiloader/baseline/downloads.ui [moved from tests/auto/uiloader/baseline/downloads.ui with 100% similarity]
tests/manual/uiloader/baseline/embeddeddialog.ui [moved from tests/auto/uiloader/baseline/embeddeddialog.ui with 100% similarity]
tests/manual/uiloader/baseline/filespage.ui [moved from tests/auto/uiloader/baseline/filespage.ui with 100% similarity]
tests/manual/uiloader/baseline/filternamedialog.ui [moved from tests/auto/uiloader/baseline/filternamedialog.ui with 100% similarity]
tests/manual/uiloader/baseline/filterpage.ui [moved from tests/auto/uiloader/baseline/filterpage.ui with 100% similarity]
tests/manual/uiloader/baseline/finddialog.ui [moved from tests/auto/uiloader/baseline/finddialog.ui with 100% similarity]
tests/manual/uiloader/baseline/formwindowsettings.ui [moved from tests/auto/uiloader/baseline/formwindowsettings.ui with 100% similarity]
tests/manual/uiloader/baseline/generalpage.ui [moved from tests/auto/uiloader/baseline/generalpage.ui with 100% similarity]
tests/manual/uiloader/baseline/gridpanel.ui [moved from tests/auto/uiloader/baseline/gridpanel.ui with 100% similarity]
tests/manual/uiloader/baseline/helpdialog.ui [moved from tests/auto/uiloader/baseline/helpdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/history.ui [moved from tests/auto/uiloader/baseline/history.ui with 100% similarity]
tests/manual/uiloader/baseline/identifierpage.ui [moved from tests/auto/uiloader/baseline/identifierpage.ui with 100% similarity]
tests/manual/uiloader/baseline/imagedialog.ui [moved from tests/auto/uiloader/baseline/imagedialog.ui with 100% similarity]
tests/manual/uiloader/baseline/images/arrow-down.png [moved from tests/auto/uiloader/baseline/images/arrow-down.png with 100% similarity]
tests/manual/uiloader/baseline/images/arrow-up.png [moved from tests/auto/uiloader/baseline/images/arrow-up.png with 100% similarity]
tests/manual/uiloader/baseline/images/borderimage.png [moved from tests/auto/uiloader/baseline/images/borderimage.png with 100% similarity]
tests/manual/uiloader/baseline/images/checkbox_checked.png [moved from tests/auto/uiloader/baseline/images/checkbox_checked.png with 100% similarity]
tests/manual/uiloader/baseline/images/checkbox_checked_hover.png [moved from tests/auto/uiloader/baseline/images/checkbox_checked_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/checkbox_checked_pressed.png [moved from tests/auto/uiloader/baseline/images/checkbox_checked_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/checkbox_unchecked.png [moved from tests/auto/uiloader/baseline/images/checkbox_unchecked.png with 100% similarity]
tests/manual/uiloader/baseline/images/checkbox_unchecked_hover.png [moved from tests/auto/uiloader/baseline/images/checkbox_unchecked_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/checkbox_unchecked_pressed.png [moved from tests/auto/uiloader/baseline/images/checkbox_unchecked_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/down_arrow.png [moved from tests/auto/uiloader/baseline/images/down_arrow.png with 100% similarity]
tests/manual/uiloader/baseline/images/down_arrow_disabled.png [moved from tests/auto/uiloader/baseline/images/down_arrow_disabled.png with 100% similarity]
tests/manual/uiloader/baseline/images/frame.png [moved from tests/auto/uiloader/baseline/images/frame.png with 100% similarity]
tests/manual/uiloader/baseline/images/pagefold.png [moved from tests/auto/uiloader/baseline/images/pagefold.png with 100% similarity]
tests/manual/uiloader/baseline/images/pushbutton.png [moved from tests/auto/uiloader/baseline/images/pushbutton.png with 100% similarity]
tests/manual/uiloader/baseline/images/pushbutton_hover.png [moved from tests/auto/uiloader/baseline/images/pushbutton_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/pushbutton_pressed.png [moved from tests/auto/uiloader/baseline/images/pushbutton_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/radiobutton_checked.png [moved from tests/auto/uiloader/baseline/images/radiobutton_checked.png with 100% similarity]
tests/manual/uiloader/baseline/images/radiobutton_checked_hover.png [moved from tests/auto/uiloader/baseline/images/radiobutton_checked_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/radiobutton_checked_pressed.png [moved from tests/auto/uiloader/baseline/images/radiobutton_checked_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/radiobutton_unchecked.png [moved from tests/auto/uiloader/baseline/images/radiobutton_unchecked.png with 100% similarity]
tests/manual/uiloader/baseline/images/radiobutton_unchecked_hover.png [moved from tests/auto/uiloader/baseline/images/radiobutton_unchecked_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/radiobutton_unchecked_pressed.png [moved from tests/auto/uiloader/baseline/images/radiobutton_unchecked_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/sizegrip.png [moved from tests/auto/uiloader/baseline/images/sizegrip.png with 100% similarity]
tests/manual/uiloader/baseline/images/spindown.png [moved from tests/auto/uiloader/baseline/images/spindown.png with 100% similarity]
tests/manual/uiloader/baseline/images/spindown_hover.png [moved from tests/auto/uiloader/baseline/images/spindown_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/spindown_off.png [moved from tests/auto/uiloader/baseline/images/spindown_off.png with 100% similarity]
tests/manual/uiloader/baseline/images/spindown_pressed.png [moved from tests/auto/uiloader/baseline/images/spindown_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/spinup.png [moved from tests/auto/uiloader/baseline/images/spinup.png with 100% similarity]
tests/manual/uiloader/baseline/images/spinup_hover.png [moved from tests/auto/uiloader/baseline/images/spinup_hover.png with 100% similarity]
tests/manual/uiloader/baseline/images/spinup_off.png [moved from tests/auto/uiloader/baseline/images/spinup_off.png with 100% similarity]
tests/manual/uiloader/baseline/images/spinup_pressed.png [moved from tests/auto/uiloader/baseline/images/spinup_pressed.png with 100% similarity]
tests/manual/uiloader/baseline/images/splitter_horizontal.png [moved from tests/auto/uiloader/baseline/images/splitter_horizontal.png with 100% similarity]
tests/manual/uiloader/baseline/images/splitter_vertical.png [moved from tests/auto/uiloader/baseline/images/splitter_vertical.png with 100% similarity]
tests/manual/uiloader/baseline/images/up_arrow.png [moved from tests/auto/uiloader/baseline/images/up_arrow.png with 100% similarity]
tests/manual/uiloader/baseline/images/up_arrow_disabled.png [moved from tests/auto/uiloader/baseline/images/up_arrow_disabled.png with 100% similarity]
tests/manual/uiloader/baseline/inputpage.ui [moved from tests/auto/uiloader/baseline/inputpage.ui with 100% similarity]
tests/manual/uiloader/baseline/installdialog.ui [moved from tests/auto/uiloader/baseline/installdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/languagesdialog.ui [moved from tests/auto/uiloader/baseline/languagesdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/listwidgeteditor.ui [moved from tests/auto/uiloader/baseline/listwidgeteditor.ui with 100% similarity]
tests/manual/uiloader/baseline/mainwindow.ui [moved from tests/auto/uiloader/baseline/mainwindow.ui with 100% similarity]
tests/manual/uiloader/baseline/mainwindowbase.ui [moved from tests/auto/uiloader/baseline/mainwindowbase.ui with 100% similarity]
tests/manual/uiloader/baseline/mydialog.ui [moved from tests/auto/uiloader/baseline/mydialog.ui with 100% similarity]
tests/manual/uiloader/baseline/myform.ui [moved from tests/auto/uiloader/baseline/myform.ui with 100% similarity]
tests/manual/uiloader/baseline/newactiondialog.ui [moved from tests/auto/uiloader/baseline/newactiondialog.ui with 100% similarity]
tests/manual/uiloader/baseline/newdynamicpropertydialog.ui [moved from tests/auto/uiloader/baseline/newdynamicpropertydialog.ui with 100% similarity]
tests/manual/uiloader/baseline/newform.ui [moved from tests/auto/uiloader/baseline/newform.ui with 100% similarity]
tests/manual/uiloader/baseline/orderdialog.ui [moved from tests/auto/uiloader/baseline/orderdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/outputpage.ui [moved from tests/auto/uiloader/baseline/outputpage.ui with 100% similarity]
tests/manual/uiloader/baseline/pagefold.ui [moved from tests/auto/uiloader/baseline/pagefold.ui with 100% similarity]
tests/manual/uiloader/baseline/paletteeditor.ui [moved from tests/auto/uiloader/baseline/paletteeditor.ui with 100% similarity]
tests/manual/uiloader/baseline/paletteeditoradvancedbase.ui [moved from tests/auto/uiloader/baseline/paletteeditoradvancedbase.ui with 100% similarity]
tests/manual/uiloader/baseline/passworddialog.ui [moved from tests/auto/uiloader/baseline/passworddialog.ui with 100% similarity]
tests/manual/uiloader/baseline/pathpage.ui [moved from tests/auto/uiloader/baseline/pathpage.ui with 100% similarity]
tests/manual/uiloader/baseline/phrasebookbox.ui [moved from tests/auto/uiloader/baseline/phrasebookbox.ui with 100% similarity]
tests/manual/uiloader/baseline/plugindialog.ui [moved from tests/auto/uiloader/baseline/plugindialog.ui with 100% similarity]
tests/manual/uiloader/baseline/preferencesdialog.ui [moved from tests/auto/uiloader/baseline/preferencesdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/previewconfigurationwidget.ui [moved from tests/auto/uiloader/baseline/previewconfigurationwidget.ui with 100% similarity]
tests/manual/uiloader/baseline/previewdialogbase.ui [moved from tests/auto/uiloader/baseline/previewdialogbase.ui with 100% similarity]
tests/manual/uiloader/baseline/previewwidget.ui [moved from tests/auto/uiloader/baseline/previewwidget.ui with 100% similarity]
tests/manual/uiloader/baseline/previewwidgetbase.ui [moved from tests/auto/uiloader/baseline/previewwidgetbase.ui with 100% similarity]
tests/manual/uiloader/baseline/proxy.ui [moved from tests/auto/uiloader/baseline/proxy.ui with 100% similarity]
tests/manual/uiloader/baseline/qfiledialog.ui [moved from tests/auto/uiloader/baseline/qfiledialog.ui with 100% similarity]
tests/manual/uiloader/baseline/qpagesetupwidget.ui [moved from tests/auto/uiloader/baseline/qpagesetupwidget.ui with 100% similarity]
tests/manual/uiloader/baseline/qprintpropertieswidget.ui [moved from tests/auto/uiloader/baseline/qprintpropertieswidget.ui with 100% similarity]
tests/manual/uiloader/baseline/qprintsettingsoutput.ui [moved from tests/auto/uiloader/baseline/qprintsettingsoutput.ui with 100% similarity]
tests/manual/uiloader/baseline/qprintwidget.ui [moved from tests/auto/uiloader/baseline/qprintwidget.ui with 100% similarity]
tests/manual/uiloader/baseline/qsqlconnectiondialog.ui [moved from tests/auto/uiloader/baseline/qsqlconnectiondialog.ui with 100% similarity]
tests/manual/uiloader/baseline/qtgradientdialog.ui [moved from tests/auto/uiloader/baseline/qtgradientdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/qtgradienteditor.ui [moved from tests/auto/uiloader/baseline/qtgradienteditor.ui with 100% similarity]
tests/manual/uiloader/baseline/qtgradientview.ui [moved from tests/auto/uiloader/baseline/qtgradientview.ui with 100% similarity]
tests/manual/uiloader/baseline/qtgradientviewdialog.ui [moved from tests/auto/uiloader/baseline/qtgradientviewdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/qtresourceeditordialog.ui [moved from tests/auto/uiloader/baseline/qtresourceeditordialog.ui with 100% similarity]
tests/manual/uiloader/baseline/qttoolbardialog.ui [moved from tests/auto/uiloader/baseline/qttoolbardialog.ui with 100% similarity]
tests/manual/uiloader/baseline/querywidget.ui [moved from tests/auto/uiloader/baseline/querywidget.ui with 100% similarity]
tests/manual/uiloader/baseline/remotecontrol.ui [moved from tests/auto/uiloader/baseline/remotecontrol.ui with 100% similarity]
tests/manual/uiloader/baseline/saveformastemplate.ui [moved from tests/auto/uiloader/baseline/saveformastemplate.ui with 100% similarity]
tests/manual/uiloader/baseline/settings.ui [moved from tests/auto/uiloader/baseline/settings.ui with 100% similarity]
tests/manual/uiloader/baseline/signalslotdialog.ui [moved from tests/auto/uiloader/baseline/signalslotdialog.ui with 100% similarity]
tests/manual/uiloader/baseline/sslclient.ui [moved from tests/auto/uiloader/baseline/sslclient.ui with 100% similarity]
tests/manual/uiloader/baseline/sslerrors.ui [moved from tests/auto/uiloader/baseline/sslerrors.ui with 100% similarity]
tests/manual/uiloader/baseline/statistics.ui [moved from tests/auto/uiloader/baseline/statistics.ui with 100% similarity]
tests/manual/uiloader/baseline/stringlisteditor.ui [moved from tests/auto/uiloader/baseline/stringlisteditor.ui with 100% similarity]
tests/manual/uiloader/baseline/stylesheeteditor.ui [moved from tests/auto/uiloader/baseline/stylesheeteditor.ui with 100% similarity]
tests/manual/uiloader/baseline/tabbedbrowser.ui [moved from tests/auto/uiloader/baseline/tabbedbrowser.ui with 100% similarity]
tests/manual/uiloader/baseline/tablewidgeteditor.ui [moved from tests/auto/uiloader/baseline/tablewidgeteditor.ui with 100% similarity]
tests/manual/uiloader/baseline/tetrixwindow.ui [moved from tests/auto/uiloader/baseline/tetrixwindow.ui with 100% similarity]
tests/manual/uiloader/baseline/textfinder.ui [moved from tests/auto/uiloader/baseline/textfinder.ui with 100% similarity]
tests/manual/uiloader/baseline/topicchooser.ui [moved from tests/auto/uiloader/baseline/topicchooser.ui with 100% similarity]
tests/manual/uiloader/baseline/translatedialog.ui [moved from tests/auto/uiloader/baseline/translatedialog.ui with 100% similarity]
tests/manual/uiloader/baseline/translationsettings.ui [moved from tests/auto/uiloader/baseline/translationsettings.ui with 100% similarity]
tests/manual/uiloader/baseline/treewidgeteditor.ui [moved from tests/auto/uiloader/baseline/treewidgeteditor.ui with 100% similarity]
tests/manual/uiloader/baseline/trpreviewtool.ui [moved from tests/auto/uiloader/baseline/trpreviewtool.ui with 100% similarity]
tests/manual/uiloader/baseline/validators.ui [moved from tests/auto/uiloader/baseline/validators.ui with 100% similarity]
tests/manual/uiloader/baseline/wateringconfigdialog.ui [moved from tests/auto/uiloader/baseline/wateringconfigdialog.ui with 100% similarity]
tests/manual/uiloader/desert.ini [moved from tests/auto/uiloader/desert.ini with 100% similarity]
tests/manual/uiloader/dole.ini [moved from tests/auto/uiloader/dole.ini with 100% similarity]
tests/manual/uiloader/gravlaks.ini [moved from tests/auto/uiloader/gravlaks.ini with 100% similarity]
tests/manual/uiloader/jackychan.ini [moved from tests/auto/uiloader/jackychan.ini with 100% similarity]
tests/manual/uiloader/jeunehomme.ini [moved from tests/auto/uiloader/jeunehomme.ini with 100% similarity]
tests/manual/uiloader/kangaroo.ini [moved from tests/auto/uiloader/kangaroo.ini with 100% similarity]
tests/manual/uiloader/kayak.ini [moved from tests/auto/uiloader/kayak.ini with 100% similarity]
tests/manual/uiloader/scruffy.ini [moved from tests/auto/uiloader/scruffy.ini with 100% similarity]
tests/manual/uiloader/troll15.ini [moved from tests/auto/uiloader/troll15.ini with 100% similarity]
tests/manual/uiloader/tst_screenshot/README.TXT [new file with mode: 0644]
tests/manual/uiloader/tst_screenshot/main.cpp [new file with mode: 0644]
tests/manual/uiloader/tst_screenshot/tst_screenshot.pro [new file with mode: 0644]
tests/manual/uiloader/tundra.ini [moved from tests/auto/uiloader/tundra.ini with 100% similarity]
tests/manual/uiloader/uiloader.pro [moved from tests/auto/uiloader/uiloader.pro with 100% similarity]
tests/manual/uiloader/uiloader/tst_uiloader.cpp [moved from tests/auto/uiloader/uiloader/tst_uiloader.cpp with 100% similarity]
tests/manual/uiloader/uiloader/uiloader.cpp [moved from tests/auto/uiloader/uiloader/uiloader.cpp with 98% similarity]
tests/manual/uiloader/uiloader/uiloader.h [moved from tests/auto/uiloader/uiloader/uiloader.h with 99% similarity]
tests/manual/uiloader/uiloader/uiloader.pro [moved from tests/auto/uiloader/uiloader/uiloader.pro with 73% similarity]
tests/manual/uiloader/wartburg.ini [moved from tests/auto/uiloader/wartburg.ini with 100% similarity]

diff --git a/tests/manual/manual.pro b/tests/manual/manual.pro
new file mode 100644 (file)
index 0000000..7d4f86d
--- /dev/null
@@ -0,0 +1,2 @@
+TEMPLATE = subdirs
+SUBDIRS += uiloader
diff --git a/tests/manual/uiloader/tst_screenshot/README.TXT b/tests/manual/uiloader/tst_screenshot/README.TXT
new file mode 100644 (file)
index 0000000..ae01170
--- /dev/null
@@ -0,0 +1,13 @@
+This program is called from ../uiloader.
+
+
+./tst_screenshot
+
+    Syntax: ./tst_screenshot <path to *.ui file> [output directory]
+
+    This program takes a *.ui file and an output dir as argument in order to
+    create a screenshot of the widget defined in the ui file.
+
+    The screenshot is saved in the output dir (default current dir), ".png" is
+    appended to the ui file name.
+
diff --git a/tests/manual/uiloader/tst_screenshot/main.cpp b/tests/manual/uiloader/tst_screenshot/main.cpp
new file mode 100644 (file)
index 0000000..82f6ed7
--- /dev/null
@@ -0,0 +1,210 @@
+/****************************************************************************
+**
+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/contact-us.
+**
+** 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, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt LGPL Exception
+** version 1.1, 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.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+/*
+ * This program takes a *.ui file and an output dir as argument in order to
+ * create a screenshot of the widget defined in the ui file.
+ *
+ * The screenshot is saved in the output dir (default current dir), ".png" is
+ * appended to the ui file name.
+ */
+
+#include <QApplication>
+#include <QWidget>
+#include <QFile>
+#include <QDebug>
+
+#include <QDir>
+
+#include <iostream>
+
+using namespace std;
+
+
+#ifdef Q_WS_QWS
+// we don't compile designer on embedded...
+
+int main(int argc, char **argv)
+{
+    return 0;
+}
+
+
+#else
+
+#include <QUiLoader>
+
+/*
+ * Take the path of an ui file and return appropriate QWidget.
+ */
+
+QWidget* getWidgetFromUiFile(const QString& fileNameUiFile)
+{
+    qDebug() << "\t\t\t...loading ui file" << fileNameUiFile;
+
+    QUiLoader loader;
+    QFile uiFile(fileNameUiFile);
+    if (!uiFile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+               qDebug("\t\tError: QFile.open() failed.");
+               exit(EXIT_FAILURE);
+       }
+
+    QFileInfo fileInfo(fileNameUiFile);
+    QDir::setCurrent(fileInfo.absolutePath()); //for the stylesheet to find their images
+
+    QWidget *ui = loader.load(&uiFile);
+       if (!ui) {
+               qDebug("\t\tError: Quilodader.load() returned NULL pointer.");
+               exit(EXIT_FAILURE);
+       }
+    uiFile.close();
+
+    return ui;
+}
+
+
+
+/*
+ * Takes the actual screenshot.
+ *
+ * Hint: provide filename without extension, ".png" will be added
+ */
+
+void makeScreenshot(QWidget* widget, const QString& fileName, const QString& pathOutputDir)
+{
+    QFileInfo fileInfo(fileName);
+    QString realFileName = fileInfo.completeBaseName() + "." + fileInfo.suffix() + ".png";
+    QString realPath = pathOutputDir + "/" + realFileName;
+
+
+    //QString realFileName = fileName + ".png";
+    qDebug() << "\t\t\t...Taking screenshot" << fileInfo.absoluteFilePath();
+
+    //widget->show();
+    qApp->processEvents();
+    QImage originalPixmap(widget->size(),QImage::Format_ARGB32);
+    widget->render(&originalPixmap);
+       if ( originalPixmap.isNull() ) {
+               qDebug("\t\tError: QPixmap::grabWidget() returned a NULL QPixmap.");
+               exit(EXIT_FAILURE);
+       }
+    //QString fileName = QDir::currentPath() + "/secondwidget." + format;
+    if ( !originalPixmap.save(realPath, "PNG") ) {
+               qDebug("\t\tError: QPixmap.save() failed.");
+               exit(EXIT_FAILURE);
+       }
+    qDebug() << "\t\t\t...Screenshot saved in" << realPath;
+
+    widget->close();
+}
+
+
+
+/*
+ * Call this if you just want to pass the ui file name and the output dir.
+ */
+
+void createScreenshotFromUiFile(const QString& fileNameUiFile, const QString pathOutputDir)
+{
+    qDebug() << "\t\tCreating screenshot from widget defined in" << fileNameUiFile;
+
+    QWidget* w = getWidgetFromUiFile(fileNameUiFile);
+    makeScreenshot(w, fileNameUiFile, pathOutputDir);
+}
+
+
+
+/*
+ * Start here.
+ */
+
+int main(int argc, char **argv)
+{
+    QApplication app(argc, argv);
+
+    // check for necessary arguments
+    if (argc == 1) {
+        cout << "Syntax: " << argv[0] << " <path to *.ui file> [output directory]" << endl;
+        cout << "" << endl;
+        cout << "Takes a *.ui file and an output dir as argument in order to" << endl;
+        cout << "create a screenshot of the widget defined in the ui file." << endl;
+        cout << "" << endl;
+        cout << "The screenshot is saved in the output dir (default current dir)," << endl;
+        cout << "'.png' is appended to the ui file name." << endl;
+        exit(EXIT_FAILURE);
+    }
+
+
+    // check for *.ui
+    QString fileName = app.arguments().value(1);
+    if ( !fileName.endsWith(".ui") ) {
+        qDebug() << fileName + " is not a *.ui file.";
+        exit(EXIT_FAILURE);
+    }
+
+    // does the file exist?
+    QFile uiFile(fileName);
+    if ( !uiFile.exists() ) {
+        qDebug() << fileName + " does not exist.";
+        exit(EXIT_FAILURE);
+    }
+
+    // check output directory
+    QString pathOutputDir = QDir::currentPath();
+
+    if (argc >= 3 ) {
+        QDir outputDir = app.arguments().value(2);
+        if ( outputDir.exists() ) {
+            pathOutputDir = outputDir.absolutePath();
+        } else {
+            qDebug() << outputDir.absolutePath() + " does not exist or is not a directory.";
+            exit(EXIT_FAILURE);
+        }
+    }
+
+    // take the screenshot
+    createScreenshotFromUiFile(fileName, pathOutputDir);
+
+    app.quit();
+    return 0;
+}
+
+#endif
diff --git a/tests/manual/uiloader/tst_screenshot/tst_screenshot.pro b/tests/manual/uiloader/tst_screenshot/tst_screenshot.pro
new file mode 100644 (file)
index 0000000..fc2af03
--- /dev/null
@@ -0,0 +1,8 @@
+TARGET       = tst_screenshot
+TEMPLATE     = app
+
+QT          += widgets
+SOURCES     += main.cpp
+
+!embedded:QT += uitools
+
similarity index 98%
rename from tests/auto/uiloader/uiloader/uiloader.cpp
rename to tests/manual/uiloader/uiloader/uiloader.cpp
index 1e98ce2..3cf9ae2 100644 (file)
@@ -53,7 +53,6 @@
 #include <QString>
 #include <QHash>
 #include <QFile>
-#include <QFtp>
 #include <QObject>
 #include <QHostInfo>
 #include <QWidget>
@@ -61,6 +60,8 @@
 
 #include <QLibraryInfo>
 
+#include <private/qurlinfo_p.h>
+#include <private/qftp_p.h>
 
 /*
  * Our own QVERIFY since the one from QTest can't be used in non-void functions.
@@ -143,7 +144,7 @@ bool uiLoader::loadConfig(const QString &filePath, QString *errorMessage)
     settings.endArray();
 
     output = settings.value(QLatin1String("output")).toString();
-    output += QDir::separator() + QLibraryInfo::buildKey() + QDir::separator() + QString( qVersion() );
+    output += QDir::separator() + QString("QLibraryInfo::buildKey()") + QDir::separator() + QString( qVersion() );
     ftpUser = settings.value( QLatin1String("ftpUser") ).toString();
     ftpPass = settings.value( QLatin1String("ftpPass") ).toString();
     ftpHost = settings.value( QLatin1String("ftpHost") ).toString();
@@ -330,7 +331,7 @@ void uiLoader::setupFTP()
 
     // create dirs on ftp server
     ftpMkDir( ftpBaseDir );
-    ftpBaseDir += "/" + QLibraryInfo::buildKey();
+    ftpBaseDir += "/" + QString("QLibraryInfo::buildKey()");
     ftpMkDir( ftpBaseDir );
     ftpBaseDir += "/" + QString( qVersion() );
     ftpMkDir( ftpBaseDir );
@@ -716,7 +717,7 @@ uiLoader::TestResult uiLoader::runAutoTests(QString *errorMessage)
     // SVG needs this widget...
     QWidget dummy;
 
-    qDebug() << "Running test on buildkey:" << QLibraryInfo::buildKey() << "  qt version:" << qVersion();
+    qDebug() << "Running test on buildkey:" << "QLibraryInfo::buildKey()" << "  qt version:" << qVersion();
     qDebug() << "Initializing tests...";
 
     // load config
similarity index 99%
rename from tests/auto/uiloader/uiloader/uiloader.h
rename to tests/manual/uiloader/uiloader/uiloader.h
index 99f7704..95b42c2 100644 (file)
 
 #include <QHash>
 #include <QString>
-#include <QUrlInfo>
 #include <QList>
 #include <QImage>
 
+#include <private/qurlinfo_p.h>
+
 class uiLoader : public QObject
 {
     Q_OBJECT
similarity index 73%
rename from tests/auto/uiloader/uiloader/uiloader.pro
rename to tests/manual/uiloader/uiloader/uiloader.pro
index cc291bc..ee6c487 100644 (file)
@@ -1,5 +1,6 @@
-QT += widgets network testlib
-CONFIG += testcase
+requires(contains(QT_CONFIG,private_tests))
+QT += network network-private testlib
+qtHaveModule(widgets): QT += widgets
 
 TEMPLATE = app
 !embedded:QT += uitools