diff options
| author | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-28 19:10:58 (GMT) |
|---|---|---|
| committer | Olivier Goffart <olivier.goffart@nokia.com> | 2011-02-28 19:11:42 (GMT) |
| commit | 83aff7323172497e68ac59e79eacda3fe28ed9e7 (patch) | |
| tree | 42c758bcf5dd54f851615ead2d8652b927e764e6 /tools | |
| parent | 654b0866a4a189d428416a8daae80844ad4e280e (diff) | |
| download | Qt-83aff7323172497e68ac59e79eacda3fe28ed9e7.zip Qt-83aff7323172497e68ac59e79eacda3fe28ed9e7.tar.gz Qt-83aff7323172497e68ac59e79eacda3fe28ed9e7.tar.bz2 | |
qtconfig: don't connect to qt3support signals
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/qtconfig/mainwindow.cpp | 13 | ||||
| -rw-r--r-- | tools/qtconfig/mainwindow.h | 2 |
2 files changed, 8 insertions, 7 deletions
diff --git a/tools/qtconfig/mainwindow.cpp b/tools/qtconfig/mainwindow.cpp index 629574f..059adb3 100644 --- a/tools/qtconfig/mainwindow.cpp +++ b/tools/qtconfig/mainwindow.cpp @@ -200,11 +200,11 @@ MainWindow::MainWindow() connect(ui->downFontpathButton, SIGNAL(clicked()), SLOT(downFontpath())); connect(ui->downSubstitutionButton, SIGNAL(clicked()), SLOT(downSubstitute())); connect(ui->fontFamilyCombo, SIGNAL(activated(QString)), SLOT(familySelected(QString))); - connect(ui->fileExitAction, SIGNAL(activated()), SLOT(fileExit())); - connect(ui->fileSaveAction, SIGNAL(activated()), SLOT(fileSave())); - connect(ui->helpAboutAction, SIGNAL(activated()), SLOT(helpAbout())); - connect(ui->helpAboutQtAction, SIGNAL(activated()), SLOT(helpAboutQt())); - connect(ui->mainTabWidget, SIGNAL(currentChanged(QWidget*)), SLOT(pageChanged(QWidget*))); + connect(ui->fileExitAction, SIGNAL(triggered()), SLOT(fileExit())); + connect(ui->fileSaveAction, SIGNAL(triggered()), SLOT(fileSave())); + connect(ui->helpAboutAction, SIGNAL(triggered()), SLOT(helpAbout())); + connect(ui->helpAboutQtAction, SIGNAL(triggered()), SLOT(helpAboutQt())); + connect(ui->mainTabWidget, SIGNAL(currentChanged(int)), SLOT(pageChanged(int))); connect(ui->paletteCombo, SIGNAL(activated(int)), SLOT(paletteSelected(int))); connect(ui->removeFontpathButton, SIGNAL(clicked()), SLOT(removeFontpath())); connect(ui->removeSubstitutionButton, SIGNAL(clicked()), SLOT(removeSubstitute())); @@ -912,8 +912,9 @@ void MainWindow::helpAboutQt() QMessageBox::aboutQt(this, tr("Qt Configuration")); } -void MainWindow::pageChanged(QWidget *page) +void MainWindow::pageChanged(int pageNumber) { + QWidget *page = ui->mainTabWidget->widget(pageNumber); if (page == ui->interfaceTab) ui->helpView->setText(tr(interface_text)); else if (page == ui->appearanceTab) diff --git a/tools/qtconfig/mainwindow.h b/tools/qtconfig/mainwindow.h index 0cd2b29..6f4c8a5 100644 --- a/tools/qtconfig/mainwindow.h +++ b/tools/qtconfig/mainwindow.h @@ -82,7 +82,7 @@ public slots: virtual void somethingModified(); virtual void helpAbout(); virtual void helpAboutQt(); - virtual void pageChanged(QWidget *); + virtual void pageChanged(int); private: |