From 311170a69e61fdd0fa4c302ec9ceb33df2c49a5d Mon Sep 17 00:00:00 2001
From: Benjamin Poulain <benjamin.poulain@nokia.com>
Date: Wed, 6 Oct 2010 16:46:43 +0200
Subject: Fix a pending issue with the merge request 2286
A merge conflict was forgoten in the last update. This patch fixes that.
---
tools/qtconfig/mainwindow.cpp | 7 +------
1 file changed, 1 insertion(+), 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")),
--
cgit v0.12