commit 482f71c491ada6a55348efe0abb6e418df5aa558
author Brad King <brad.king@kitware.com> Wed Nov 08 08:11:41 2017 -0500
committer Brad King <brad.king@kitware.com> Wed Nov 08 08:11:41 2017 -0500
tree f89f5c469a7ea2a597ad2f1f2883dfc654ccdc80
parent ea09ee0cc35440a2005869d4828d8894ab268a28
parent 41aacca7fb61eccf673024180e6020250fb301b2

Merge branch 'implicit-lib-gcceh' into release-3.9

Merge-request: !1460

Source/CMakeVersion.cmake

diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake
index ecf5116..cf7efe0 100644
--- a/Source/CMakeVersion.cmake
+++ b/Source/CMakeVersion.cmake
@@ -1,5 +1,5 @@
 # CMake version number components.
 set(CMake_VERSION_MAJOR 3)
 set(CMake_VERSION_MINOR 9)
-set(CMake_VERSION_PATCH 4)
+set(CMake_VERSION_PATCH 5)
 #set(CMake_VERSION_RC 0)

Source/cmQtAutoGenerators.cxx

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index d12d96d..c3ecb51 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -1268,9 +1268,6 @@
              it != this->MocDefinitions.end(); ++it) {
           cmd.push_back("-D" + (*it));
         }
-        // Add options
-        cmd.insert(cmd.end(), this->MocOptions.begin(),
-                   this->MocOptions.end());
         // Execute command
         if (!this->RunCommand(cmd, output, false)) {
           {