vlc/vlc-2.1 | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Jul 15 17:23:27 2013 +0200| [a18d0d77a8c08887a2eeae22fc455194b0e64cbb] | committer: Jean-Baptiste Kempf
Qt: use Q_OS_* in timetooltip for Win32 and OS/2 It might need more testing in some X11 setups on Windows (cherry picked from commit ed8a1a1a966378bf2550e06b9fed41fd758f51af) Signed-off-by: Jean-Baptiste Kempf <[email protected]> > http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=a18d0d77a8c08887a2eeae22fc455194b0e64cbb --- modules/gui/qt4/util/timetooltip.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/gui/qt4/util/timetooltip.cpp b/modules/gui/qt4/util/timetooltip.cpp index 0f5666c..185622a 100644 --- a/modules/gui/qt4/util/timetooltip.cpp +++ b/modules/gui/qt4/util/timetooltip.cpp @@ -42,7 +42,7 @@ TimeTooltip::TimeTooltip( QWidget *parent ) : // a paintEvent occurs. This should save some CPU cycles. setAttribute( Qt::WA_OpaquePaintEvent ); -#if defined( Q_WS_WIN ) || defined( Q_WS_PM ) +#if defined( Q_OS_WIN ) || defined( Q_OS_OS2 ) /* - This attribute is required on Windows and OS/2 to avoid focus stealing of other windows. - When set on Linux the TimeTooltip appears behind the FSController in fullscreen. @@ -142,7 +142,7 @@ void TimeTooltip::setTip( const QPoint& target, const QString& time, const QStri void TimeTooltip::show() { QWidget::setVisible( mInitialized ); -#ifdef Q_WS_PM +#ifdef Q_OS_OS2 // Bring a tooltip on the top // Without this, tooltip does not appear on fullscreen // from the second fullscreen state change _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
