10 files changed, 50 insertions, 3 deletions
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.cpp b/src/plugins/qt4projectmanager/wizards/filespage.cpp
index 564205f713..9ad0426dca 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.cpp
+++ b/src/plugins/qt4projectmanager/wizards/filespage.cpp
@@ -175,5 +175,15 @@ void FilesPage::setFormInputChecked(bool checked)
     m_newClassWidget->setFormInputChecked(checked);
 }
 
+bool FilesPage::lowerCaseFiles() const
+{
+    return m_newClassWidget->lowerCaseFiles();
+}
+
+void FilesPage::setLowerCaseFiles(bool l)
+{
+    m_newClassWidget->setLowerCaseFiles(l);
+}
+
 } // namespace Internal
 } // namespace Qt4ProjectManager
diff --git a/src/plugins/qt4projectmanager/wizards/filespage.h b/src/plugins/qt4projectmanager/wizards/filespage.h
index c1bdaf88ec..0ef58f5db5 100644
--- a/src/plugins/qt4projectmanager/wizards/filespage.h
+++ b/src/plugins/qt4projectmanager/wizards/filespage.h
@@ -68,6 +68,7 @@ public:
     bool formInputCheckable() const;
     bool formInputChecked() const;
     QStringList baseClassChoices() const;
+    bool lowerCaseFiles() const;
 
     void setSuffixes(const QString &header, const QString &source,  const QString &form = QString());
 
@@ -79,7 +80,7 @@ public slots:
     void setFormFileInputVisible(bool visible);
     void setFormInputCheckable(bool checkable);
     void setFormInputChecked(bool checked);
-
+    void setLowerCaseFiles(bool l);
 
 private:
     Core::Utils::NewClassWidget *m_newClassWidget;
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
index 6f968c9278..b984a7fcad 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizard.cpp
@@ -82,8 +82,9 @@ QWizard *GuiAppWizard::createWizardDialog(QWidget *parent,
     GuiAppWizardDialog *dialog = new GuiAppWizardDialog(name(), icon(), extensionPages, parent);
     dialog->setPath(defaultPath.isEmpty() ? Core::Utils::PathChooser::homePath() : defaultPath);
     // Order! suffixes first to generate files correctly
+    dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
     dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
-    dialog->setBaseClasses(baseClasses());
+    dialog->setBaseClasses(baseClasses());    
     return dialog;
 }
 
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
index 45606712de..498166aaa5 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.cpp
@@ -92,6 +92,12 @@ void GuiAppWizardDialog::setSuffixes(const QString &header, const QString &sourc
     m_filesPage->setSuffixes(header, source, form);
 }
 
+void GuiAppWizardDialog::setLowerCaseFiles(bool l)
+{
+    m_filesPage->setLowerCaseFiles(l);
+}
+
+
 void GuiAppWizardDialog::setPath(const QString &path)
 {
     m_introPage->setPath(path);
diff --git a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
index 127204c5de..f115b2d9c0 100644
--- a/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/guiappwizarddialog.h
@@ -71,6 +71,7 @@ public:
 
     void setBaseClasses(const QStringList &baseClasses);
     void setSuffixes(const QString &header, const QString &source,  const QString &form);
+    void setLowerCaseFiles(bool l);
 
     QtProjectParameters projectParameters() const;
     GuiAppParameters parameters() const;
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
index 845d576110..82e24a3977 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizard.cpp
@@ -58,8 +58,9 @@ QWizard *LibraryWizard::createWizardDialog(QWidget *parent,
                                           const WizardPageList &extensionPages) const
 {
     LibraryWizardDialog *dialog = new  LibraryWizardDialog(name(), icon(), extensionPages, parent);
+    dialog->setLowerCaseFiles(QtWizard::lowerCaseFiles());
     dialog->setPath(defaultPath.isEmpty() ? Core::Utils::PathChooser::homePath() : defaultPath);
-    dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());
+    dialog->setSuffixes(headerSuffix(), sourceSuffix(), formSuffix());    
     return dialog;
 }
 
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
index 776b2a22a3..3bd3411eeb 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.cpp
@@ -182,6 +182,11 @@ void LibraryWizardDialog::setSuffixes(const QString &header, const QString &sour
     m_filesPage->setSuffixes(header, source, form);
 }
 
+void LibraryWizardDialog::setLowerCaseFiles(bool l)
+{
+    m_filesPage->setLowerCaseFiles(l);
+}
+
 void LibraryWizardDialog::setPath(const QString &path)
 {
     m_introPage->setPath(path);
diff --git a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
index 8c0a8cf2ad..bcddb2274f 100644
--- a/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
+++ b/src/plugins/qt4projectmanager/wizards/librarywizarddialog.h
@@ -53,6 +53,7 @@ public:
                                  QWidget *parent = 0);
 
     void setSuffixes(const QString &header, const QString &source,  const QString &form= QString());
+    void setLowerCaseFiles(bool);
 
     QtProjectParameters parameters() const;
     LibraryParameters libraryParameters() const;
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
index a7531d4e23..6274112d35 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.cpp
@@ -33,12 +33,15 @@
 
 #include <coreplugin/icore.h>
 #include <projectexplorer/projectexplorer.h>
+#include <cpptools/cpptoolsconstants.h>
 
 #include <QtCore/QByteArray>
 #include <QtCore/QCoreApplication>
 #include <QtCore/QFile>
 #include <QtCore/QFileInfo>
 #include <QtCore/QTextStream>
+#include <QtCore/QSettings>
+#include <QtCore/QVariant>
 
 using namespace Qt4ProjectManager;
 using namespace Qt4ProjectManager::Internal;
@@ -100,3 +103,18 @@ QString QtWizard::templateDir() const
     rc += QLatin1String("/templates/qt4project");
     return rc;
 }
+
+bool QtWizard::lowerCaseFiles()
+{
+    QString lowerCaseSettingsKey = QLatin1String(CppTools::Constants::CPPTOOLS_SETTINGSGROUP);
+    lowerCaseSettingsKey += QLatin1Char('/');
+    lowerCaseSettingsKey += QLatin1String(CppTools::Constants::LOWERCASE_CPPFILES_KEY);
+    const bool lowerCaseDefault = CppTools::Constants::lowerCaseFilesDefault;
+    return Core::ICore::instance()->settings()->value(lowerCaseSettingsKey, QVariant(lowerCaseDefault)).toBool();
+}
+
+
+
+
+
+
diff --git a/src/plugins/qt4projectmanager/wizards/qtwizard.h b/src/plugins/qt4projectmanager/wizards/qtwizard.h
index 5072cd6cef..625ab486e7 100644
--- a/src/plugins/qt4projectmanager/wizards/qtwizard.h
+++ b/src/plugins/qt4projectmanager/wizards/qtwizard.h
@@ -61,6 +61,9 @@ protected:
     QString formSuffix()    const;
     QString profileSuffix() const;
 
+    // Query CppTools settings for the class wizard settings
+    static bool lowerCaseFiles();
+
 private:
     bool postGenerateFiles(const Core::GeneratedFiles &l, QString *errorMessage);
 };