summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/cocoa_in_qt5.mm4
-rw-r--r--wscript1
2 files changed, 3 insertions, 2 deletions
diff --git a/src/cocoa_in_qt5.mm b/src/cocoa_in_qt5.mm
index 5a7e5b0..4f2e699 100644
--- a/src/cocoa_in_qt5.mm
+++ b/src/cocoa_in_qt5.mm
@@ -60,7 +60,7 @@ public:
}
protected:
- void timerEvent(QTimerEvent* event)
+ void timerEvent(QTimerEvent* event) override
{
if (event->timerId() == _ui_timer && _idle_iface) {
_idle_iface->idle(_instance->handle);
@@ -69,7 +69,7 @@ protected:
QWidget::timerEvent(event);
}
- void closeEvent(QCloseEvent* event)
+ void closeEvent(QCloseEvent* event) override
{
if (_ui_timer && _idle_iface) {
this->killTimer(_ui_timer);
diff --git a/wscript b/wscript
index a7bca4a..f7cdddf 100644
--- a/wscript
+++ b/wscript
@@ -47,6 +47,7 @@ def configure(conf):
conf.load('compiler_cxx', cache=True)
conf.load('autowaf', cache=True)
autowaf.set_c_lang(conf, 'c99')
+ autowaf.set_cxx_lang(conf, 'c++11')
conf.env.BUILD_SHARED = not conf.options.no_shared
conf.env.BUILD_STATIC = conf.options.static