From 501bf4918fb36798bd8b490c38ba8f6febb7c882 Mon Sep 17 00:00:00 2001 From: Rafael Roquetto Date: Fri, 28 Oct 2016 14:38:20 -0200 Subject: [PATCH] Fix CDB detection To make sure CDB is really installed on a Windows Kit, we need to assure the 'inc' subdirectory is present. Before this patch, if, for instance, the Windows 8.1 kit is present (including a Debuggers subdirectory), but without CDB, the first test under "32-bit" qmake will yield a false positive, preventing the following 32-bit kits to be tested, then to fail under the 64-bit qmake test because the 'inc' directory is inexistent, finally bringing about an empty CDB_PATH variable. Change-Id: I1d7cf3350f4a63a556ef106faa5b3f0593dcf8c8 Reviewed-by: Andrew Knight Reviewed-by: Brett Stottlemyer Reviewed-by: David Schulz --- src/libs/qtcreatorcdbext/cdb_detect.pri | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/libs/qtcreatorcdbext/cdb_detect.pri b/src/libs/qtcreatorcdbext/cdb_detect.pri index 286d9f20c30..ae09e258d4d 100644 --- a/src/libs/qtcreatorcdbext/cdb_detect.pri +++ b/src/libs/qtcreatorcdbext/cdb_detect.pri @@ -14,9 +14,9 @@ msvc { # Starting from Windows SDK 8, the headers and libs are under 'ProgramFiles (x86)'. # The libraries are under 'ProgramFiles'as well, so, check for existence of 'inc'. # 32bit qmake: - !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers" - !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.1/Debuggers" - !exists($$CDB_PATH):CDB_PATH="$$(ProgramFiles)/Windows Kits/10/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.0/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/8.1/Debuggers" + !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles)/Windows Kits/10/Debuggers" # 64bit qmake: !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.0/Debuggers" !exists($$CDB_PATH/inc):CDB_PATH="$$(ProgramFiles) (x86)/Windows Kits/8.1/Debuggers"