diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-06-01 18:01:34 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-07-08 03:20:56 +0000 |
| commit | 153b0e50b12c8fcf9ef8adf1efc4c50ebad9f98e (patch) | |
| tree | 6b85e9b572d39c511035060c3fc615b5e30eb1b7 | |
| parent | 477721250dfc9d83a74bced6765dff19a1ceebf3 (diff) | |
Fix ambiguous overload call on OS X
Found by ICC:
qtextengine.cpp(1259): error: more than one instance of constructor "QFixed::QFixed" matches the argument list:
function "QFixed::QFixed(int)"
function "QFixed::QFixed(long)"
function "QFixed::QFixed(qreal={double})"
argument types are: (uint)
QFixed stretch = QFixed(actualFontEngine->fontDef.stretch) / QFixed(100);
^
Change-Id: I790fb4cae1abc692705253a7863291bc8743b832
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| -rw-r--r-- | src/gui/text/qtextengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 67a19804a3..29a633f350 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -1256,7 +1256,7 @@ int QTextEngine::shapeTextWithHarfbuzzNG(const QScriptItem &si, const ushort *st // scaling the advances for this particular version if (actualFontEngine->fontDef.stretch != 100 && QSysInfo::MacintoshVersion != QSysInfo::MV_10_6) { - QFixed stretch = QFixed(actualFontEngine->fontDef.stretch) / QFixed(100); + QFixed stretch = QFixed(int(actualFontEngine->fontDef.stretch)) / QFixed(100); for (uint i = 0; i < num_glyphs; ++i) g.advances[i] *= stretch; } |