diff options
| author | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-10-06 14:46:43 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-10-06 14:46:43 (GMT) |
| commit | 311170a69e61fdd0fa4c302ec9ceb33df2c49a5d (patch) | |
| tree | f9956571262a626076a3988ec78666da8ed440bd /tools | |
| parent | 255c512d7f536573963f371cdd73be0c4bd169b9 (diff) | |
| download | Qt-311170a69e61fdd0fa4c302ec9ceb33df2c49a5d.zip Qt-311170a69e61fdd0fa4c302ec9ceb33df2c49a5d.tar.gz Qt-311170a69e61fdd0fa4c302ec9ceb33df2c49a5d.tar.bz2 | |
Fix a pending issue with the merge request 2286
A merge conflict was forgoten in the last update. This patch fixes that.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qtconfig/mainwindow.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 2536275..5bd3592 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -466,14 +466,9 @@ MainWindow::MainWindow() tr("Use X11 Overlays"), Qt::ToolTipRole); #endif #ifndef QT_NO_OPENGL -<<<<<<< HEAD - videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL")); - videomodeCombo->setItemData(videomodeCombo->findText(tr("OpenGL")), tr("Use OpenGL if available"), Qt::ToolTipRole); -======= ui->videomodeCombo->addItem(tr("OpenGL"), QLatin1String("OpenGL")); ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("OpenGL")), - tr("Use OpenGL if avaiable"), Qt::ToolTipRole); ->>>>>>> Removed inheritance from UI file in qtconfig's MainWindow + tr("Use OpenGL if available"), Qt::ToolTipRole); #endif ui->videomodeCombo->addItem(tr("Software"), QLatin1String("Software")); ui->videomodeCombo->setItemData(ui->videomodeCombo->findText(tr("Software")), |