diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:16:20 -0600 |
| commit | dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5 (patch) | |
| tree | 4ebcd3dac0133d8d3fa880bbf83692c305b7350d /kcontrol/konqhtml/javaopts.cpp | |
| parent | 1a9478c6e1b77b05814af8fa02cd563a5da8946b (diff) | |
| download | tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.tar.gz tdebase-dc6b76cac424bdf8b3cffb4ae82f3954d8acdba5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kcontrol/konqhtml/javaopts.cpp')
| -rw-r--r-- | kcontrol/konqhtml/javaopts.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kcontrol/konqhtml/javaopts.cpp b/kcontrol/konqhtml/javaopts.cpp index 68b20fd2f..617f79f6f 100644 --- a/kcontrol/konqhtml/javaopts.cpp +++ b/kcontrol/konqhtml/javaopts.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <klineedit.h> #include <klocale.h> -#include <khtml_settings.h> +#include <tdehtml_settings.h> #include <knuminput.h> #include <tqlayout.h> |