Reviewing merge request #2299: QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member

diff --git a/src/gui/dialogs/qprintdialog.h b/src/gui/dialogs/qprintdialog.h

#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

Commits that would be merged:

Version 1
  • Version 1
  • 9b05cc0
  • b5e59e4

    • Changing enum types to contain class type, like class::enum

  • a401cfe

    • Merge commit 'origin/subclass_fix' into 4.6.1-tag

  • 0565c3a

    • QPrintDialog::setPrinter(), QPrintDialog::printer(), QPrintDialog::addButton should be documented as QT3 support member

Showing 9b05cc0-b5e59e4

Comments

I'm not sure why 2 older diffs (from another request) appears in this merge request. It should only contain the last one:
0565c3a

avatar ulf | 2010-02-01 06:42:05 UTC

→ State changed from New to Reviewing

avatar Benjamin Poulain | 2010-02-01 08:47:47 UTC

→ State changed from Reviewing to Merged

Good for me.

Your patch (0565c3a) has been merged in a staging branch of 4.6.x (staging/oslo-¼.6).

avatar Benjamin Poulain | 2010-02-01 09:05:32 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository