AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compilation with Q_DECL_OVERRIDE

Browse Source 
In C++11, the override keyword is placed after the function declaration

Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
Olivier Goffart 2012-04-20 17:18:15 +02:00 committed by Qt by Nokia
parent 460bf5f051
commit 7eebe4e960
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/platforms/cocoa/qcocoaprintersupport.h
View File

@ -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

2
src/plugins/platforms/cocoa/qcocoawindow.h
View File

@ -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

2
src/widgets/kernel/qapplication_p.h
View File

@ -198,7 +198,7 @@ public:
static void dispatchEnterLeave(QWidget *enter, QWidget *leave);
//modality
Q_DECL_OVERRIDE bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const;
bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const Q_DECL_OVERRIDE;
static bool isBlockedByModal(QWidget *widget);
static bool modalState();
static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0);