summaryrefslogtreecommitdiffstats
path: root/khtml/test_regression_fontoverload.cpp
diff options
context:
space:
mode:
authorAutomated System <kb9vqf@pearsoncomputing.net>2012-02-14 22:40:43 -0600
committerAutomated System <kb9vqf@pearsoncomputing.net>2012-02-14 22:40:43 -0600
commit1053cdc43c88b429df96a57c9b0f14be51a71540 (patch)
tree62f68bb172a62aeafaf56f2ee86d46f19fff9a3f /khtml/test_regression_fontoverload.cpp
parentde1db784f3df1568565b2d1b1a57585b54d2d462 (diff)
parentfc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335 (diff)
downloadtdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.tar.gz
tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'khtml/test_regression_fontoverload.cpp')
-rw-r--r--khtml/test_regression_fontoverload.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/khtml/test_regression_fontoverload.cpp b/khtml/test_regression_fontoverload.cpp
index 2e0d86b98..b42feefee 100644
--- a/khtml/test_regression_fontoverload.cpp
+++ b/khtml/test_regression_fontoverload.cpp
@@ -245,7 +245,7 @@ TQFontDatabase::findFont( TQFont::Script script, const QFontPrivate *fp,
// fe->setScale( scale );
QFontCache::Key key( request, script, fp->screen
-#if QT_VERSION >= 0x030308
+#if TQT_VERSION >= 0x030308
, fp->paintdevice
#endif
);