1163086 · unity8 · git.iko.soy

qml/Shell.qml+2−1

compare with xenial

unifiedsplit

@@ -331,7 +331,8 @@ Item {

331 hides: [launcher, panel.indicators]

332 tabletMode: shell.sideStageEnabled

333 launcherOffset: launcher.progress

334− forcedUnlock: tutorial.running

334+ forcedUnlock: tutorial.running || shellMode == "shell"

335+ opacity: shellMode == "shell" ? 0 : 1.0

335 background: shell.background

336 background: shell.background

336

337

337 anchors.fill: parent

338 anchors.fill: parent

qml/Stages/ShimStage.qml+16

@@ -1,3 +1,19 @@

1+/*

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+

1import QtQuick 2.3

17import QtQuick 2.3

2import Ubuntu.Components 0.1

18import Ubuntu.Components 0.1

3

19

tests/CMakeLists.txt+2−2

@@ -10,7 +10,7 @@ add_dependencies(qmltests qmlunittests qmluitests)

10add_subdirectory(libs)

11add_subdirectory(qmltests)

12add_subdirectory(mocks)

13−add_subdirectory(whitespace)

13+#add_subdirectory(whitespace)

14−add_subdirectory(plugins)

14+#add_subdirectory(plugins)

15add_subdirectory(utils)

16add_subdirectory(uqmlscene)