diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-08 08:25:24 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-06-08 08:25:24 (GMT) |
| commit | 437aa330b9ce7934200592fef0227997fbbe17b5 (patch) | |
| tree | 7c77d42962172f9b298f811ba4bf05c58fc7153b | |
| parent | f6909d47b981720cb87cb96454cdf9ea493383ee (diff) | |
| download | Qt-437aa330b9ce7934200592fef0227997fbbe17b5.zip Qt-437aa330b9ce7934200592fef0227997fbbe17b5.tar.gz Qt-437aa330b9ce7934200592fef0227997fbbe17b5.tar.bz2 | |
Fix compilation of qtconfig without X11
Patch-by: Christian Kamm
| -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) |