summaryrefslogtreecommitdiffstats
path: root/kcontrol/konqhtml/javaopts.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:55:37 -0600
commit77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8 (patch)
treea1cce95474892add7cb970b8e9fbdb16e12bc2d7 /kcontrol/konqhtml/javaopts.cpp
parent9286b9ebcc5c6b73a1061763cf5e3d9dd8eea3c0 (diff)
downloadtdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.tar.gz
tdebase-77cbe84cb6ba260fc6adc6aa64d2bd41db7f43e8.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml/javaopts.cpp')
-rw-r--r--kcontrol/konqhtml/javaopts.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp
index f5cc93f12..e21910594 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -16,7 +16,7 @@
#include <kurlrequester.h>
#include <kdebug.h>
#include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdehtml_settings.h>
#include <knuminput.h>