diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-03-10 10:16:01 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-14 15:27:47 +0100 |
| commit | 45f264b682e0b2ad7a162bd75b702837fe04c06a (patch) | |
| tree | ca1f213ecff0bca1c545ecba61e350bfac857c5e /src/widgets/styles/qgtkstyle.cpp | |
| parent | 48e6352d4c5f0cfd7341b029cc8151b968a7080d (diff) | |
QGtkStyle: remove file dialog functionality
GTK+ 2.x file dialogs are now implemented in QGtk2PlatformTheme
Change-Id: I2babd6a35e7abd606ec5d047abbefbe3f0fbb892
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: David Faure <david.faure@kdab.com>
Diffstat (limited to 'src/widgets/styles/qgtkstyle.cpp')
| -rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 9ad0484bc2..9fa056960a 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -471,15 +471,8 @@ void QGtkStyle::polish(QApplication *app) QApplicationPrivate::setSystemPalette(standardPalette()); QApplicationPrivate::setSystemFont(d->getThemeFont()); d->applyCustomPaletteHash(); - if (!d->isKDE4Session()) { -#ifndef QT_NO_FILEDIALOG - qt_filedialog_open_filename_hook = &QGtkStylePrivate::openFilename; - qt_filedialog_save_filename_hook = &QGtkStylePrivate::saveFilename; - qt_filedialog_open_filenames_hook = &QGtkStylePrivate::openFilenames; - qt_filedialog_existing_directory_hook = &QGtkStylePrivate::openDirectory; -#endif + if (!d->isKDE4Session()) qApp->installEventFilter(&d->filter); - } } } @@ -493,16 +486,8 @@ void QGtkStyle::unpolish(QApplication *app) QCommonStyle::unpolish(app); QPixmapCache::clear(); - if (app->desktopSettingsAware() && d->isThemeAvailable() - && !d->isKDE4Session()) { -#ifndef QT_NO_FILEDIALOG - qt_filedialog_open_filename_hook = 0; - qt_filedialog_save_filename_hook = 0; - qt_filedialog_open_filenames_hook = 0; - qt_filedialog_existing_directory_hook = 0; -#endif + if (app->desktopSettingsAware() && d->isThemeAvailable() && !d->isKDE4Session()) qApp->removeEventFilter(&d->filter); - } } /*! |