Commit ae8e3df8 authored by Brad King's avatar Brad King Committed by Code Review
Browse files

Merge topic 'fixQVTKWidgetProblemWithAeroOffQt5' into master

7b31f501 Fix QVTKWidget problem on Windows with Aero off and Qt5
parents 266b4094 7b31f501
......@@ -823,6 +823,17 @@ bool QVTKWidget::winEvent(MSG* msg, long*)
}
return false;
}
#if QT_VERSION >= 0x050000
bool QVTKWidget::nativeEvent(const QByteArray& eventType, void* message, long* result)
{
if (eventType == "windows_generic_MSG")
{
winEvent((MSG*)message, result);
}
return false;
}
#endif
#endif
#if defined (QVTK_USE_CARBON)
......
......@@ -250,6 +250,11 @@ protected:
#if defined(Q_OS_WIN)
bool winEvent(MSG* msg, long* result);
#if QT_VERSION >= 0x050000
bool nativeEvent(const QByteArray& eventType, void* message, long* result);
#endif
#endif
#if defined(QVTK_USE_CARBON)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment