diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-03-03 12:04:24 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-01 15:06:41 +0000 |
| commit | 6c76553fb70b12cec178314e9d81d444a30b6f92 (patch) | |
| tree | e52e1c20b85d4cc42e086e4708607ee7f770ab22 /src | |
| parent | 8322dc84e2ed3ebde32ba0f79bccd70cfb38a5a8 (diff) | |
Define macro NTDDI_VERSION for MinGW locally in qwinjumplistcategory.cpp.
Remove the project-wide definition in the .pro file which is no longer
necessary after globally bumping WINVER to 0x600 and clean up obsolete
macro definitions.
Task-number: QTBUG-51673
Change-Id: Icb425e5a2a1e70ae63ed84f3f2d81c505cf88175
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/winextras/qwinjumplistcategory.cpp | 15 | ||||
| -rw-r--r-- | src/winextras/winextras.pro | 1 |
2 files changed, 11 insertions, 5 deletions
diff --git a/src/winextras/qwinjumplistcategory.cpp b/src/winextras/qwinjumplistcategory.cpp index 57cc8cc..5f53667 100644 --- a/src/winextras/qwinjumplistcategory.cpp +++ b/src/winextras/qwinjumplistcategory.cpp @@ -38,6 +38,17 @@ ** ****************************************************************************/ +#include <QtCore/QtGlobal> + +#ifdef Q_CC_MINGW // MinGW: Include the correct definition of SHARDAPPIDINFOLINK +# if defined(NTDDI_VERSION) && NTDDI_VERSION < 0x06010000 +# undef NTDDI_VERSION +# endif +# ifndef NTDDI_VERSION +# define NTDDI_VERSION 0x06010000 +# endif +#endif // Q_CC_MINGW + #include "qwinjumplistcategory.h" #include "qwinjumplistcategory_p.h" #include "qwinjumplistitem_p.h" @@ -50,10 +61,6 @@ #include <shlobj.h> -#if defined(_MSC_VER) && _MSC_VER < 1600 -# define SHARD_APPIDINFOLINK 0x7L -#endif - QT_BEGIN_NAMESPACE /*! diff --git a/src/winextras/winextras.pro b/src/winextras/winextras.pro index 7f6bba4..8359473 100644 --- a/src/winextras/winextras.pro +++ b/src/winextras/winextras.pro @@ -45,7 +45,6 @@ HEADERS += \ QMAKE_DOCS = $$PWD/doc/qtwinextras.qdocconf -DEFINES += NTDDI_VERSION=0x06010000 _WIN32_WINNT=0x0601 LIBS_PRIVATE += -lole32 -lshlwapi -lshell32 win32:!qtHaveModule(opengl)|contains(QT_CONFIG, dynamicgl):LIBS_PRIVATE += -lgdi32 |