summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorOlivier Goffart <olivier.goffart@nokia.com>2010-10-07 08:26:25 (GMT)
committerOlivier Goffart <olivier.goffart@nokia.com>2010-10-07 08:27:01 (GMT)
commit9c46cde0ca27bf5edc05046b84096379d46dca33 (patch)
tree2ef4b4afc6cc91c59890548c1b5e4efc8f73cb67 /tools
parent5f46289f64c3a884d8a04154d100ce6167d183c9 (diff)
downloadQt-9c46cde0ca27bf5edc05046b84096379d46dca33.zip
Qt-9c46cde0ca27bf5edc05046b84096379d46dca33.tar.gz
Qt-9c46cde0ca27bf5edc05046b84096379d46dca33.tar.bz2
Fix compilation
after merge request 2286
Diffstat (limited to 'tools')
-rw-r--r--tools/qtconfig/mainwindow.cpp2
-rw-r--r--tools/qtconfig/mainwindow.h8
-rw-r--r--tools/qtconfig/paletteeditoradvanced.h4
-rw-r--r--tools/qtconfig/previewwidget.h3
4 files changed, 9 insertions, 8 deletions
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp
index 1a30405..f07da4f 100644
--- a/tools/qtconfig/mainwindow.cpp
+++ b/tools/qtconfig/mainwindow.cpp
@@ -421,7 +421,7 @@ MainWindow::MainWindow()
tr("Experimental aRts support for GStreamer."),
Qt::ToolTipRole);
#ifdef HAVE_PHONON
- phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
+ ui->phononVersionLabel->setText(QLatin1String(Phonon::phononVersion()));
#endif
#ifndef QT_NO_GSTREAMER
if (gst_init_check(0, 0, 0)) {
diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h
index 7cc6522..50d73f9 100644
--- a/tools/qtconfig/mainwindow.h
+++ b/tools/qtconfig/mainwindow.h
@@ -42,14 +42,14 @@
#ifndef MAINWINDOW_H
#define MAINWINDOW_H
-namespace Ui {
- class MainWindow;
-}
-
#include <QtGui/QMainWindow>
QT_BEGIN_NAMESPACE
+namespace Ui {
+ class MainWindow;
+}
+
class MainWindow : public QMainWindow
{
Q_OBJECT
diff --git a/tools/qtconfig/paletteeditoradvanced.h b/tools/qtconfig/paletteeditoradvanced.h
index 9f7a3f7..2bdb95d 100644
--- a/tools/qtconfig/paletteeditoradvanced.h
+++ b/tools/qtconfig/paletteeditoradvanced.h
@@ -44,12 +44,12 @@
#include <QtGui/QDialog>
+QT_BEGIN_NAMESPACE
+
namespace Ui {
class PaletteEditorAdvanced;
}
-QT_BEGIN_NAMESPACE
-
class ColorButton;
class PaletteEditorAdvanced : public QDialog
diff --git a/tools/qtconfig/previewwidget.h b/tools/qtconfig/previewwidget.h
index f3e5f71..e7707cd 100644
--- a/tools/qtconfig/previewwidget.h
+++ b/tools/qtconfig/previewwidget.h
@@ -44,11 +44,12 @@
#include <QtGui/QWidget>
+QT_BEGIN_NAMESPACE
+
namespace Ui {
class PreviewWidget;
}
-QT_BEGIN_NAMESPACE
class PreviewWidget : public QWidget
{