diff options
| author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:36:51 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-09-25 02:36:51 (GMT) |
| commit | 21e7b562ab94514fa702b23214aa8aeb26140412 (patch) | |
| tree | 7762703eb5abc552e411f739b3284dc2651e821e | |
| parent | 32e6e9c9353dd7d9ad80f12223698e1098047f6a (diff) | |
| parent | 9e4f5f2133b542cdf6f32f2fc96dccd864e68420 (diff) | |
| download | Qt-21e7b562ab94514fa702b23214aa8aeb26140412.zip Qt-21e7b562ab94514fa702b23214aa8aeb26140412.tar.gz Qt-21e7b562ab94514fa702b23214aa8aeb26140412.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
| -rw-r--r-- | examples/painting/svgviewer/svgview.cpp | 1 | ||||
| -rw-r--r-- | qmake/generators/unix/unixmake.cpp | 2 | ||||
| -rw-r--r-- | src/gui/text/qfontengine_mac.mm | 2 | ||||
| -rw-r--r-- | tests/auto/qkeysequence/qkeysequence.pro | 1 |
4 files changed, 4 insertions, 2 deletions
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); 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")) 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; 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 |