diff options
| author | Automated System <kb9vqf@pearsoncomputing.net> | 2012-02-14 22:40:43 -0600 |
|---|---|---|
| committer | Automated System <kb9vqf@pearsoncomputing.net> | 2012-02-14 22:40:43 -0600 |
| commit | 1053cdc43c88b429df96a57c9b0f14be51a71540 (patch) | |
| tree | 62f68bb172a62aeafaf56f2ee86d46f19fff9a3f /tdecore/tests/kurltest.cpp | |
| parent | de1db784f3df1568565b2d1b1a57585b54d2d462 (diff) | |
| parent | fc3c9d3c5ff6ed64cdaeaf2e9c050aa3037fe335 (diff) | |
| download | tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.tar.gz tdelibs-1053cdc43c88b429df96a57c9b0f14be51a71540.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdelibs
Diffstat (limited to 'tdecore/tests/kurltest.cpp')
| -rw-r--r-- | tdecore/tests/kurltest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tdecore/tests/kurltest.cpp b/tdecore/tests/kurltest.cpp index e5176aa9a..57ef996e1 100644 --- a/tdecore/tests/kurltest.cpp +++ b/tdecore/tests/kurltest.cpp @@ -816,7 +816,7 @@ int main(int argc, char *argv[]) check("host",ulong.host(),"swww.gad.de"); check("path",ulong.path(),"/servlet/CookieAccepted"); -#if QT_VERSION < 300 +#if TQT_VERSION < 300 qt_set_locale_codec( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); #else TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "iso-8859-1" ) ); @@ -861,7 +861,7 @@ int main(int argc, char *argv[]) testAdjustPath(); -#if QT_VERSION < 300 +#if TQT_VERSION < 300 qt_set_locale_codec( KGlobal::charsets()->codecForName( "koi8-r" ) ); #else TQTextCodec::setCodecForLocale( KGlobal::charsets()->codecForName( "koi8-r" ) ); |