X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=CMakeLists.txt;h=81adb1ff230494d56167c5e07762492f30fa4a41;hb=d7ecdedd6735dd85f8a1f2b33350addd195124c4;hp=43a0345c0e69a8b60a2ca6175703faa2b489308f;hpb=a413d667cae0dfcae585298e6ac4707313cb32e3;p=lyx.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43a0345c0e..81adb1ff23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -588,7 +588,9 @@ if(LYX_XMINGW)
 	list(APPEND CMAKE_FIND_ROOT_PATH ${GNUWIN32_DIR})
 endif()
 
+set(QPA_XCB)
 if(LYX_USE_QT MATCHES "QT5")
+	# set QPA_XCB if QT uses X11
 	find_package(Qt5Core REQUIRED)
 	if (Qt5Core_FOUND)
 		find_package(Qt5Widgets REQUIRED)
@@ -596,6 +598,9 @@ if(LYX_USE_QT MATCHES "QT5")
 			find_package(Qt5MacExtras REQUIRED)
 		endif()
 		find_package(Qt5X11Extras QUIET)
+		if(Qt5X11Extras_FOUND)
+		  set(QPA_XCB 1)
+		endif()
 		find_package(Qt5WinExtras QUIET)
 		set(QTVERSION ${Qt5Core_VERSION})
 		macro (qt_use_modules)
@@ -761,10 +766,14 @@ if(WIN32)
 		set(WIN32_CONSOLE WIN32)
 	endif()
 	if(MSVC)
-		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX)
+		# -DPSAPI_VERSION=1 is needed to run on vista (bug 10186)
+		add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE -DNOMINMAX -DPSAPI_VERSION=1)
 		# disable checked iterators for msvc release builds to get maximum speed
 		set(CMAKE_CXX_FLAGS_RELEASE  "${CMAKE_CXX_FLAGS_RELEASE} /D_SECURE_SCL=0")
 	else()
+		# -DPSAPI_VERSION=1 is not needed for mingw, since the mingw psapi.h
+		# does not use it and always declares the vista compatible API.
+		# If this ever changes then -DPSAPI_VERSION might be needed here as well. 
 		add_definitions(-DWINVER=0x0500)
 	endif()
 endif()