diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-01 12:06:48 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-01 12:06:48 +0000 |
| commit | d35d847be32636de642211665b71be5adffe9859 (patch) | |
| tree | 0e924e486778d40873e522d83724cba1031e5312 /src/plugins/platforms/windows/qwindowsnativeinterface.h | |
| parent | 1a421248396e4b2bdc9ff3ebb63b1edf41c93474 (diff) | |
| parent | 24cd4a71905a481d937cbd5c4cb9fb8bb91532c9 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.7' into dev" into refs/staging/dev
Diffstat (limited to 'src/plugins/platforms/windows/qwindowsnativeinterface.h')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsnativeinterface.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qwindowsnativeinterface.h b/src/plugins/platforms/windows/qwindowsnativeinterface.h index 3a0d3398d9..9fc43ddcce 100644 --- a/src/plugins/platforms/windows/qwindowsnativeinterface.h +++ b/src/plugins/platforms/windows/qwindowsnativeinterface.h @@ -42,6 +42,7 @@ #include <QtGui/qfont.h> #include <QtGui/qpa/qplatformnativeinterface.h> +#include <QtPlatformHeaders/qwindowswindowfunctions.h> QT_BEGIN_NAMESPACE @@ -96,7 +97,15 @@ public: QVariant windowProperty(QPlatformWindow *window, const QString &name, const QVariant &defaultValue) const Q_DECL_OVERRIDE; void setWindowProperty(QPlatformWindow *window, const QString &name, const QVariant &value) Q_DECL_OVERRIDE; + static QWindowsWindowFunctions::WindowActivationBehavior windowActivationBehavior() + { return QWindowsNativeInterface::m_windowActivationBehavior; } + static void setWindowActivationBehavior(QWindowsWindowFunctions::WindowActivationBehavior b) + { QWindowsNativeInterface::m_windowActivationBehavior = b; } + QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE; + +private: + static QWindowsWindowFunctions::WindowActivationBehavior m_windowActivationBehavior; }; QT_END_NAMESPACE |