diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-10 03:06:15 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-10 03:06:15 +0100 |
| commit | 8fe32f7b8120366b1aa3244a3b43430a81dbe96a (patch) | |
| tree | 8768194a30ab11c2987f48b223ba64e9e3c1d4f2 | |
| parent | 58e5e487ea3a2c9ef93b726fb19b4b80c539aff1 (diff) | |
| parent | 55be074d7f40ae2d0ebed21b36192b18f7edf5b5 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I3c7d7bcca17e8fd21461ab721ec8efcb0ca2e91c
| -rw-r--r-- | src/src.pro | 1 | ||||
| -rw-r--r-- | src/winextras/doc/qtwinextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/winextras/qwinfunctions_p.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/src.pro b/src/src.pro index 5d8fdba..fceeb21 100644 --- a/src/src.pro +++ b/src/src.pro @@ -6,5 +6,6 @@ win32 { } else { # fake project for creating the documentation TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/winextras/doc/qtwinextras.qdocconf } diff --git a/src/winextras/doc/qtwinextras.qdocconf b/src/winextras/doc/qtwinextras.qdocconf index 56262e5..c6238f2 100644 --- a/src/winextras/doc/qtwinextras.qdocconf +++ b/src/winextras/doc/qtwinextras.qdocconf @@ -12,8 +12,7 @@ examplesinstallpath = winextras moduleheader = QtWinExtrasDoc includepaths = -I . \ - -I .. \ - -I $QT_INSTALL_HEADERS + -I .. headerdirs = .. ../../imports/winextras sourcedirs = .. ../../imports/winextras diff --git a/src/winextras/qwinfunctions_p.h b/src/winextras/qwinfunctions_p.h index 3aad7bc..03dff5e 100644 --- a/src/winextras/qwinfunctions_p.h +++ b/src/winextras/qwinfunctions_p.h @@ -69,10 +69,10 @@ namespace QtDwmApiDll template <class T> static T windowAttribute(HWND hwnd, DWORD attribute, T defaultValue); template <class T> static void setWindowAttribute(HWND hwnd, DWORD attribute, T value); - static bool booleanWindowAttribute(HWND hwnd, DWORD attribute) + inline bool booleanWindowAttribute(HWND hwnd, DWORD attribute) { return QtDwmApiDll::windowAttribute<BOOL>(hwnd, attribute, FALSE) != FALSE; } - static void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) + inline void setBooleanWindowAttribute(HWND hwnd, DWORD attribute, bool value) { setWindowAttribute<BOOL>(hwnd, attribute, BOOL(value ? TRUE : FALSE)); } }; |