diff options
author | Yoann Lopes <yoann.lopes@nokia.com> | 2010-10-27 11:58:37 +0200 |
---|---|---|
committer | Yoann Lopes <yoann.lopes@nokia.com> | 2010-10-27 11:58:37 +0200 |
commit | 78d3168972134a464adad500ae0d66e422fcf3f3 (patch) | |
tree | b68da9d2e1ca7873ef88b9ab5b306a619fe78049 | |
parent | 642202bc81c8a53ffb21a0d6f60d4e072d6c7788 (diff) |
Fixes variants combo box.
-rw-r--r-- | src/mainwindow.cpp | 3 | ||||
-rw-r--r-- | src/mainwindow.ui | 3 | ||||
-rw-r--r-- | src/qtdirectory.cpp | 4 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 207cd7e..2bc106e 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -317,6 +317,7 @@ void MainWindow::setCurrentQtRepo(const QString &repoName) QFileInfo f(currentRepository->testSrcDir()); if (!f.exists()) { ui->qtversions->setStyleSheet("QComboBox { color:red; }"); + ui->qtvariants->setEnabled(false); ui->profiles->setEnabled(false); // clear TestViews foreach (TestView *tview, testviews.values()) { @@ -328,6 +329,7 @@ void MainWindow::setCurrentQtRepo(const QString &repoName) return; } else { ui->qtversions->setStyleSheet(""); + ui->qtvariants->setEnabled(true); ui->profiles->setEnabled(true); } @@ -506,6 +508,7 @@ void MainWindow::on_remVersion_clicked() proxyModel = 0; ui->remVersion->setEnabled(false); ui->profiles->clear(); + ui->qtvariants->clear(); } saveRepoSettings(); diff --git a/src/mainwindow.ui b/src/mainwindow.ui index 2cfb997..279d1b8 100644 --- a/src/mainwindow.ui +++ b/src/mainwindow.ui @@ -413,6 +413,9 @@ background-color: qlineargradient(spread:pad, x1:0.5, y1:0, x2:0.5, y2:1, stop:0 </item> <item row="3" column="0"> <widget class="QComboBox" name="qtvariants"> + <property name="enabled"> + <bool>false</bool> + </property> <property name="editable"> <bool>true</bool> </property> diff --git a/src/qtdirectory.cpp b/src/qtdirectory.cpp index 6e8ef16..3f91546 100644 --- a/src/qtdirectory.cpp +++ b/src/qtdirectory.cpp @@ -106,9 +106,9 @@ QtDirectory::QtDirectory(const QString &name, const QString &location } else if (line.startsWith("CONFIG")) { if (!symbianBuildSystem) { - if(line.contains("release")) + if(line.contains(" release ")) repoVariants << "release"; - if(line.contains("debug")) + if(line.contains(" debug ")) repoVariants << "debug"; } repoCrossCompiled = line.contains("cross_compile"); |