diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 02:31:56 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-11-25 02:31:56 (GMT) |
| commit | e868e896054061f35b38dd3e7b688d932be40a55 (patch) | |
| tree | 75eb8d69df9bd07f93dd1a75dd7d014486b11bd6 /src/gui/dialogs/qpagesetupdialog_mac.mm | |
| parent | 7f2877acd0183092c31b74ed0de8d54fb3c49caf (diff) | |
| parent | 25c9b6ed488b1446cbdd38186992957264596314 (diff) | |
| download | Qt-e868e896054061f35b38dd3e7b688d932be40a55.zip Qt-e868e896054061f35b38dd3e7b688d932be40a55.tar.gz Qt-e868e896054061f35b38dd3e7b688d932be40a55.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
QThread: fix a race condition when destroying or restarting thread from finished()
QThreadStorage: fix crash if thread local destructor reset himself
Add WA_MacNoShadow widget attribute
Doc: Fixing typo
Fix compilation on symbian
Fix a namespace error and some warnings found by clang
optimize ligatureHelper by using qBinaryFind instead of the for loop
QFileSystemWatcher: Do not require QApplication in the destructor.
Do not define METHOD if QT_NO_KEYWORD is defined.
QThreadPrivate::finish should not keep mutex locked when calling signals
Make QThreadStorage supports value type and not only pointers.
QThreadStorage: fix memory leak if thread storage are added while destroying
Compile fix.
Fix some warnings on Mac
Diffstat (limited to 'src/gui/dialogs/qpagesetupdialog_mac.mm')
| -rw-r--r-- | src/gui/dialogs/qpagesetupdialog_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/dialogs/qpagesetupdialog_mac.mm b/src/gui/dialogs/qpagesetupdialog_mac.mm index 0302be4..f7a9aab 100644 --- a/src/gui/dialogs/qpagesetupdialog_mac.mm +++ b/src/gui/dialogs/qpagesetupdialog_mac.mm @@ -61,7 +61,7 @@ QT_USE_NAMESPACE @end @implementation QT_MANGLE_NAMESPACE(QCocoaPageLayoutDelegate) -- (id)initWithMacPrintEngine:(QMacPrintEnginePrivate *)printEngine; +- (id)initWithMacPrintEngine:(QMacPrintEnginePrivate *)printEngine { self = [super init]; if (self) { @@ -312,4 +312,4 @@ int QPageSetupDialog::exec() QT_END_NAMESPACE -#endif QT_NO_PRINTDIALOG +#endif /* QT_NO_PRINTDIALOG */ |