diff options
| -rw-r--r-- | mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf | 8 | ||||
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf index f1b78c3..1ade6b9 100644 --- a/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf +++ b/mkspecs/unsupported/linux-scratchbox2-g++/qmake.conf @@ -5,9 +5,11 @@ # default sb2 target is set appropriately, or you will have to append the # appropriate -t $target argument to sb2 -# You will probably want to set your PKG_CONFIG_PATH in order for the host -# pkg-config to correctly query and utilize your targets .pc files -# (normally stored in $staging/usr/lib/pkgconfig) +# If you want to use pkg-config you have to explicitly force it by passing +# -force-pkg-config to configure. You will probably want to export your +# PKG_CONFIG_PATH shell variable in order for the host pkg-config to +# correctly query and utilize your targets .pc files (normally stored in +# $staging/usr/lib/pkgconfig) MAKEFILE_GENERATOR = UNIX TEMPLATE = app diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp index f33e820..27ec668 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbwindowsurface.cpp @@ -262,7 +262,11 @@ void QDirectFBWindowSurface::setGeometry(const QRect &rect) if (oldSurface != dfbSurface) updateFormat(); - QWSWindowSurface::setGeometry(rect); + if (oldRect.size() != rect.size()) { + QWSWindowSurface::setGeometry(rect); + } else { + QWindowSurface::setGeometry(rect); + } } QByteArray QDirectFBWindowSurface::permanentState() const @@ -276,6 +280,8 @@ void QDirectFBWindowSurface::setPermanentState(const QByteArray &state) { if (state.size() == sizeof(this)) { sibling = *reinterpret_cast<QDirectFBWindowSurface *const*>(state.constData()); + Q_ASSERT(sibling); + sibling->setSurfaceFlags(surfaceFlags()); } } |