summaryrefslogtreecommitdiffstats
path: root/src/main.cpp
diff options
context:
space:
mode:
authorMichal Klocek <michal.klocek@theqtcompany.com>2016-02-11 18:29:29 +0100
committerMichal Klocek <michal.klocek@theqtcompany.com>2016-02-12 15:21:45 +0000
commitc86bb8a400f79be205025598310926df5d01c7bc (patch)
tree40d6eb16272f17fab61277f53dd092c6bfd5ba75 /src/main.cpp
parent151b59080f80ea4cd8b902e5a18151772de595a6 (diff)
Move inputPanel out of browserWindow
On b2qt launcher uses own keyboard, prevent loading the keyboard for second time. Make Main component loaded first when run as cpp application. B2qt launcher loads BrowserWindow directly. Task-number: QTEE-1066 Change-Id: Ibae9250b0c67c42e6e2d050241c7c625522d43a3 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src/main.cpp')
-rw-r--r--src/main.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 79cb41b..919629c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -100,7 +100,7 @@ int main(int argc, char **argv)
view.setFlags(Qt::Window | Qt::WindowTitleHint);
view.setResizeMode(QQuickView::SizeRootObjectToView);
view.setColor(Qt::black);
- view.setSource(QUrl("qrc:///qml/BrowserWindow.qml"));
+ view.setSource(QUrl("qrc:///qml/Main.qml"));
QObject::connect(view.engine(), SIGNAL(quit()), &app, SLOT(quit()));