summaryrefslogtreecommitdiffstats
path: root/kcontrol/konqhtml/javaopts.cpp
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-14 02:02:48 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2010-04-14 02:02:48 +0000
commit1ea91382019a50de2d32be86110533e133a6c703 (patch)
tree3f62ca53cceb6b86c420790061ba31e1254078e9 /kcontrol/konqhtml/javaopts.cpp
parentec0fd51b646f8489b6e83f155c16432d361ce439 (diff)
downloadtdebase-1ea91382019a50de2d32be86110533e133a6c703.tar.gz
tdebase-1ea91382019a50de2d32be86110533e133a6c703.zip
Fixed default java path and temporarily worked around pager hang with Compiz
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1114580 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
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 539e9bb37..3cb538a9f 100644
--- a/kcontrol/konqhtml/javaopts.cpp
+++ b/kcontrol/konqhtml/javaopts.cpp
@@ -198,7 +198,7 @@ void KJavaOptions::load(bool useDefaults)
#if defined(PATH_JAVA)
QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", PATH_JAVA );
#else
- QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "java" );
+ QString sJavaPath = m_pConfig->readPathEntry( "JavaPath", "/usr/bin/java" );
#endif
if( sJavaPath == "/usr/lib/jdk" )