diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-08-17 16:25:39 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-08-17 16:25:39 (GMT) |
| commit | 8309d2254d7ee08dfcfd230c21d1e4e1009dc405 (patch) | |
| tree | a5d58a8028ce0617718913d7c642fdc86a555b3a | |
| parent | 81825ff81be025f596aff5561e2437e9081cf0a3 (diff) | |
| parent | 9a2ccb7060da6c66b36d74cb9f550eb04b7fa5e6 (diff) | |
| download | Qt-8309d2254d7ee08dfcfd230c21d1e4e1009dc405.zip Qt-8309d2254d7ee08dfcfd230c21d1e4e1009dc405.tar.gz Qt-8309d2254d7ee08dfcfd230c21d1e4e1009dc405.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | src/gui/kernel/qwidget_wince.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp index 4090b74..d33f5ee 100644 --- a/src/gui/kernel/qwidget_wince.cpp +++ b/src/gui/kernel/qwidget_wince.cpp @@ -332,7 +332,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO if (desktop) { q->setAttribute(Qt::WA_WState_Visible); - } else if (topLevel) { + } else if (topLevel && !q->testAttribute(Qt::WA_DontShowOnScreen)) { RECT cr; GetClientRect(id, &cr); // one cannot trust cr.left and cr.top, use a correction POINT instead diff --git a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp index 52216b0..71cbbcf 100644 --- a/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp +++ b/tests/auto/qscriptenginedebugger/tst_qscriptenginedebugger.cpp @@ -723,6 +723,9 @@ private: void tst_QScriptEngineDebugger::multithreadedDebugging() { +#ifdef Q_OS_WINCE + QSKIP("This tests uses too much memory for Windows CE", SkipAll); +#endif ScriptEvaluator eval; QThread thread; eval.moveToThread(&thread); |