git.iko.soy/unity8
on xenial help sign in
[NOT WORKING] need to merge trunk
commit1163086f13cabad905a3e11c503b358ad9e2cb60 authorJosh Arenson <joshua.arenson@canonical.com> dateMon 13 Apr 2015, 17:57 (12 years ago) parent5fff643
3 files changed+20−3
compare with xenial
unifiedsplit
qml/Shell.qml+2−1 qml/Stages/ShimStage.qml+16 tests/CMakeLists.txt+2−2
qml/Shell.qml+2−1
@@ -331,7 +331,8 @@ Item {
331331 hides: [launcher, panel.indicators]
332332 tabletMode: shell.sideStageEnabled
333333 launcherOffset: launcher.progress
334− forcedUnlock: tutorial.running
334+ forcedUnlock: tutorial.running || shellMode == "shell"
335+ opacity: shellMode == "shell" ? 0 : 1.0
335336 background: shell.background
336337
337338 anchors.fill: parent
qml/Stages/ShimStage.qml+16
@@ -1,3 +1,19 @@
1+/*
2+ * Copyright (C) 2015 Canonical, Ltd.
3+ *
4+ * This program is free software; you can redistribute it and/or modify
5+ * it under the terms of the GNU General Public License as published by
6+ * the Free Software Foundation; version 3.
7+ *
8+ * This program is distributed in the hope that it will be useful,
9+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
10+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11+ * GNU General Public License for more details.
12+ *
13+ * You should have received a copy of the GNU General Public License
14+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
15+ */
16+
117import QtQuick 2.3
218import Ubuntu.Components 0.1
319
tests/CMakeLists.txt+2−2
@@ -10,7 +10,7 @@ add_dependencies(qmltests qmlunittests qmluitests)
1010add_subdirectory(libs)
1111add_subdirectory(qmltests)
1212add_subdirectory(mocks)
13−add_subdirectory(whitespace)
14−add_subdirectory(plugins)
13+#add_subdirectory(whitespace)
14+#add_subdirectory(plugins)
1515add_subdirectory(utils)
1616add_subdirectory(uqmlscene)