diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2012-04-20 17:18:15 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-04-20 22:23:23 +0200 |
| commit | 7eebe4e960bccf525ac7a6a26504bbf1157fd17e (patch) | |
| tree | df912f91b210f258e4c215bf6c0550403764cb82 /src/plugins/platforms/cocoa | |
| parent | 460bf5f051e33fd5804ee9409b1090c3d1297f18 (diff) | |
Fix compilation with Q_DECL_OVERRIDE
In C++11, the override keyword is placed after the function declaration
Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoaprintersupport.h | 8 | ||||
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.h b/src/plugins/platforms/cocoa/qcocoaprintersupport.h index db473dfabb..2309025bb3 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.h +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.h @@ -50,11 +50,11 @@ public: QCocoaPrinterSupport(); ~QCocoaPrinterSupport(); - Q_DECL_OVERRIDE QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode); - Q_DECL_OVERRIDE QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode); - Q_DECL_OVERRIDE QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const; + QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const Q_DECL_OVERRIDE; - Q_DECL_OVERRIDE QList<QPrinterInfo> availablePrinters(); + QList<QPrinterInfo> availablePrinters() Q_DECL_OVERRIDE; }; #endif // QCOCOAPRINTERSUPPORT_H diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 0d7b8aa954..b709f384d5 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -118,7 +118,7 @@ public: void setCurrentContext(QCocoaGLContext *context); QCocoaGLContext *currentContext() const; - Q_DECL_OVERRIDE bool setWindowModified(bool modified); + bool setWindowModified(bool modified) Q_DECL_OVERRIDE; protected: // NSWindow handling. The QCocoaWindow/QNSView can either be displayed |