From 05c518b3dee430b56a090e34b55c3f8dbfd034d4 Mon Sep 17 00:00:00 2001
From: Simon Sasburg <simon.sasburg@gmail.com>
Date: Thu, 5 Dec 2013 22:21:03 +0000
Subject: FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE
 properly.

This fixes a regression in commit 21123416 where it was trying to better handle
a qmake from Qt5.
---
 Modules/FindQt4.cmake | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'Modules/FindQt4.cmake')

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 46a03550b3..24747f7325 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -738,6 +738,11 @@ _qt4_find_qmake("${_QT4_QMAKE_NAMES}" QT_QMAKE_EXECUTABLE QTVERSION)
 
 if (QT_QMAKE_EXECUTABLE AND QTVERSION)
 
+  if (QT_QMAKE_EXECUTABLE_LAST)
+    string(COMPARE NOTEQUAL "${QT_QMAKE_EXECUTABLE_LAST}" "${QT_QMAKE_EXECUTABLE}" QT_QMAKE_CHANGED)
+  endif()
+  set(QT_QMAKE_EXECUTABLE_LAST "${QT_QMAKE_EXECUTABLE}" CACHE INTERNAL "" FORCE)
+
   _qt4_get_version_components("${QTVERSION}" QT_VERSION_MAJOR QT_VERSION_MINOR QT_VERSION_PATCH)
 
   # ask qmake for the mkspecs directory
-- 
cgit v1.2.1