diff --git a/CMakeLists.txt b/CMakeLists.txt index 0b1c8782c..8a822fcf8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,7 +20,7 @@ include(ECMSetupVersion) set(KONQUEROR_LIB_VERSION "5.0.97") set(KONQUEROR_VERSION "${KONQUEROR_LIB_VERSION}") -find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets WebEngineWidgets) +find_package(Qt5 ${QT_MIN_VERSION} REQUIRED COMPONENTS Core Widgets) find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Parts KCMUtils KHtml KDELibs4Support Archive Crash) find_package(KF5 ${KF5_MIN_VERSION} COMPONENTS Activities DocTools) # Optional @@ -52,7 +52,6 @@ add_subdirectory( libkonq ) add_subdirectory( src ) add_subdirectory( client ) add_subdirectory( autotests ) -add_subdirectory( webenginepart ) add_subdirectory( about ) add_subdirectory( pics ) diff --git a/about/konq_aboutpage.cpp b/about/konq_aboutpage.cpp index 017875809..86d8f0d4c 100644 --- a/about/konq_aboutpage.cpp +++ b/about/konq_aboutpage.cpp @@ -219,13 +219,10 @@ QString KonqAboutPageSingleton::specs() QStringLiteral("http://www.ecma-international.org/publications/standards/ECMA-262.HTM"))) .arg(i18n("JavaScript disabled (globally). Enable JavaScript here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) .arg(i18n("JavaScript enabled (globally). Configure JavaScript here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // leave the double backslashes here, they are necessary for javascript ! - .arg(i18n("Secure Java® support", QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) - .arg(i18n("JDK 1.2.0 (Java 2) compatible VM (IBM or Sun/Oracle)", - QStringLiteral("http://www.ibm.com"), QStringLiteral("http://www.oracle.com/technetwork/java/index.html"))) + .arg(i18n("Secure Java support")) + .arg(i18n("JDK 1.2.0 (Java 2) compatible VM")) .arg(i18n("Enable Java (globally) here.", QStringLiteral("exec:/kcmshell5 khtml_java_js"))) // TODO Maybe test if Java is enabled ? - .arg(i18n("Netscape Communicator® plugins (for viewing Flash®, Real®Audio, Real®Video, etc.)", - QStringLiteral("http://www.macromedia.com/shockwave/download/index.cgi?P1_Prod_Version=ShockwaveFlash"), - QStringLiteral("http://www.real.com"), QStringLiteral("http://www.real.com"), + .arg(i18n("NPAPI® plugins", QStringLiteral("about:plugins"))) .arg(i18n("built-in")) .arg(i18n("Secure Sockets Layer")) @@ -301,8 +298,8 @@ QString KonqAboutPageSingleton::tips() .arg(i18n("Tips")) .arg(i18n("Specifications")) .arg(i18n("Tips & Tricks")) - .arg(i18n("Use Web-Shortcuts: by typing \"gg: KDE\" one can search the Internet, " - "using Google, for the search phrase \"KDE\". There are a lot of " + .arg(i18n("Use Web-Shortcuts: by typing \"dd: KDE\" one can search the Internet, " + "using DuckDuckGo HTML, for the search phrase \"KDE\". There are a lot of " "Web-Shortcuts predefined to make searching for software or looking " "up certain words in an encyclopedia a breeze. You can even " "create your own Web-Shortcuts.", QStringLiteral("exec:/kcmshell5 webshortcuts")))