diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:38 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-10 10:28:38 +0100 |
| commit | 5ee8cb180c182e00ca2520f2da28535c9ce117d3 (patch) | |
| tree | 02531a33ca004281be0870bcb5a92855f6c4b801 /src | |
| parent | c5159ecfc36bc0f9bff45de78accd104b9637066 (diff) | |
| parent | f7239c69779e7c9e612a6b3ddb0ae1479d2bd5c2 (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Change-Id: Ie39cbcc4e877ac0ad1ae1ee2acbf3f58a2905299
Diffstat (limited to 'src')
| -rw-r--r-- | src/imports/winextras/winextras.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/winextras/winextras.pro b/src/imports/winextras/winextras.pro index 0d6ec55..19f8d2b 100644 --- a/src/imports/winextras/winextras.pro +++ b/src/imports/winextras/winextras.pro @@ -41,6 +41,6 @@ OTHER_FILES += \ JumpListDestination.qml \ JumpListSeparator.qml -qtConfig(dynamicgl):LIBS_PRIVATE += -luser32 +!qtHaveModule(opengl)|qtConfig(dynamicgl):LIBS_PRIVATE += -luser32 load(qml_plugin) |