diff options
| author | Pasi Petäjäjärvi <pasi.petajajarvi@digia.com> | 2013-01-18 09:43:30 (GMT) |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-24 14:47:54 (GMT) |
| commit | e32ba05891b34838e918608fe2cb7e2ef66f87dc (patch) | |
| tree | d889f4db244ac25cf7ae2ff534148d58dcc7c162 /tests/auto | |
| parent | d3e0355c56f39d33e0fdedc5ef12ab9ba4c7202e (diff) | |
| download | Qt-e32ba05891b34838e918608fe2cb7e2ef66f87dc.zip Qt-e32ba05891b34838e918608fe2cb7e2ef66f87dc.tar.gz Qt-e32ba05891b34838e918608fe2cb7e2ef66f87dc.tar.bz2 | |
Fix checking QT_NO_QWS_MULTIPROCESS before using QWSSharedMemSurface
QWSSharedMemSurface is not available if we don't have multiprocess QWS,
which requires QSharedMemory support. On VxWorks DKM mode, we don't
support QSharedMemory and there no multiprocess QWS.
Change-Id: I647a576ee4d718b3dcddb0dc4d629ffcd2e163f2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Diffstat (limited to 'tests/auto')
| -rw-r--r-- | tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp index 9e296e8..2cdcd7c 100644 --- a/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp +++ b/tests/auto/qwswindowsystem/tst_qwswindowsystem.cpp @@ -71,7 +71,9 @@ private slots: void setMaxWindowRect(); void initialGeometry(); void WA_PaintOnScreen(); +#ifndef QT_NO_QWS_MULTIPROCESS void toplevelMove(); +#endif void dontFlushUnitializedWindowSurfaces(); void task188025_data(); void task188025(); @@ -389,6 +391,7 @@ void tst_QWSWindowSystem::WA_PaintOnScreen() VERIFY_COLOR(rect, QColor(Qt::red)); } +#ifndef QT_NO_QWS_MULTIPROCESS class DummyMoveSurface : public QWSSharedMemSurface { public: @@ -507,6 +510,7 @@ void tst_QWSWindowSystem::toplevelMove() } delete screen; } +#endif //QT_NO_QWS_MULTIPROCESS static void fillWindowSurface(QWidget *w, const QColor &color) { |