diff options
author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-17 15:48:35 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-08-17 15:49:17 +0200 |
commit | 80909635025d670912020ff8bd224b3aaf6d40da (patch) | |
tree | b4dc288d5bcda757f2ab6b1e96993c22d27583c1 /src | |
parent | f22b77975533db1c22276f2237a7565f405b77db (diff) |
Remove experimental import and add debug output with --log-level=0
The --log-level switch should be removed for production.
Diffstat (limited to 'src')
-rw-r--r-- | src/main.cpp | 7 | ||||
-rw-r--r-- | src/qml/BrowserWindow.qml | 1 | ||||
-rw-r--r-- | src/qml/PageView.qml | 1 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp index 8ca1fa8..dd018d0 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -49,10 +49,10 @@ int main(int argc, char **argv) { qputenv("QT_IM_MODULE", QByteArray("qtvirtualkeyboard")); -#if defined(HOST_BUILD) // We use touch mocking on desktop and apply all the mobile switches. QByteArrayList args = QByteArrayList() - << QByteArrayLiteral("--enable-embedded-switches"); + << QByteArrayLiteral("--enable-embedded-switches") + << QByteArrayLiteral("--log-level=0"); const int count = args.size() + argc; QVector<char*> qargv(count); @@ -63,9 +63,10 @@ int main(int argc, char **argv) qargv[i] = argv[i - args.size()]; int qAppArgCount = qargv.size(); +#if defined(HOST_BUILD) TouchMockingApplication app(qAppArgCount, qargv.data()); #else - QGuiApplication app(argc, argv); + QGuiApplication app(qAppArgCount, qargv.data()); #endif QtWebEngine::initialize(); diff --git a/src/qml/BrowserWindow.qml b/src/qml/BrowserWindow.qml index c6a6167..a0cf33c 100644 --- a/src/qml/BrowserWindow.qml +++ b/src/qml/BrowserWindow.qml @@ -37,7 +37,6 @@ import QtQuick 2.5 import QtWebEngine 1.1 -import QtWebEngine.experimental 1.0 import QtQuick.Controls 1.0 import QtQuick.Controls.Styles 1.0 diff --git a/src/qml/PageView.qml b/src/qml/PageView.qml index 8c6bd4d..0a73ac0 100644 --- a/src/qml/PageView.qml +++ b/src/qml/PageView.qml @@ -37,7 +37,6 @@ import QtQuick 2.5 import QtWebEngine 1.1 -import QtWebEngine.experimental 1.0 import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Layouts 1.2 |