Commit f1a0af4b authored by Christian Stenger's avatar Christian Stenger
Browse files

Squish: Fix running tst_qtquick_creation3



...when running on build machine and VNC session has been started
by Jenkins. If so, the DISPLAY variable must be set automatically
and we should not override it.

Change-Id: Ic38267256c5ab8889d67fe6a4e7e46dba6515a67
Reviewed-by: default avatarRobert Loehning <robert.loehning@digia.com>
parent d646bde5
...@@ -111,6 +111,7 @@ def modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, por ...@@ -111,6 +111,7 @@ def modifyRunSettingsForHookIntoQtQuickUI(kitCount, workingDir, projectName, por
if platform.system() == "Darwin": if platform.system() == "Darwin":
__addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath) __addVariableToRunEnvironment__("DYLD_FRAMEWORK_PATH", qtLibPath)
if not platform.system() in ('Microsoft', 'Windows'): if not platform.system() in ('Microsoft', 'Windows'):
if not os.getenv("DISPLAY"):
__addVariableToRunEnvironment__("DISPLAY", ":0.0") __addVariableToRunEnvironment__("DISPLAY", ":0.0")
result = qmlViewer result = qmlViewer
switchViewTo(ViewConstants.EDIT) switchViewTo(ViewConstants.EDIT)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment