From 3ec68c8948284437b8591010bbbbe2ea97b8cc46 Mon Sep 17 00:00:00 2001 From: Kim Motoyoshi Kalland Date: Thu, 24 Sep 2009 10:33:39 +0200 Subject: Fixed background scrolling in the SVG viewer example. Reviewed-by: Trond --- examples/painting/svgviewer/svgview.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/examples/painting/svgviewer/svgview.cpp b/examples/painting/svgviewer/svgview.cpp index 0938ff8..76c6469 100644 --- a/examples/painting/svgviewer/svgview.cpp +++ b/examples/painting/svgviewer/svgview.cpp @@ -62,6 +62,7 @@ SvgView::SvgView(QWidget *parent) setScene(new QGraphicsScene(this)); setTransformationAnchor(AnchorUnderMouse); setDragMode(ScrollHandDrag); + setViewportUpdateMode(FullViewportUpdate); // Prepare background check-board pattern QPixmap tilePixmap(64, 64); -- cgit v0.12 From 600cef0aa62dedafac9190809230e01e3b200356 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 24 Sep 2009 10:53:30 +0200 Subject: Revert "Autotest: This test does requires internal builds (with autotests)." This reverts commit df47e0d40290f5e40054a9612f75177d9ef8537a. There is no "private_build" in Qt 4.5 Reviewed-By: thiago --- tests/auto/qkeysequence/qkeysequence.pro | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/auto/qkeysequence/qkeysequence.pro b/tests/auto/qkeysequence/qkeysequence.pro index d4779af..bd85402 100644 --- a/tests/auto/qkeysequence/qkeysequence.pro +++ b/tests/auto/qkeysequence/qkeysequence.pro @@ -1,5 +1,4 @@ load(qttest_p4) -requires(contains(QT_CONFIG,private_tests)) SOURCES += tst_qkeysequence.cpp RESOURCES += qkeysequence.qrc \ No newline at end of file -- cgit v0.12 From d04c169e424c0feee61763764e841ef132ba359f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Trond=20Kjern=C3=A5sen?= Date: Thu, 24 Sep 2009 14:51:53 +0200 Subject: Fixed text drawing regression in Assistant. Revert parts of adf322c514a5781dcb9ec304d44229fa47d5e8b3 to get this to work as in 4.5.2 again. What the original patch fixed, we don't really know.. Reviewed-by: Simon Hausmann --- src/gui/text/qfontengine_mac.mm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm index 943e3ab..007f2d4 100644 --- a/src/gui/text/qfontengine_mac.mm +++ b/src/gui/text/qfontengine_mac.mm @@ -1019,6 +1019,8 @@ bool QFontEngineMacMulti::stringToCMapInternal(const QChar *str, int len, QGlyph | kATSLineDisableAllJustification ; + layopts |= kATSLineUseDeviceMetrics; + if (fontDef.styleStrategy & QFont::NoAntialias) layopts |= kATSLineNoAntiAliasing; -- cgit v0.12 From 9e4f5f2133b542cdf6f32f2fc96dccd864e68420 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 10 Aug 2009 18:04:59 +0200 Subject: Set the QMAKE_BUNDLE_LOCATION to 'Contents/MacOS' only if it's not set This matches the logic for the 'lib' template to the one for 'app'. --- qmake/generators/unix/unixmake.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qmake/generators/unix/unixmake.cpp b/qmake/generators/unix/unixmake.cpp index 7c62e19..e99ed52 100644 --- a/qmake/generators/unix/unixmake.cpp +++ b/qmake/generators/unix/unixmake.cpp @@ -258,7 +258,7 @@ UnixMakefileGenerator::init() bundle += project->first("QMAKE_BUNDLE_EXTENSION"); else if(!bundle.endsWith(".plugin")) bundle += ".plugin"; - if(!project->isEmpty("QMAKE_BUNDLE_LOCATION")) + if(project->isEmpty("QMAKE_BUNDLE_LOCATION")) project->values("QMAKE_BUNDLE_LOCATION").append("Contents/MacOS"); } else { if(!project->isEmpty("QMAKE_FRAMEWORK_BUNDLE_NAME")) -- cgit v0.12