summaryrefslogtreecommitdiffstats
path: root/src/gui/text/qtextengine.cpp
diff options
context:
space:
mode:
authorMaurice Kalinowski <maurice.kalinowski@nokia.com>2009-04-28 09:59:36 (GMT)
committerMaurice Kalinowski <maurice.kalinowski@nokia.com>2009-04-29 06:33:55 (GMT)
commit75868b9e64d541ec0ffcfa04fdcc5e36354f47e4 (patch)
treea33d8fc07e7911278070f37c1a00e42d53c7688a /src/gui/text/qtextengine.cpp
parent68999af7823e80aa049c19f332045b1fb074fb96 (diff)
downloadQt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.zip
Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.tar.gz
Qt-75868b9e64d541ec0ffcfa04fdcc5e36354f47e4.tar.bz2
introduce Q_WS_WINCE
Task-number: 246130 Reviewed-by: joerg Introduce Q_WS_WINCE for Windows CE only windowing parts. So far we decided to stick with Q_WS_WIN32, but having a separate define makes the code more readable. In addition Q_WS_WINCE_WM is available for Windows Mobile only parts, where we do not check for the OS on runtime.
Diffstat (limited to 'src/gui/text/qtextengine.cpp')
-rw-r--r--src/gui/text/qtextengine.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 80a5425..faa06b7 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -868,7 +868,7 @@ void QTextEngine::shapeText(int item) const
#if defined(Q_WS_MAC)
shapeTextMac(item);
-#elif defined(Q_OS_WINCE)
+#elif defined(Q_WS_WINCE)
shapeTextWithCE(item);
#else
shapeTextWithHarfbuzz(item);
@@ -923,7 +923,7 @@ void QTextEngine::shapeText(int item) const
si.width += glyphs.advances_x[i];
}
-#if defined(Q_OS_WINCE) //TODO
+#if defined(Q_WS_WINCE) //TODO
// set the glyph attributes heuristically. Assumes a 1 to 1 relationship between chars and glyphs
// and no reordering.
// also computes logClusters heuristically