ENH: Add cross compiling support in the GUI in the same dialog that prompts for

      the generator on the first configure.  It either ask for a toolchain file
      or asks for all the information a toolchain file might contain.

      Also added option for setting non-default compilers if not cross compiling.
      Fixes #6849.

      Also a bit of code cleanup and re-organizing.

1 files changed, 7 insertions, 7 deletions

diff --git a/Source/QtDialog/AddCacheEntry.cxx b/Source/QtDialog/AddCacheEntry.cxx
index a38449a..eef1069 100644
--- a/Source/QtDialog/AddCacheEntry.cxx
+++ b/Source/QtDialog/AddCacheEntry.cxx
@@ -21,9 +21,9 @@
 static const int NumTypes = 4;
 static const QString TypeStrings[NumTypes] = 
   { "BOOL", "PATH", "FILEPATH", "STRING" };
-static const QCMakeCacheProperty::PropertyType Types[NumTypes] = 
-  { QCMakeCacheProperty::BOOL, QCMakeCacheProperty::PATH, 
-    QCMakeCacheProperty::FILEPATH, QCMakeCacheProperty::STRING}; 
+static const QCMakeProperty::PropertyType Types[NumTypes] = 
+  { QCMakeProperty::BOOL, QCMakeProperty::PATH, 
+    QCMakeProperty::FILEPATH, QCMakeProperty::STRING}; 
 
 AddCacheEntry::AddCacheEntry(QWidget* p)
   : QWidget(p)
@@ -34,8 +34,8 @@ AddCacheEntry::AddCacheEntry(QWidget* p)
     this->Type->addItem(TypeStrings[i]);
     }
   QWidget* cb = new QCheckBox();
-  QWidget* path = new QCMakeCachePathEditor();
-  QWidget* filepath = new QCMakeCacheFilePathEditor();
+  QWidget* path = new QCMakePathEditor();
+  QWidget* filepath = new QCMakeFilePathEditor();
   QWidget* string = new QLineEdit();
   this->StackedWidget->addWidget(cb);
   this->StackedWidget->addWidget(path);
@@ -73,14 +73,14 @@ QString AddCacheEntry::description() const
   return this->Description->text();
 }
 
-QCMakeCacheProperty::PropertyType AddCacheEntry::type() const
+QCMakeProperty::PropertyType AddCacheEntry::type() const
 {
   int idx = this->Type->currentIndex();
   if(idx >= 0 && idx < NumTypes)
     {
     return Types[idx];
     }
-  return QCMakeCacheProperty::BOOL;
+  return QCMakeProperty::BOOL;
 }