diff options
| author | Brad King <brad.king@kitware.com> | 2019-04-09 12:00:10 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-04-09 12:01:01 (GMT) |
| commit | 3d15ae4ea121ba68572f0314a93b756ed2659e09 (patch) | |
| tree | b28a5f92bacfd991dde206050c4ca13cba95b7ae | |
| parent | 0e953e138bf4a5e6f1e66bf6d89241781502f088 (diff) | |
| parent | 18962f8f8f71cfb29cf56bef7dfecb022f423a28 (diff) | |
| download | CMake-3d15ae4ea121ba68572f0314a93b756ed2659e09.zip CMake-3d15ae4ea121ba68572f0314a93b756ed2659e09.tar.gz CMake-3d15ae4ea121ba68572f0314a93b756ed2659e09.tar.bz2 | |
Merge topic 'cmake-gui-windows-theme'
18962f8f8f Utilities/Release: Link statically to QWindowsVistaStyle plugin
a53c3f03bc Merge branch 'backport-cmake-gui-windows-theme'
fce03306ee cmake-gui: Fix theme on Windows with Qt >= 5.10
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3205
| -rw-r--r-- | Source/QtDialog/CMakeSetup.cxx | 3 | ||||
| -rw-r--r-- | Utilities/Release/win32_release.cmake | 1 | ||||
| -rw-r--r-- | Utilities/Release/win64_release.cmake | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/Source/QtDialog/CMakeSetup.cxx b/Source/QtDialog/CMakeSetup.cxx index cd30ad5..8d9a50c 100644 --- a/Source/QtDialog/CMakeSetup.cxx +++ b/Source/QtDialog/CMakeSetup.cxx @@ -48,6 +48,9 @@ Q_IMPORT_PLUGIN(QXcbIntegrationPlugin); #if defined(USE_QWindowsIntegrationPlugin) Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin); +# if QT_VERSION >= QT_VERSION_CHECK(5, 10, 0) +Q_IMPORT_PLUGIN(QWindowsVistaStylePlugin); +# endif #endif int main(int argc, char** argv) diff --git a/Utilities/Release/win32_release.cmake b/Utilities/Release/win32_release.cmake index 1e4421c..974c402 100644 --- a/Utilities/Release/win32_release.cmake +++ b/Utilities/Release/win32_release.cmake @@ -11,6 +11,7 @@ set(MAKE "${MAKE_PROGRAM} -j16") set(qt_prefix "c:/Qt/5.12.1/msvc2017-32-w7-mt") set(qt_win_libs ${qt_prefix}/plugins/platforms/qwindows.lib + ${qt_prefix}/plugins/styles/qwindowsvistastyle.lib ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib ${qt_prefix}/lib/Qt5ThemeSupport.lib diff --git a/Utilities/Release/win64_release.cmake b/Utilities/Release/win64_release.cmake index 98eaf19..20529f0 100644 --- a/Utilities/Release/win64_release.cmake +++ b/Utilities/Release/win64_release.cmake @@ -11,6 +11,7 @@ set(MAKE "${MAKE_PROGRAM} -j16") set(qt_prefix "c:/Qt/5.12.1/msvc2017-64-w7-mt") set(qt_win_libs ${qt_prefix}/plugins/platforms/qwindows.lib + ${qt_prefix}/plugins/styles/qwindowsvistastyle.lib ${qt_prefix}/lib/Qt5EventDispatcherSupport.lib ${qt_prefix}/lib/Qt5FontDatabaseSupport.lib ${qt_prefix}/lib/Qt5ThemeSupport.lib |