git.iko.soy/unity8
on xenial help sign in
Reset always-show-osk gsetting on startup to default value (false atm)

Approved by: Albert Astals Cid, Unity8 CI Bot

commitf539fb06cf14617e334679f356a07325817b8083 authorLukáš Tinkl <lukas.tinkl@canonical.com> dateTue 21 Mar 2017, 10:51 (10 years ago) parent84ad8d9bb30f52
2 files changed+8−1
compare with xenial
unifiedsplit
src/CMakeLists.txt+3−1 src/ShellApplication.cpp+5
src/CMakeLists.txt+3−1
@@ -1,11 +1,13 @@
11add_subdirectory(libunity8-private)
22
33pkg_check_modules(CONNECTIVITY REQUIRED connectivity-qt1)
4+pkg_check_modules(GSETTINGS_QT REQUIRED gsettings-qt)
45
56include_directories(
67 SYSTEM
78 ${Qt5Gui_PRIVATE_INCLUDE_DIRS}
89 ${Qt5Quick_PRIVATE_INCLUDE_DIRS}
10+ ${GSETTINGS_QT_INCLUDE_DIRS}
911 ${CONNECTIVITY_INCLUDE_DIRS}
1012)
1113
@@ -47,7 +49,7 @@ qt5_use_modules(${SHELL_APP} DBus Gui Qml Quick Test)
4749if (NOT "${ANDROID_PROPERTIES_INCLUDE_DIRS}" STREQUAL "")
4850 set_target_properties(${SHELL_APP} PROPERTIES INCLUDE_DIRECTORIES ${ANDROID_PROPERTIES_INCLUDE_DIRS})
4951endif()
50−target_link_libraries(${SHELL_APP} ${ANDROID_PROPERTIES_LDFLAGS} UbuntuGestures connectivity-qt1 unity8-private)
52+target_link_libraries(${SHELL_APP} ${ANDROID_PROPERTIES_LDFLAGS} ${GSETTINGS_QT_LDFLAGS} UbuntuGestures connectivity-qt1 unity8-private)
5153
5254if (ENABLE_TOUCH_EMULATION)
5355 target_link_libraries(${SHELL_APP} ${MOUSETOUCHADAPTOR_LIBS_LDFLAGS})
src/ShellApplication.cpp+5
@@ -21,6 +21,8 @@
2121#include <QProcess>
2222#include <QScreen>
2323
24+#include <QGSettings>
25+
2426#include <libintl.h>
2527
2628// libandroid-properties
@@ -75,6 +77,9 @@ ShellApplication::ShellApplication(int & argc, char ** argv, bool isMirServer)
7577 bindtextdomain("unity8", translationDirectory().toUtf8().data());
7678 textdomain("unity8");
7779
80+ QScopedPointer<QGSettings> gSettings(new QGSettings("com.canonical.Unity8"));
81+ gSettings->reset(QStringLiteral("alwaysShowOsk"));
82+
7883 m_shellView = new ShellView(m_qmlEngine, &m_qmlArgs);
7984
8085 if (parser.windowGeometry().isValid()) {