From 4413096caebfeb5faeacedb0d49c767995a6910b Mon Sep 17 00:00:00 2001 From: Robert Loehning Date: Fri, 20 Feb 2015 13:54:44 +0100 Subject: [PATCH] Squish: Add Qt 5.4.1 kit Change-Id: I8efa72f8695796bd69af11e9904fae143137d1e6 Reviewed-by: Robert Loehning Reviewed-by: Christian Stenger --- .../unix/QtProject/qtcreator/profiles.xml | 28 ++++++++++- .../unix/QtProject/qtcreator/qtversion.xml | 12 ++++- .../settings/windows/QtProject/QtCreator.ini | 3 ++ .../windows/QtProject/qtcreator/debuggers.xml | 26 ++++++---- .../windows/QtProject/qtcreator/profiles.xml | 49 +++++++++++++++++-- .../windows/QtProject/qtcreator/qtversion.xml | 12 ++++- .../QtProject/qtcreator/toolchains.xml | 19 ++++--- tests/system/shared/classes.py | 7 ++- tests/system/shared/project.py | 6 +++ tests/system/suite_CCOM/tst_CCOM01/test.py | 3 +- tests/system/suite_CCOM/tst_CCOM02/test.py | 3 +- 11 files changed, 141 insertions(+), 27 deletions(-) diff --git a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml index b515d340477..5e08ff946d0 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/profiles.xml @@ -1,6 +1,6 @@ - + Profile.0 @@ -174,9 +174,33 @@ + + Profile.8 + + false + + + + {70e26273-2c0b-4534-bbc0-eb6ca670821a} + Desktop Device + Desktop + + + ProjectExplorer.ToolChain.Gcc:{c3f59b87-6997-4bd8-8067-ee04dc536371} + + 13 + + :///DESKTOP/// + {8ca91e21-c12e-4876-85b3-4b2141708acb} + + Desktop 541 GCC + false + + + Profile.Count - 8 + 9 Profile.Default diff --git a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml index 6ed59e9a931..ce7e0515a43 100644 --- a/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/unix/QtProject/qtcreator/qtversion.xml @@ -1,6 +1,6 @@ - + QtVersion.0 @@ -72,6 +72,16 @@ false + + QtVersion.7 + + 13 + Qt %{Qt:Version} (SQUISH_DEFAULT_COMPILER) + ~/Qt5.4.1/5.4/SQUISH_DEFAULT_COMPILER/bin/qmake + Qt4ProjectManager.QtVersion.Desktop + false + + Version 1 diff --git a/tests/system/settings/windows/QtProject/QtCreator.ini b/tests/system/settings/windows/QtProject/QtCreator.ini index b77fccec036..1e759b30437 100644 --- a/tests/system/settings/windows/QtProject/QtCreator.ini +++ b/tests/system/settings/windows/QtProject/QtCreator.ini @@ -1,2 +1,5 @@ [%General] OverrideLanguage=C + +[MainWindow] +WindowGeometry=@ByteArray(\x1\xd9\xd0\xcb\0\x1\0\0\0\0\x1H\0\0\0}\0\0\x5\xe0\0\0\x3^\0\0\x1P\0\0\0\x9b\0\0\x5\xd8\0\0\x3V\0\0\0\0\0\0) diff --git a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml index f9bac448c4a..6bb8c3101fe 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/debuggers.xml @@ -1,6 +1,6 @@ - - + + DebuggerItem.0 @@ -9,21 +9,27 @@ x86-windows-msvc2010-pe-64bit true - C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe + + C:/Program Files/Debugging Tools for Windows (x64)/cdb.exe Auto-detected CDB at C:\Program Files\Debugging Tools for Windows (x64)\cdb.exe 4 {811977c9-ea95-4616-bc28-c66d1935ff65} + DebuggerItem.1 - - true - C:\QtSDK\pythongdb\python_2.7based\gdb-i686-pc-mingw32.exe - Extracted from Kit Desktop 474 GCC + + x86-windows-msys-pe-unknown + + false + + C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/gdb.exe + gdb 7.8 1 - {44aee0bd-999d-4abe-82c6-5c7979e7cf01} + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} + 7.8.0 @@ -33,10 +39,12 @@ arm-linux-generic-elf-32bit true - C:\QtSDK\pythongdb\python_2.7based\gdb-arm-none-linux-gnueabi.exe + + C:/QtSDK/pythongdb/python_2.7based/gdb-arm-none-linux-gnueabi.exe Extracted from Kit Fremantle 1 {5ad1d623-7300-41b4-ba32-99e11bfcb988} + diff --git a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml index f04407b93bb..541183f7b2f 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/profiles.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/profiles.xml @@ -1,16 +1,18 @@ - + Profile.0 false + - {44aee0bd-999d-4abe-82c6-5c7979e7cf01} + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} Desktop Device Desktop + ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce} @@ -21,17 +23,20 @@ Desktop 474 GCC false + Profile.1 false + - {44aee0bd-999d-4abe-82c6-5c7979e7cf01} + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} Desktop Device Desktop + ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce} @@ -42,6 +47,7 @@ Qt Simulator false + @@ -90,11 +96,13 @@ Profile.4 false + {811977c9-ea95-4616-bc28-c66d1935ff65} Desktop Device Desktop + ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} @@ -105,6 +113,7 @@ Desktop 480 MSVC2010 false + @@ -117,6 +126,7 @@ {811977c9-ea95-4616-bc28-c66d1935ff65} Desktop Device Desktop + ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} @@ -134,11 +144,13 @@ Profile.6 false + - {44aee0bd-999d-4abe-82c6-5c7979e7cf01} + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} Desktop Device Desktop + ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce} @@ -149,6 +161,7 @@ Desktop 480 GCC false + @@ -161,6 +174,7 @@ {811977c9-ea95-4616-bc28-c66d1935ff65} Desktop Device Desktop + ProjectExplorer.ToolChain.Msvc:{1186dad9-c485-4f69-b7e1-aff54c89ecb2} @@ -171,11 +185,36 @@ Desktop 521 default false + + + + + Profile.8 + + false + + + + {2f8a1f59-ddd7-49f0-ae61-1337223f56a3} + Desktop Device + Desktop + + + ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} + + 22 + + :///DESKTOP/// + {10cf33c5-e36d-4a49-a8c7-086f3cf59695} + + Desktop 541 GCC + false + Profile.Count - 8 + 9 Profile.Default diff --git a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml index 853d07393c6..a5b67095337 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/qtversion.xml @@ -1,6 +1,6 @@ - + QtVersion.0 @@ -82,6 +82,16 @@ false + + QtVersion.8 + + 22 + Qt %{Qt:Version} (mingw491_32) + C:/Qt/Qt5.4.1/5.4/mingw491_32/bin/qmake.exe + Qt4ProjectManager.QtVersion.Desktop + false + + Version 1 diff --git a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml index e5d2fa114d9..f87f81d9a50 100644 --- a/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml +++ b/tests/system/settings/windows/QtProject/qtcreator/toolchains.xml @@ -1,17 +1,19 @@ - + ToolChain.0 C:/QtSDK/mingw/bin/g++.exe + + x86-windows-msys-pe-32bit x86-windows-msys-pe-32bit false - MinGW + MinGW 4.4 ProjectExplorer.ToolChain.Mingw:{2729dd3e-84f5-42e1-aed1-6a27163346ce} @@ -55,11 +57,16 @@ ToolChain.4 - x86-windows-msvc2008-pe-32bit - c:\Program Files (x86)\Microsoft Visual Studio 9.0\VC\bin\vcvars32.bat + C:/Qt/Qt5.4.1/Tools/mingw491_32/bin/g++.exe + + + + x86-windows-msys-pe-32bit + + x86-windows-msys-pe-32bit false - MSVC 2008 (x86) - ProjectExplorer.ToolChain.Msvc:{b86e54dd-debd-409c-b4d7-1a5c710eaa37} + MinGW 4.9 + ProjectExplorer.ToolChain.Mingw:{44d54392-22ee-4eac-a9f1-2d882ba8a7bb} diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 9e348c20fa6..e2003fe6b1d 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -41,6 +41,7 @@ class Targets: DESKTOP_480_MSVC2010 = 64 DESKTOP_521_DEFAULT = 128 DESKTOP_531_DEFAULT = 256 + DESKTOP_541_GCC = 512 @staticmethod def desktopTargetClasses(): @@ -48,6 +49,8 @@ class Targets: | Targets.DESKTOP_521_DEFAULT | Targets.DESKTOP_531_DEFAULT) if platform.system() in ('Windows', 'Microsoft'): desktopTargets |= Targets.DESKTOP_480_MSVC2010 + if platform.system() != 'Darwin': + desktopTargets |= Targets.DESKTOP_541_GCC return desktopTargets @staticmethod @@ -70,6 +73,8 @@ class Targets: return "Desktop 521 default" elif target == Targets.DESKTOP_531_DEFAULT: return "Desktop 531 default" + elif target == Targets.DESKTOP_541_GCC: + return "Desktop 541 GCC" else: return None @@ -87,7 +92,7 @@ class Targets: def intToArray(targets): available = [Targets.DESKTOP_474_GCC, Targets.DESKTOP_480_GCC, Targets.SIMULATOR, Targets.MAEMO5, Targets.HARMATTAN, Targets.EMBEDDED_LINUX, Targets.DESKTOP_480_MSVC2010, - Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT] + Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT, Targets.DESKTOP_541_GCC] return filter(lambda x: x & targets == x, available) @staticmethod diff --git a/tests/system/shared/project.py b/tests/system/shared/project.py index 765fa176fef..24978cd8288 100644 --- a/tests/system/shared/project.py +++ b/tests/system/shared/project.py @@ -395,6 +395,8 @@ def __chooseTargets__(targets=Targets.DESKTOP_474_GCC, availableTargets=None): if platform.system() in ('Windows', 'Microsoft'): available.remove(Targets.EMBEDDED_LINUX) available.append(Targets.DESKTOP_480_MSVC2010) + if platform.system() != 'Darwin': + available.append(Targets.DESKTOP_541_GCC) for target in filter(lambda x: x in available, (Targets.MAEMO5, Targets.HARMATTAN)): available.remove(target) @@ -625,6 +627,8 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): elif platform.system() in ('Windows', 'Microsoft'): result.append(Targets.DESKTOP_480_MSVC2010) result.extend([Targets.DESKTOP_521_DEFAULT, Targets.DESKTOP_531_DEFAULT]) + if platform.system() != 'Darwin': + result.append(Targets.DESKTOP_541_GCC) if 'MeeGo/Harmattan' in supports: result.append(Targets.HARMATTAN) if 'Maemo/Fremantle' in supports: @@ -637,6 +641,8 @@ def __getSupportedPlatforms__(text, templateName, getAsStrings=False): Targets.DESKTOP_531_DEFAULT, Targets.MAEMO5, Targets.SIMULATOR, Targets.HARMATTAN] if platform.system() in ('Windows', 'Microsoft'): result.append(Targets.DESKTOP_480_MSVC2010) + if platform.system() != 'Darwin': + result.append(Targets.DESKTOP_541_GCC) else: test.warning("Returning None (__getSupportedPlatforms__())", "Parsed text: '%s'" % text) diff --git a/tests/system/suite_CCOM/tst_CCOM01/test.py b/tests/system/suite_CCOM/tst_CCOM01/test.py index 798d29de5f8..54af5775db6 100755 --- a/tests/system/suite_CCOM/tst_CCOM01/test.py +++ b/tests/system/suite_CCOM/tst_CCOM01/test.py @@ -45,7 +45,8 @@ def main(): return # open example project # qmlapplicationviewer of this example supports only Qt version < 5 - targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_521_DEFAULT & ~Targets.DESKTOP_531_DEFAULT + targets = (Targets.desktopTargetClasses() & ~Targets.DESKTOP_521_DEFAULT + & ~Targets.DESKTOP_531_DEFAULT & ~Targets.DESKTOP_541_GCC) checkedTargets = openQmakeProject(examplePath, targets) if not replaceLine("propertyanimation.Sources.main\\.cpp", "#include ", diff --git a/tests/system/suite_CCOM/tst_CCOM02/test.py b/tests/system/suite_CCOM/tst_CCOM02/test.py index 4bd3c371504..4d42bb8c056 100755 --- a/tests/system/suite_CCOM/tst_CCOM02/test.py +++ b/tests/system/suite_CCOM/tst_CCOM02/test.py @@ -45,7 +45,8 @@ def main(): if not startedWithoutPluginError(): return # open example project - targets = Targets.desktopTargetClasses() & ~Targets.DESKTOP_521_DEFAULT & ~Targets.DESKTOP_531_DEFAULT + targets = (Targets.desktopTargetClasses() & ~Targets.DESKTOP_521_DEFAULT + & ~Targets.DESKTOP_531_DEFAULT & ~Targets.DESKTOP_541_GCC) openQmakeProject(examplePath, targets) # create syntax error openDocument("propertyanimation.QML.qml.property-animation\\.qml")