1 files changed, 72 insertions, 10 deletions

diff --git a/Source/cmQtAutoGenerators.cxx b/Source/cmQtAutoGenerators.cxx
index a7d20ae..835e3b4 100644
--- a/Source/cmQtAutoGenerators.cxx
+++ b/Source/cmQtAutoGenerators.cxx
@@ -365,6 +365,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
 
   std::map<std::string, std::string> configIncludes;
   std::map<std::string, std::string> configDefines;
+  std::map<std::string, std::string> configUicOptions;
 
   if (target->GetPropertyAsBool("AUTOMOC"))
     {
@@ -373,7 +374,7 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
     }
   if (target->GetPropertyAsBool("AUTOUIC"))
     {
-    this->SetupAutoUicTarget(target);
+    this->SetupAutoUicTarget(target, configUicOptions);
     }
   if (target->GetPropertyAsBool("AUTORCC"))
     {
@@ -388,7 +389,9 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
   makefile->ConfigureFile(inputFile.c_str(), outputFile.c_str(),
                           false, true, false);
 
-  if (!configDefines.empty() || !configIncludes.empty())
+  if (!configDefines.empty()
+      || !configIncludes.empty()
+      || !configUicOptions.empty())
     {
     std::ofstream infoFile(outputFile.c_str(), std::ios::app);
     if ( !infoFile )
@@ -419,6 +422,16 @@ void cmQtAutoGenerators::SetupAutoGenerateTarget(cmTarget* target)
           " " << it->second << ")\n";
         }
       }
+    if (!configUicOptions.empty())
+      {
+      for (std::map<std::string, std::string>::iterator
+            it = configUicOptions.begin(), end = configUicOptions.end();
+            it != end; ++it)
+        {
+        infoFile << "set(AM_UIC_TARGET_OPTIONS_" << it->first <<
+          " " << it->second << ")\n";
+        }
+      }
     }
 }
 
@@ -513,7 +526,7 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
                                         config_moc_compile_defs);
     if (config_moc_incs != _moc_incs)
       {
-      configIncludes["_moc_incs_" + *li] =
+      configIncludes[*li] =
                     cmLocalGenerator::EscapeForCMake(config_moc_incs.c_str());
       if(_moc_incs.empty())
         {
@@ -522,7 +535,7 @@ void cmQtAutoGenerators::SetupAutoMocTarget(cmTarget* target,
       }
     if (config_moc_compile_defs != _moc_compile_defs)
       {
-      configDefines["_moc_compile_defs_" + *li] =
+      configDefines[*li] =
             cmLocalGenerator::EscapeForCMake(config_moc_compile_defs.c_str());
       if(_moc_compile_defs.empty())
         {
@@ -565,6 +578,7 @@ void cmQtAutoGenerators::MergeUicOptions(std::vector<std::string> &opts,
     "translate",
     "postfix",
     "generator",
+    "include", // Since Qt 5.3
     "g"
   };
   std::vector<std::string> extraOpts;
@@ -600,7 +614,25 @@ void cmQtAutoGenerators::MergeUicOptions(std::vector<std::string> &opts,
   opts.insert(opts.end(), extraOpts.begin(), extraOpts.end());
 }
 
-void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget* target)
+static void GetUicOpts(cmTarget *target, const char * config,
+                       std::string &optString)
+{
+  std::vector<std::string> opts;
+  target->GetAutoUicOptions(opts, config);
+
+  const char* sep = "";
+  for(std::vector<std::string>::const_iterator optIt = opts.begin();
+      optIt != opts.end();
+      ++optIt)
+    {
+    optString += sep;
+    sep = ";";
+    optString += *optIt;
+    }
+}
+
+void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget* target,
+                          std::map<std::string, std::string> &configUicOptions)
 {
   cmMakefile *makefile = target->GetMakefile();
 
@@ -649,10 +681,30 @@ void cmQtAutoGenerators::SetupAutoUicTarget(cmTarget* target)
 
   const char *qtVersion = makefile->GetDefinition("_target_qt_version");
 
-  if (const char* opts = target->GetProperty("AUTOUIC_OPTIONS"))
+  std::string _uic_opts;
+  std::vector<std::string> configs;
+  const char *config = makefile->GetConfigurations(configs);
+  GetUicOpts(target, config, _uic_opts);
+
+  if (!_uic_opts.empty())
+    {
+    _uic_opts = cmLocalGenerator::EscapeForCMake(_uic_opts.c_str());
+    makefile->AddDefinition("_uic_target_options", _uic_opts.c_str());
+    }
+  for (std::vector<std::string>::const_iterator li = configs.begin();
+       li != configs.end(); ++li)
     {
-    makefile->AddDefinition("_uic_target_options",
-                            cmLocalGenerator::EscapeForCMake(opts).c_str());
+    std::string config_uic_opts;
+    GetUicOpts(target, li->c_str(), config_uic_opts);
+    if (config_uic_opts != _uic_opts)
+      {
+      configUicOptions[*li] =
+                    cmLocalGenerator::EscapeForCMake(config_uic_opts.c_str());
+      if(_uic_opts.empty())
+        {
+        _uic_opts = config_uic_opts;
+        }
+      }
     }
 
   for(std::vector<cmSourceFile*>::const_iterator fileIt =
@@ -971,9 +1023,19 @@ bool cmQtAutoGenerators::ReadAutogenInfoFile(cmMakefile* makefile,
   {
   const char *uicOptionsFiles
                         = makefile->GetSafeDefinition("AM_UIC_OPTIONS_FILES");
+  std::string uicOptionsPropOrig = "AM_UIC_TARGET_OPTIONS";
+  std::string uicOptionsProp = uicOptionsPropOrig;
+  if(config)
+    {
+    uicOptionsProp += "_";
+    uicOptionsProp += config;
+    }
   const char *uicTargetOptions
-                        = makefile->GetSafeDefinition("AM_UIC_TARGET_OPTIONS");
-  cmSystemTools::ExpandListArgument(uicTargetOptions, this->UicTargetOptions);
+                        = makefile->GetSafeDefinition(uicOptionsProp.c_str());
+  cmSystemTools::ExpandListArgument(
+      uicTargetOptions ? uicTargetOptions
+                       : makefile->GetSafeDefinition(includesPropOrig.c_str()),
+    this->UicTargetOptions);
   const char *uicOptionsOptions
                       = makefile->GetSafeDefinition("AM_UIC_OPTIONS_OPTIONS");
   std::vector<std::string> uicFilesVec;