Merge branch 'master' into alpha-kung

2019-02-04 00:04:14 +09:00
parent 6a90f66b2e 05fca0e17d
commit be19793b48
75 changed files with 1141 additions and 801 deletions
@@ -332,9 +332,9 @@ void OverlayController::SetWidget( QQuickItem* quickItem,
            m_ulOverlayHandle,
            vr::VROverlayFlags_SendVRSmoothScrollEvents,
            true );
-        QString thumbIconPath
-            = QStandardPaths::locate( QStandardPaths::AppDataLocation,
-                                      QStringLiteral( "res/thumbicon.png" ) );
+        QString thumbIconPath = QStandardPaths::locate(
+            QStandardPaths::AppDataLocation,
+            QStringLiteral( "res/img/icons/thumbicon.png" ) );
        if ( QFile::exists( thumbIconPath ) )
        {
            vr::VROverlay()->SetOverlayFromFile(