summaryrefslogtreecommitdiffstats
path: root/src/gui/text
diff options
context:
space:
mode:
authorMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-11 09:42:43 (GMT)
committerMiikka Heikkinen <miikka.heikkinen@digia.com>2009-08-11 09:42:43 (GMT)
commitf79228b71b05d28b83014f262bc47e3fe9557a14 (patch)
tree3c6bff18774b9294ea1eeef7cc69186c078dd504 /src/gui/text
parent70e098d965318651acb725374b73e026f2946b76 (diff)
downloadQt-f79228b71b05d28b83014f262bc47e3fe9557a14.zip
Qt-f79228b71b05d28b83014f262bc47e3fe9557a14.tar.gz
Qt-f79228b71b05d28b83014f262bc47e3fe9557a14.tar.bz2
RVCT didn't like a test bool variable exported directly from QtGui,
causing applications to panic with KERN-EXEC 3. Fixed by providing accessor for the bool in question instead of exporting it directly. Note: Unknown why exactly this panic occurs, as exporting bools works just fine when tested with small test executable + dll. Something in QtGui causes this to fail; I suspect it might be the massive code segment size and relocation of the data segment that is contributing to this problem. RevBy: Jason Barron
Diffstat (limited to 'src/gui/text')
-rw-r--r--src/gui/text/qfontdatabase.cpp9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index d33cdf0..cba41da 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -85,7 +85,12 @@ QT_BEGIN_NAMESPACE
extern int qt_defaultDpiY(); // in qfont.cpp
-Q_GUI_EXPORT bool qt_enable_test_font = false;
+bool qt_enable_test_font = false;
+
+Q_AUTOTEST_EXPORT void qt_setQtEnableTestFont(bool value)
+{
+ qt_enable_test_font = value;
+}
static int getFontWeight(const QString &weightString)
{
@@ -2588,7 +2593,7 @@ QStringList QFontDatabase::applicationFontFamilies(int id)
\sa removeApplicationFont(), addApplicationFont(), addApplicationFontFromData()
*/
-/*!
+/*!
\fn bool QFontDatabase::supportsThreadedFontRendering()
\since 4.4