From 7eebe4e960bccf525ac7a6a26504bbf1157fd17e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 20 Apr 2012 17:18:15 +0200 Subject: 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 --- src/plugins/platforms/cocoa/qcocoaprintersupport.h | 8 ++++---- src/plugins/platforms/cocoa/qcocoawindow.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/plugins/platforms/cocoa') 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 supportedPaperSizes(const QPrinterInfo &) const; + QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QList supportedPaperSizes(const QPrinterInfo &) const Q_DECL_OVERRIDE; - Q_DECL_OVERRIDE QList availablePrinters(); + QList 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 -- cgit v1.2.3