diff --git a/tests/system/shared/classes.py b/tests/system/shared/classes.py index 7e8830d0902ac7b2c8e8c9ad14112c3abf1af27d..ff013241c6ff1048866a80228b7662de02114dab 100644 --- a/tests/system/shared/classes.py +++ b/tests/system/shared/classes.py @@ -172,3 +172,33 @@ class LibType: if libType == LibType.QT_PLUGIN: return "Qt Plugin" return None + +class Qt5Path: + DOCS = 0 + EXAMPLES = 1 + + @staticmethod + def getPaths(pathSpec): + if pathSpec == Qt5Path.DOCS: + path52 = "/doc" + path53 = "/Docs/Qt-5.3" + path54 = "/Docs/Qt-5.4" + elif pathSpec == Qt5Path.EXAMPLES: + path52 = "/examples" + path53 = "/Examples/Qt-5.3" + path54 = "/Examples/Qt-5.4" + else: + test.fatal("Unknown pathSpec given: %s" % str(pathSpec)) + return [] + if platform.system() in ('Microsoft', 'Windows'): + return ["C:/Qt/Qt5.2.1/5.2.1/msvc2010" + path52, + "C:/Qt/Qt5.3.1" + path53, "C:/Qt/Qt5.4.1" + path54] + elif platform.system() == 'Linux': + if __is64BitOS__(): + return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc_64" + path52, + "~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54]) + return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc" + path52, + "~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54]) + else: + return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/clang_64" + path52, + "~/Qt5.3.1" + path53]) diff --git a/tests/system/suite_HELP/tst_HELP05/test.py b/tests/system/suite_HELP/tst_HELP05/test.py index 5ec349e0d87ade4e9dce7e55bdf4d9cad4af2016..84325e251d19e3fbdffa0dcf432237c0c60d1c02 100755 --- a/tests/system/suite_HELP/tst_HELP05/test.py +++ b/tests/system/suite_HELP/tst_HELP05/test.py @@ -52,14 +52,17 @@ def main(): startApplication("qtcreator" + SettingsPath) if not startedWithoutPluginError(): return - addHelpDocumentation([os.path.join(sdkPath, "Documentation", "qt.qch")]) + qchs = [] + for p in Qt5Path.getPaths(Qt5Path.DOCS): + qchs.append(os.path.join(p, "qtquick.qch")) + addHelpDocumentation(qchs) # create qt quick application createNewQtQuickApplication(tempDir(), "SampleApp") # verify Rectangle help - verifyInteractiveQMLHelp("Rectangle {", "QML Rectangle Element") + verifyInteractiveQMLHelp("Window {", "Window QML Type") # go back to edit mode switchViewTo(ViewConstants.EDIT) # verify MouseArea help - verifyInteractiveQMLHelp("MouseArea {", "QML MouseArea Element") + verifyInteractiveQMLHelp("MouseArea {", "MouseArea QML Type") # exit invokeMenuItem("File","Exit") diff --git a/tests/system/suite_WELP/tst_WELP03/test.py b/tests/system/suite_WELP/tst_WELP03/test.py index 3e15c8f424962e251767fc07d196de3601fd9eb3..286be802dcd882b75683888d3811689c39300cef 100644 --- a/tests/system/suite_WELP/tst_WELP03/test.py +++ b/tests/system/suite_WELP/tst_WELP03/test.py @@ -31,36 +31,6 @@ source("../../shared/qtcreator.py") source("../../shared/suites_qtta.py") -class Qt5Path: - DOCS = 0 - EXAMPLES = 1 - - @staticmethod - def getPaths(pathSpec): - if pathSpec == Qt5Path.DOCS: - path52 = "/doc" - path53 = "/Docs/Qt-5.3" - path54 = "/Docs/Qt-5.4" - elif pathSpec == Qt5Path.EXAMPLES: - path52 = "/examples" - path53 = "/Examples/Qt-5.3" - path54 = "/Examples/Qt-5.4" - else: - test.fatal("Unknown pathSpec given: %s" % str(pathSpec)) - return [] - if platform.system() in ('Microsoft', 'Windows'): - return ["C:/Qt/Qt5.2.1/5.2.1/msvc2010" + path52, - "C:/Qt/Qt5.3.1" + path53, "C:/Qt/Qt5.4.1" + path54] - elif platform.system() == 'Linux': - if __is64BitOS__(): - return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc_64" + path52, - "~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54]) - return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/gcc" + path52, - "~/Qt5.3.1" + path53, "~/Qt5.4.1" + path54]) - else: - return map(os.path.expanduser, ["~/Qt5.2.1/5.2.1/clang_64" + path52, - "~/Qt5.3.1" + path53]) - def handlePackagingMessageBoxes(): if platform.system() == "Darwin": messageBox = "{type='QMessageBox' unnamed='1' visible='1'}"