Squish: Remove outdated code

Creator can't be built with Qt 5.4 anymore.

Change-Id: Ic3c014e8384c72c10a48c65117c53daecaa683ab
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

8 files changed, 7 insertions, 33 deletions

diff --git a/tests/system/objects.map b/tests/system/objects.map
index fc44e46139..d052714d65 100644
--- a/tests/system/objects.map
+++ b/tests/system/objects.map
@@ -133,8 +133,6 @@
 :Qt Creator.Replace All_QToolButton	{name='replaceAllButton' text='Replace All' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Replace_QToolButton	{name='replaceButton' text='Replace' type='QToolButton' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.Stop_QToolButton	{text='Stop' type='QToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator.WelcomePageStyledBar_QWindowContainer	{aboveWidget=':Qt Creator.WelcomePageStyledBar_Utils::StyledBar' type='QWindowContainer' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
-:Qt Creator.WelcomePageStyledBar_Utils::StyledBar	{name='WelcomePageStyledBar' type='Utils::StyledBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.WelcomePage_QQuickWidget	{name='WelcomePage' type='QQuickWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.replaceEdit_Utils::FilterLineEdit	{name='replaceEdit' type='Utils::FancyLineEdit' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
 :Qt Creator.scrollArea_QScrollArea	{type='ProjectExplorer::PanelsWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow'}
@@ -202,7 +200,6 @@
 :Session Manager_ProjectExplorer::Internal::SessionDialog	{name='ProjectExplorer__Internal__SessionDialog' type='ProjectExplorer::Internal::SessionDialog' visible='1' windowTitle='Session Manager'}
 :Startup.contextHelpComboBox_QComboBox	{container=':Form.Startup_QGroupBox' name='contextHelpComboBox' type='QComboBox' visible='1'}
 :User Interface.languageBox_QComboBox	{container=':Core__Internal__GeneralSettings.User Interface_QGroupBox' name='languageBox' type='QComboBox' visible='1'}
-:WelcomePageStyledBar.WelcomePage_QQuickView	{container=':Qt Creator.WelcomePageStyledBar_QWindowContainer' name='WelcomePage' type='QQuickView' visible='true'}
 :Widget Box_qdesigner_internal::WidgetBoxTreeWidget	{container=':*Qt Creator.Widget Box_QDockWidget' type='qdesigner_internal::WidgetBoxTreeWidget' unnamed='1' visible='1'}
 :Working Copy_Utils::BaseValidatingLineEdit	{type='Utils::FancyLineEdit' unnamed='1' visible='1' window=':New Text File_ProjectExplorer::JsonWizard'}
 :WritePermissions_Core::Internal::ReadOnlyFilesDialog	{name='Core__Internal__ReadOnlyFilesDialog' type='Core::ReadOnlyFilesDialog' visible='1' windowTitle='Files Without Write Permissions'}
diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py
index d3515afb71..6cfda639ca 100644
--- a/tests/system/shared/project.py
+++ b/tests/system/shared/project.py
@@ -34,10 +34,7 @@ def openQbsProject(projectPath):
 def openQmakeProject(projectPath, targets=Targets.desktopTargetClasses(), fromWelcome=False):
     cleanUpUserFiles(projectPath)
     if fromWelcome:
-        if isQt54Build:
-            welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-        else:
-            welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+        welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
         mouseClick(waitForObject("{clip='false' container='%s' enabled='true' text='Open Project' "
                                  "type='Button' unnamed='1' visible='true'}" % welcomePage),
                    5, 5, 0, Qt.LeftButton)
@@ -87,10 +84,7 @@ def openCmakeProject(projectPath, buildDir):
 # this list can be used in __chooseTargets__()
 def __createProjectOrFileSelectType__(category, template, fromWelcome = False, isProject=True):
     if fromWelcome:
-        if isQt54Build:
-            welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-        else:
-            welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+        welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
         mouseClick(waitForObject("{clip='false' container='%s' enabled='true' text='New Project' "
                                  "type='Button' unnamed='1' visible='true'}" % welcomePage),
                    5, 5, 0, Qt.LeftButton)
diff --git a/tests/system/shared/qtcreator.py b/tests/system/shared/qtcreator.py
index 797235904f..116826df39 100644
--- a/tests/system/shared/qtcreator.py
+++ b/tests/system/shared/qtcreator.py
@@ -34,8 +34,6 @@ import sys
 import errno;
 from datetime import datetime,timedelta;
 
-isQt54Build = os.getenv("SYSTEST_ISQT54BUILD") != "0"
-
 srcPath = ''
 SettingsPath = ''
 tmpSettingsDir = ''
diff --git a/tests/system/suite_WELP/tst_WELP01/test.py b/tests/system/suite_WELP/tst_WELP01/test.py
index 69f99419ea..2f9a02a9bf 100755
--- a/tests/system/suite_WELP/tst_WELP01/test.py
+++ b/tests/system/suite_WELP/tst_WELP01/test.py
@@ -26,10 +26,7 @@
 source("../../shared/qtcreator.py")
 source("../../shared/suites_qtta.py")
 
-if isQt54Build:
-    welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-else:
-    welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
 gettingStartedText = getQmlItem("Button", welcomePage, False,
                                 "text='Get Started Now' id='gettingStartedButton'")
 
diff --git a/tests/system/suite_WELP/tst_WELP02/test.py b/tests/system/suite_WELP/tst_WELP02/test.py
index 0dcc5aaf78..4b4f2e8462 100644
--- a/tests/system/suite_WELP/tst_WELP02/test.py
+++ b/tests/system/suite_WELP/tst_WELP02/test.py
@@ -26,10 +26,7 @@
 source("../../shared/qtcreator.py")
 source("../../shared/suites_qtta.py")
 
-if isQt54Build:
-    welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-else:
-    welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
 
 def checkTypeAndProperties(typePropertiesDetails):
     for (qType, props, detail) in typePropertiesDetails:
diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py
index 8baa26b635..724397cb9a 100644
--- a/tests/system/suite_WELP/tst_WELP03/test.py
+++ b/tests/system/suite_WELP/tst_WELP03/test.py
@@ -45,10 +45,7 @@ def main():
         test.log("Welcome mode is not scriptable with this Squish version")
         return
     global sdkPath
-    if isQt54Build:
-        welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-    else:
-        welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+    welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
     # open Qt Creator
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
diff --git a/tests/system/suite_WELP/tst_WELP04/test.py b/tests/system/suite_WELP/tst_WELP04/test.py
index 97e0794d2d..7b185aa70e 100644
--- a/tests/system/suite_WELP/tst_WELP04/test.py
+++ b/tests/system/suite_WELP/tst_WELP04/test.py
@@ -30,10 +30,7 @@ def main():
     if not canTestEmbeddedQtQuick():
         test.log("Welcome mode is not scriptable with this Squish version")
         return
-    if isQt54Build:
-        welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-    else:
-        welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+    welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
     # open Qt Creator
     startApplication("qtcreator" + SettingsPath)
     if not startedWithoutPluginError():
diff --git a/tests/system/suite_general/tst_session_handling/test.py b/tests/system/suite_general/tst_session_handling/test.py
index 89500e720e..139cdc64f8 100644
--- a/tests/system/suite_general/tst_session_handling/test.py
+++ b/tests/system/suite_general/tst_session_handling/test.py
@@ -106,10 +106,7 @@ def createAndSwitchToSession(toSession):
                               "window=%s}" % sessionInputDialog))
 
 def checkWelcomePage(sessionName, isCurrent=False):
-    if isQt54Build:
-        welcomePage = ":WelcomePageStyledBar.WelcomePage_QQuickView"
-    else:
-        welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
+    welcomePage = ":Qt Creator.WelcomePage_QQuickWidget"
     switchViewTo(ViewConstants.WELCOME)
     mouseClick(waitForObject("{container='%s' text='Projects' type='Button' "
                              "unnamed='1' visible='true'}" % welcomePage))