summaryrefslogtreecommitdiffstats
path: root/tests/auto/gui
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-02-20 17:10:21 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-03-27 22:02:39 +0100
commitd688b7c07ccbe714eb93cb93648c5a181f537c48 (patch)
treedab2b5c27166e051d27ebf7efa7dd3b77e75896d /tests/auto/gui
parent3df521dd98d32017b124ec1985389632056d3b5e (diff)
Deprecate QFont::setRawName() and QFont::rawName()
We don't support xlfd fonts anymore and indeed QFont::setRawName() is an empty method. [Changelog][QtGui] QFont::setRawName() and QFont::rawName() are deprecated. Change-Id: Ic52d42a9bc200ba8b246dd4e28c77f84e086dad5 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r--tests/auto/gui/text/qfont/tst_qfont.cpp34
1 files changed, 0 insertions, 34 deletions
diff --git a/tests/auto/gui/text/qfont/tst_qfont.cpp b/tests/auto/gui/text/qfont/tst_qfont.cpp
index dde4e54a8e..4c88212c72 100644
--- a/tests/auto/gui/text/qfont/tst_qfont.cpp
+++ b/tests/auto/gui/text/qfont/tst_qfont.cpp
@@ -74,7 +74,6 @@ private slots:
void resetFont();
#endif
void isCopyOf();
- void setFontRaw();
void italicOblique();
void insertAndRemoveSubstitutions();
void serializeSpacing();
@@ -417,15 +416,6 @@ void tst_QFont::compare()
QVERIFY(font == font2);
QVERIFY(!(font < font2));
}
-
-#if defined(Q_WS_X11)
- {
- QFont font1, font2;
- font1.setRawName("-Adobe-Helvetica-medium-r-normal--12-120-75-75-p-67-iso8859-1");
- font2.setRawName("-Adobe-Helvetica-medium-r-normal--24-240-75-75-p-130-iso8859-1");
- QVERIFY(font1 != font2);
- }
-#endif
}
void tst_QFont::resolve()
@@ -519,30 +509,6 @@ void tst_QFont::isCopyOf()
QVERIFY(!font3.isCopyOf(font));
}
-void tst_QFont::setFontRaw()
-{
-#ifndef Q_WS_X11
- QSKIP("Only tested on X11");
-#else
- QFont f;
- f.setRawName("-*-fixed-bold-r-normal--0-0-*-*-*-0-iso8859-1");
-// qDebug("font family: %s", f.family().utf8());
- QFontDatabase fdb;
- QStringList families = fdb.families();
- bool found = false;
- for (int i = 0; i < families.size(); ++i) {
- QString str = families.at(i);
- if (str.contains('['))
- str = str.left(str.indexOf('[')-1);
- if (str.toLower() == "fixed")
- found = true;
- }
- if (!found)
- QSKIP("Fixed font not available.");
- QCOMPARE(QFontInfo(f).family().left(5).toLower(), QString("fixed"));
-#endif
-}
-
void tst_QFont::insertAndRemoveSubstitutions()
{
QFont::removeSubstitution("BogusFontFamily");