diff options
| author | Robert Griebl <robert.griebl@pelagicore.com> | 2018-01-09 17:16:44 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2018-01-09 16:43:43 +0000 |
| commit | db0b2b06e910dec2106bb817595a30ebd677eff5 (patch) | |
| tree | 24b7e667c2080e18db84fce6b2f42439ad85e9f2 | |
| parent | 968c9ed9375a40da11943948e62bca15cb29b08c (diff) | |
| download | qtapplicationmanager-db0b2b06e910dec2106bb817595a30ebd677eff5.tar.gz | |
Fix Qt 5.6 build on Win and Mac
Change-Id: Icb326103325d749b9ac1622fce4a488b30dad840
Reviewed-by: Thomas Senyk <thomas.senyk@pelagicore.com>
| -rw-r--r-- | src/launcher-lib/launchermain.cpp | 2 | ||||
| -rw-r--r-- | src/shared-main-lib/sharedmain.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/launcher-lib/launchermain.cpp b/src/launcher-lib/launchermain.cpp index 8eb54002..1a85f9fc 100644 --- a/src/launcher-lib/launchermain.cpp +++ b/src/launcher-lib/launchermain.cpp @@ -87,7 +87,7 @@ LauncherMain::LauncherMain(int &argc, char **argv, const QByteArray &configYaml) //qWarning() << "### GL " << m_openGLConfiguration; // sanity checks - if (m_baseDir == qL1C('/')) + if (m_baseDir == qL1S("/")) throw Exception("Runtime launcher received an empty baseDir"); if (loggingConfig.isEmpty()) throw Exception("Runtime launcher received no logging configuration"); diff --git a/src/shared-main-lib/sharedmain.h b/src/shared-main-lib/sharedmain.h index 8c9da1ba..72c21559 100644 --- a/src/shared-main-lib/sharedmain.h +++ b/src/shared-main-lib/sharedmain.h @@ -48,8 +48,8 @@ # include <QSurfaceFormat> #endif -QT_FORWARD_DECLARE_STRUCT(QQmlDebuggingEnabler) -QT_FORWARD_DECLARE_STRUCT(QQmlEngine) +QT_FORWARD_DECLARE_CLASS(QQmlDebuggingEnabler) +QT_FORWARD_DECLARE_CLASS(QQmlEngine) QT_BEGIN_NAMESPACE_AM |