summaryrefslogtreecommitdiff
path: root/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2010-12-02 18:28:16 +0100
committercon <qtc-committer@nokia.com>2010-12-06 11:18:58 +0100
commit773343f396adb765e3b1837b3d961045e2a10056 (patch)
treef0708f1718a47185e9da54f649d42d568a08944b /src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
parent5c99316624d59463d24096ff5ffadd1e58e4d12e (diff)
downloadqt-creator-773343f396adb765e3b1837b3d961045e2a10056.tar.gz
Delay widget creation of options pages till their category is shown
Also add the alternative way: IOptionsPageProvider, which states a category, and is asked for a list of options pages for that category when it is shown. Task-number: QTCREATORBUG-3131
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp')
-rw-r--r--src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
index 200d4037ce..93eb750402 100644
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -315,6 +315,8 @@ void CMakeSettingsPage::saveSettings() const
void CMakeSettingsPage::apply()
{
+ if (!m_pathchooser) // page was never shown
+ return;
if (m_cmakeExecutable == m_pathchooser->path())
return;
m_cmakeExecutable = m_pathchooser->path();