Merge branch 'master' into alpha-kung

2019-01-28 03:14:42 +09:00
parent 3e9ec4a48d 7dce218529
commit cca61b3ee7
14 changed files with 438 additions and 398 deletions
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.0
 import QtQuick.Layouts 1.3
 import matzman666.advsettings 1.0
 import "." // QTBUG-34418, singletons require explicit import to load qmldir file
+import "utilities_page"

 MyStackViewPage {
    id: rootPage