From b9f0d81c4b605af7667a1f384fc20c17a577f5a8 Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Tue, 10 Dec 2013 18:31:36 +0100
Subject: Define QT_NO_DEBUG for non-debug use of Qt 4.

---
 Modules/FindQt4.cmake | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/Modules/FindQt4.cmake b/Modules/FindQt4.cmake
index 24747f7..28b8454 100644
--- a/Modules/FindQt4.cmake
+++ b/Modules/FindQt4.cmake
@@ -1203,6 +1203,10 @@ if (QT_QMAKE_EXECUTABLE AND QTVERSION)
       "${QT_MKSPECS_DIR}/default"
       ${QT_INCLUDE_DIR}
   )
+  set_property(TARGET Qt4::QtCore APPEND PROPERTY
+    INTERFACE_COMPILE_DEFINITIONS
+      $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>
+  )
   set_property(TARGET Qt4::QtCore PROPERTY
     INTERFACE_QT_MAJOR_VERSION 4
   )
-- 
cgit v0.12


From 3e97bcb1ef18c7b1e16f81733896764bfd8178aa Mon Sep 17 00:00:00 2001
From: Stephen Kelly <steveire@gmail.com>
Date: Thu, 12 Dec 2013 18:22:17 +0100
Subject: Use a config-specific moc parameters file, if needed.

---
 Modules/Qt4Macros.cmake | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Modules/Qt4Macros.cmake b/Modules/Qt4Macros.cmake
index b5f005f..fd9819f 100644
--- a/Modules/Qt4Macros.cmake
+++ b/Modules/Qt4Macros.cmake
@@ -120,6 +120,7 @@ macro (QT4_CREATE_MOC_COMMAND infile outfile moc_flags moc_options moc_target)
   string (REPLACE ";" "\n" _moc_parameters "${_moc_parameters}")
 
   if(moc_target)
+    set (_moc_parameters_file ${_moc_parameters_file}$<$<BOOL:$<CONFIGURATION>>:_$<CONFIGURATION>>)
     set(targetincludes "$<TARGET_PROPERTY:${moc_target},INCLUDE_DIRECTORIES>")
     set(targetdefines "$<TARGET_PROPERTY:${moc_target},COMPILE_DEFINITIONS>")
 
-- 
cgit v0.12