summaryrefslogtreecommitdiffstats
path: root/khtml
diff options
context:
space:
mode:
Diffstat (limited to 'khtml')
-rw-r--r--khtml/ecma/kjs_binding.cpp2
-rw-r--r--khtml/java/CMakeLists.txt1
-rw-r--r--khtml/java/dummy/CMakeLists.txt1
-rw-r--r--khtml/misc/loader.cpp2
4 files changed, 4 insertions, 2 deletions
diff --git a/khtml/ecma/kjs_binding.cpp b/khtml/ecma/kjs_binding.cpp
index 4fa87e2ce..2646b8e26 100644
--- a/khtml/ecma/kjs_binding.cpp
+++ b/khtml/ecma/kjs_binding.cpp
@@ -190,7 +190,7 @@ ScriptInterpreter::~ScriptInterpreter()
#ifdef KJS_VERBOSE
kdDebug(6070) << "ScriptInterpreter::~ScriptInterpreter " << this << " for part=" << m_frame << endl;
#endif
- assert( interpreterList && interpreterList->contains( this ) );
+ assert( interpreterList && interpreterList->tqcontains( this ) );
interpreterList->remove( this );
if ( interpreterList->isEmpty() ) {
delete interpreterList;
diff --git a/khtml/java/CMakeLists.txt b/khtml/java/CMakeLists.txt
index 7c1e7dd43..94a249318 100644
--- a/khtml/java/CMakeLists.txt
+++ b/khtml/java/CMakeLists.txt
@@ -55,6 +55,7 @@ set( ${target}_SRCS
tde_add_library( ${target} STATIC_PIC
SOURCES ${${target}_SRCS}
+ LINK ${TQT_LIBRARIES}
)
diff --git a/khtml/java/dummy/CMakeLists.txt b/khtml/java/dummy/CMakeLists.txt
index e66bf26c6..7e00d3843 100644
--- a/khtml/java/dummy/CMakeLists.txt
+++ b/khtml/java/dummy/CMakeLists.txt
@@ -19,6 +19,7 @@ configure_file( ${CMAKE_SOURCE_DIR}/cmake/modules/template_dummy_cpp.cmake dummy
tde_add_library( kjava SHARED
SOURCES dummy.cpp
+ LINK ${TQT_LIBRARIES}
VERSION 1.0.0
DESTINATION ${LIB_INSTALL_DIR}
)
diff --git a/khtml/misc/loader.cpp b/khtml/misc/loader.cpp
index bc25991ea..460b2ceb2 100644
--- a/khtml/misc/loader.cpp
+++ b/khtml/misc/loader.cpp
@@ -1436,7 +1436,7 @@ CachedObjectType* Cache::requestObject( DocLoader* dl, const KURL& kurl, const c
if ( o && dl->needReload( o, url ) ) {
o = 0;
- assert( cache->find( url ) == 0 );
+ assert( cache->tqfind( url ) == 0 );
}
if(!o)