diff options
author | Liang Qi <liang.qi@qt.io> | 2017-03-13 19:45:20 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2017-03-13 19:45:20 +0000 |
commit | 77e71dac1607232160006579420df8b603118462 (patch) | |
tree | 8fe71cc79127465f63944eb0dd48a00478546f57 /src/gui/kernel/qguiapplication.cpp | |
parent | 70e772079f4943822cc469ef83fb9c43afc36514 (diff) | |
parent | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (diff) |
Merge "Merge remote-tracking branch 'origin/5.8' into 5.9" into refs/staging/5.9
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index 19f6a213f8..b665750181 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -99,7 +99,7 @@ #include <QtGui/QClipboard> #endif -#ifndef QT_NO_LIBRARY +#if QT_CONFIG(library) #include <QtCore/QLibrary> #endif @@ -1449,7 +1449,7 @@ void QGuiApplicationPrivate::init() session_manager = new QSessionManager(q, session_id, session_key); #endif -#ifndef QT_NO_LIBRARY +#if QT_CONFIG(library) if (qEnvironmentVariableIntValue("QT_LOAD_TESTABILITY") > 0) loadTestability = true; @@ -1469,7 +1469,7 @@ void QGuiApplicationPrivate::init() } #else Q_UNUSED(loadTestability); -#endif // QT_NO_LIBRARY +#endif // QT_CONFIG(library) if (layout_direction == Qt::LayoutDirectionAuto || force_reverse) QGuiApplication::setLayoutDirection(qt_detectRTLLanguage() ? Qt::RightToLeft : Qt::LeftToRight); |