git.iko.soy/unity8
on xenial help sign in
Merge
2657ebeAlbert Astals
src/Dash/main.cpp+4
compare with xenial
unifiedsplit
@@ -44,6 +44,10 @@ int main(int argc, const char *argv[])
44 "Load the testability driver (Alternatively export QT_LOAD_TESTABILITY");
44 "Load the testability driver (Alternatively export QT_LOAD_TESTABILITY");
45 parser.addOption(testabilityOption);
45 parser.addOption(testabilityOption);
46
46
47+ QCommandLineOption desktopFileHintOption("desktop_file_hint",
48+ "The desktop_file_hint option for QtMir", "hint_file");
49+ parser.addOption(desktopFileHintOption);
50+
47 // Treat args with single dashes the same as arguments with two dashes
51 // Treat args with single dashes the same as arguments with two dashes
48 // Ex: -fullscreen == --fullscreen
52 // Ex: -fullscreen == --fullscreen
49 parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
53 parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions);
tests/autopilot/unity8/shell/emulators/dash.py−9
@@ -18,7 +18,6 @@
18#
18#
19
19
20import logging
20import logging
21−import time
22import ubuntuuitoolkit
21import ubuntuuitoolkit
23
22
24from unity8.shell import emulators
23from unity8.shell import emulators
@@ -80,9 +79,7 @@ class Dash(emulators.UnityEmulatorBase):
80
79
81 """
80 """
82 scope_loader = self._get_scope_loader(scope_id)
81 scope_loader = self._get_scope_loader(scope_id)
83− print ("open_scope", scope_id, scope_loader)
84 if scope_loader.isCurrent:
82 if scope_loader.isCurrent:
85− print ("scope_loader.isCurrent")
86 logger.info('The scope is already open.')
83 logger.info('The scope is already open.')
87 return self._get_scope_from_loader(scope_loader)
84 return self._get_scope_from_loader(scope_loader)
88 else:
85 else:
@@ -97,12 +94,6 @@ class Dash(emulators.UnityEmulatorBase):
97 'No scope found with id {0}'.format(scope_id))
94 'No scope found with id {0}'.format(scope_id))
98
95
99 def _get_scope_from_loader(self, loader):
96 def _get_scope_from_loader(self, loader):
100− print ("_get_scope_from_loader", loader, loader.isCurrent, loader.isLoaded, loader.get_children())
101− i = 0
102− time.sleep(1)
103− while len(loader.get_children()) < 1 and i < 5:
104− time.sleep(1)
105− i = i + 1
106 return loader.get_children()[0]
97 return loader.get_children()[0]
107
98
108 def _open_scope_scrolling(self, scope_loader):
99 def _open_scope_scrolling(self, scope_loader):