on d0fa5d7 help sign in
11 files
../ CMakeLists.txtmerge trunk, resolve conflicts HomeKeyWatcher.qmlMove to importing QtQuick 2.4 & friends Style.jsFix for desktop app focus Utils.qmltypesRemoved TimeFormatter in favor of sdk LiveTimer+i18n.relativeDateTime constants.cppUpdated Utils plugin from trunk constants.hUpdated Utils plugin from trunk plugin.cppmerge trunk, resolve conflicts plugin.hreview comments qmldirAdd a mock HomeKeyWatcher to the mock Utils plugin windowstatestorage.cppfix tests (clear the mock state store between tests) windowstatestorage.hfix tests (clear the mock state store between tests)