Don't build qwindowsurface autotest on Mac OS.
The test was a no-op on Mac OS. It's better to avoid building or running it on Mac OS, rather than spending time compiling and running a test that does nothing on that platform. Change-Id: I4aa579036788e404f8a6a8f1a80acd32338fb3cd Reviewed-on: http://codereview.qt-project.org/5958 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
This commit is contained in:
parent
52acc24cdf
commit
0a663b92ff
@ -135,6 +135,9 @@ SUBDIRS=\
|
||||
qwswindowsystem \
|
||||
qx11info \
|
||||
|
||||
# This test cannot be run on Mac OS
|
||||
mac*:SUBDIRS -= qwindowsurface
|
||||
|
||||
# This test takes too long to run on IRIX, so skip it on that platform
|
||||
irix-*:SUBDIRS -= qitemview
|
||||
|
||||
|
@ -45,7 +45,7 @@
|
||||
#include <QPalette>
|
||||
#include <QWindowsStyle>
|
||||
|
||||
#if !defined(Q_WS_MAC) && QT_VERSION < 0x050000 // Fixme Qt 5
|
||||
#if QT_VERSION < 0x050000 // Fixme Qt 5
|
||||
|
||||
#include <private/qwindowsurface_p.h>
|
||||
#include <QDesktopWidget>
|
||||
@ -283,8 +283,9 @@ void tst_QWindowSurface::grabWidget()
|
||||
|
||||
QTEST_MAIN(tst_QWindowSurface)
|
||||
|
||||
#else // Q_WS_MAC
|
||||
#else
|
||||
|
||||
// Temporarily skip the entire test until it is fixed for Qt5
|
||||
QTEST_NOOP_MAIN
|
||||
|
||||
#endif
|
||||
|
Loading…
Reference in New Issue
Block a user