diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.cpp b/src/plugins/projectexplorer/projectexplorersettingspage.cpp index 49ff412b26b..e1377185c97 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.cpp +++ b/src/plugins/projectexplorer/projectexplorersettingspage.cpp @@ -77,6 +77,7 @@ QWidget *ProjectExplorerSettingsPage::createPage(QWidget *parent) m_ui.jomCheckbox->setChecked(pes.useJom); #else m_ui.jomCheckbox->setVisible(false); + m_ui.jomLabel->setVisible(false); #endif return w; } diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.h b/src/plugins/projectexplorer/projectexplorersettingspage.h index e03eae1062e..c73d10c9dff 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.h +++ b/src/plugins/projectexplorer/projectexplorersettingspage.h @@ -52,7 +52,7 @@ public: virtual void apply(); virtual void finish(); private: - ProjectExplorer::Internal::Ui::ProjetExplorerSettingsPageUi m_ui; + Ui::ProjectExplorerSettingsPageUi m_ui; }; } // Internal diff --git a/src/plugins/projectexplorer/projectexplorersettingspage.ui b/src/plugins/projectexplorer/projectexplorersettingspage.ui index c1028e47123..c00c4ff00a9 100644 --- a/src/plugins/projectexplorer/projectexplorersettingspage.ui +++ b/src/plugins/projectexplorer/projectexplorersettingspage.ui @@ -1,13 +1,13 @@ - ProjectExplorer::Internal::ProjetExplorerSettingsPageUi - + ProjectExplorer::Internal::ProjectExplorerSettingsPageUi + 0 0 - 296 - 249 + 338 + 289 @@ -16,7 +16,7 @@ Build and Run - + @@ -39,14 +39,37 @@ - - - + + + 0 - - Use jom instead of nmake - - + + + + + + + Use jom instead of nmake + + + + + + + jom is a drop-in replacement for nmake which distributes the compilation process to multiple CPU cores. For more details, see <a href="http://qt.gitorious.org/qt-labs/jom/">the jom Homepage</a>. Disable this if you expirience problems with your Makefiles. + + + true + + + 20 + + + true + + + +