summaryrefslogtreecommitdiffstats
path: root/tests
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 /tests
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 'tests')
-rw-r--r--tests/auto/qtextedit/tst_qtextedit.cpp6
-rw-r--r--tests/auto/qtextlayout/tst_qtextlayout.cpp6
2 files changed, 5 insertions, 7 deletions
diff --git a/tests/auto/qtextedit/tst_qtextedit.cpp b/tests/auto/qtextedit/tst_qtextedit.cpp
index 392af5e..100eecd 100644
--- a/tests/auto/qtextedit/tst_qtextedit.cpp
+++ b/tests/auto/qtextedit/tst_qtextedit.cpp
@@ -1917,7 +1917,7 @@ void tst_QTextEdit::setText()
}
QT_BEGIN_NAMESPACE
-extern Q_GUI_EXPORT bool qt_enable_test_font;
+extern void qt_setQtEnableTestFont(bool value);
QT_END_NAMESPACE
void tst_QTextEdit::fullWidthSelection_data()
@@ -1964,7 +1964,7 @@ void tst_QTextEdit::fullWidthSelection()
cursor.setBlockFormat(bf1);
// use the test font so we always know where stuff will end up.
- qt_enable_test_font = true;
+ qt_setQtEnableTestFont(true);
QFont testFont;
testFont.setFamily("__Qt__Box__Engine__");
testFont.setPixelSize(12);
@@ -2012,7 +2012,7 @@ void tst_QTextEdit::fullWidthSelection2()
QTextCursor cursor = widget.textCursor();
// use the test font so we always know where stuff will end up.
- qt_enable_test_font = true;
+ qt_setQtEnableTestFont(true);
QFont testFont;
testFont.setFamily("__Qt__Box__Engine__");
testFont.setPixelSize(12);
diff --git a/tests/auto/qtextlayout/tst_qtextlayout.cpp b/tests/auto/qtextlayout/tst_qtextlayout.cpp
index e948cf2..d76f387 100644
--- a/tests/auto/qtextlayout/tst_qtextlayout.cpp
+++ b/tests/auto/qtextlayout/tst_qtextlayout.cpp
@@ -57,8 +57,6 @@
#define TESTFONT_SIZE 12
-
-
//TESTED_CLASS=
//TESTED_FILES=
@@ -164,12 +162,12 @@ void tst_QTextLayout::getSetCheck()
}
QT_BEGIN_NAMESPACE
-extern Q_GUI_EXPORT bool qt_enable_test_font;
+extern void qt_setQtEnableTestFont(bool value);
QT_END_NAMESPACE
tst_QTextLayout::tst_QTextLayout()
{
- qt_enable_test_font = true;
+ qt_setQtEnableTestFont(true);
}
tst_QTextLayout::~tst_QTextLayout()