diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-09 03:02:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-09 03:02:19 (GMT) |
| commit | 3916feefc5ebadba3320029a29ecf02d8934e879 (patch) | |
| tree | a8fd377492c90ad8f32a2220c9e0fdddc06a9de1 | |
| parent | 410cf259cd0a1ec7e6aa97f7dc907186633ee12f (diff) | |
| parent | 437aa330b9ce7934200592fef0227997fbbe17b5 (diff) | |
| download | Qt-3916feefc5ebadba3320029a29ecf02d8934e879.zip Qt-3916feefc5ebadba3320029a29ecf02d8934e879.tar.gz Qt-3916feefc5ebadba3320029a29ecf02d8934e879.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
Fix compilation of qtconfig without X11
| -rw-r--r-- | tools/qtconfig/mainwindow.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index d5a0bde..a677a04 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -75,7 +75,9 @@ #include <phonon/phononnamespace.h> #endif +#ifdef Q_WS_X11 #include <QtGui/private/qt_x11_p.h> +#endif QT_BEGIN_NAMESPACE @@ -263,10 +265,15 @@ MainWindow::MainWindow() connect(ui->buttonMainColor, SIGNAL(colorChanged(QColor)), SLOT(buildPalette())); connect(ui->buttonWindowColor, SIGNAL(colorChanged(QColor)), SLOT(buildPalette())); +#ifdef Q_WS_X11 if (X11->desktopEnvironment == DE_KDE) ui->colorConfig->hide(); else ui->kdeNoteLabel->hide(); +#else + ui->colorConfig->hide(); + ui->kdeNoteLabel->hide(); +#endif QFontDatabase db; QStringList families = db.families(); @@ -384,7 +391,7 @@ MainWindow::MainWindow() ui->inputStyleCombo->setCurrentIndex(ui->inputStyleCombo->findText(settingsInputStyle)); #else ui->inputStyleCombo->hide(); - ui->inputStyleComboLabel->hide(); + ui->inputStyleLabel->hide(); #endif #if defined(Q_WS_X11) && !defined(QT_NO_XIM) @@ -407,7 +414,7 @@ MainWindow::MainWindow() ui->inputMethodCombo->setCurrentIndex(inputMethodComboIndex); #else ui->inputMethodCombo->hide(); - ui->inputMethodComboLabel->hide(); + ui->inputMethodLabel->hide(); #endif ui->fontEmbeddingCheckBox->setChecked(settings.value(QLatin1String("embedFonts"), true) |