diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 10:20:10 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-01 10:20:10 (GMT) |
| commit | 64ca7030df6189a0bc4df36473befd868c8d2ef6 (patch) | |
| tree | d5164b278656949ceb079a299d8608b01a4a66fa /src/gui/dialogs | |
| parent | f3da2f414f9fce9aa014da79be9f50c075c60936 (diff) | |
| parent | 615aa8b5f3187811c0b9347aebbec491f3fcf7ca (diff) | |
| download | Qt-64ca7030df6189a0bc4df36473befd868c8d2ef6.zip Qt-64ca7030df6189a0bc4df36473befd868c8d2ef6.tar.gz Qt-64ca7030df6189a0bc4df36473befd868c8d2ef6.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member
Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( ca7b2e1e1ca558050cf49dd8f7c9b35e4b9d4df5 )
Fix autotest memory leak
Carbon: crash problem in QWidgetPrivate::hide_sys, v2
Carbon: crash problem in QWidgetPrivate::hide_sys
Diffstat (limited to 'src/gui/dialogs')
| -rw-r--r-- | src/gui/dialogs/qprintdialog.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/dialogs/qprintdialog.h b/src/gui/dialogs/qprintdialog.h index 390a4a0..ecd50c1 100644 --- a/src/gui/dialogs/qprintdialog.h +++ b/src/gui/dialogs/qprintdialog.h @@ -97,9 +97,9 @@ public: void done(int result); #if defined (Q_OS_UNIX) && defined (QT3_SUPPORT) - void setPrinter(QPrinter *, bool = false); - QPrinter *printer() const; - void addButton(QPushButton *button); + QT3_SUPPORT void setPrinter(QPrinter *, bool = false); + QT3_SUPPORT QPrinter *printer() const; + QT3_SUPPORT void addButton(QPushButton *button); #endif void setOption(PrintDialogOption option, bool on = true); |