diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-28 18:02:27 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-28 18:07:42 (GMT) |
| commit | 654b0866a4a189d428416a8daae80844ad4e280e (patch) | |
| tree | 3eb496092e93d7d3fb7355b21c5351badb7d792f | |
| parent | 5fe25728c0ebb04c3fd2958d902cc58d2064b84d (diff) | |
| download | Qt-654b0866a4a189d428416a8daae80844ad4e280e.zip Qt-654b0866a4a189d428416a8daae80844ad4e280e.tar.gz Qt-654b0866a4a189d428416a8daae80844ad4e280e.tar.bz2 | |
Fix errors and warnings in qtconfig.
That occured with the removal of the qt3support dependency.
The setIcon call was added after the merge request was created.
| -rw-r--r-- | tools/qtconfig/colorbutton.cpp | 2 | ||||
| -rw-r--r-- | tools/qtconfig/mainwindow.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tools/qtconfig/colorbutton.cpp b/tools/qtconfig/colorbutton.cpp index 0b0fefc..33c1b25 100644 --- a/tools/qtconfig/colorbutton.cpp +++ b/tools/qtconfig/colorbutton.cpp @@ -53,8 +53,8 @@ QT_BEGIN_NAMESPACE ColorButton::ColorButton(QWidget *parent) : QAbstractButton(parent) - , mousepressed(false) , col(Qt::black) + , mousepressed(false) { setAcceptDrops(true); connect(this, SIGNAL(clicked()), SLOT(changeColor())); diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 7bff03d..629574f 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -233,7 +233,7 @@ MainWindow::MainWindow() modified = true; desktopThemeName = tr("Desktop Settings (Default)"); - setIcon(QPixmap(":/trolltech/qtconfig/images/appicon.png")); + setWindowIcon(QPixmap(":/trolltech/qtconfig/images/appicon.png")); QStringList gstyles = QStyleFactory::keys(); gstyles.sort(); ui->guiStyleCombo->addItem(desktopThemeName); |