Commit 1f8eae16 authored by David Faure's avatar David Faure

add_definitions(-DQT_NO_URL_CAST_FROM_STRING) + fix compilation

parent db301b6b
......@@ -55,6 +55,8 @@ set_package_properties(LibXml2 PROPERTIES
URL "http://www.xmlsoft.org/"
TYPE REQUIRED)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
add_subdirectory( plugins )
add_subdirectory( searchhandlers )
add_subdirectory( tests )
......
......@@ -561,7 +561,7 @@ QUrl Navigator::homeURL()
// We have to reparse the configuration here in order to get a
// language-specific StartUrl, e.g. "StartUrl[de]".
cfg->reparseConfiguration();
mHomeUrl = cfg->group("General").readPathEntry( "StartUrl", QLatin1String("khelpcenter:home") );
mHomeUrl = QUrl(cfg->group("General").readPathEntry( "StartUrl", QLatin1String("khelpcenter:home") ));
return mHomeUrl;
}
......
......@@ -67,7 +67,7 @@ void NavigatorAppItem::scheduleTOCBuild()
return;
}
const QUrl url = entry()->url();
const QUrl url(entry()->url());
if ( url.scheme() == QLatin1String( "help" ) ) {
mToc = new TOC( this );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment