Git commit 37a3a97e834ff2821176b1132df70a256d8da302 by David Faure. Committed on 02/08/2016 at 10:33. Pushed by dfaure into branch 'master'.
Merge remote-tracking branch 'origin/frameworks' M +40 -42 CMakeLists.txt M +1 -19 doc/konqueror/index.docbook M +1 -0 keditbookmarks/org.kde.keditbookmarks.desktop M +3 -3 konq-plugins/ttsplugin/khtmltts.desktop M +1 -1 konqueror/konqbrowser.desktop M +2 -2 konqueror/settings/bookmarks/bookmarks.desktop M +1 -1 konqueror/settings/konq/fileappearance.desktop M +1 -1 konqueror/settings/konq/filebehavior.desktop M +1 -1 konqueror/settings/konq/webappearance.desktop M +1 -1 konqueror/settings/konq/webbehavior.desktop M +1 -1 konqueror/settings/konqhtml/css/kcmcss.desktop M +1 -1 konqueror/settings/konqhtml/khtml_appearance.desktop M +1 -1 konqueror/settings/konqhtml/khtml_behavior.desktop M +1 -1 konqueror/settings/konqhtml/khtml_general.desktop M +1 -1 konqueror/settings/konqhtml/khtml_java_js.desktop M +1 -1 konqueror/settings/performance/kcmkonqyperformance.desktop M +1 -1 konqueror/settings/performance/kcmperformance.desktop M +1 -1 konqueror/sidebar/history_module/kcmhistory.desktop M +46 -43 konqueror/sidebar/konqsidebarplugin.h M +190 -197 konqueror/sidebar/sidebar_widget.cpp M +52 -55 konqueror/src/tests/historymanagertest.cpp M +1 -1 nsplugins/khtml_plugins.desktop http://commits.kde.org/kde-baseapps/37a3a97e834ff2821176b1132df70a256d8da302 diff --cc CMakeLists.txt index f740f4f,3494e68..6301dff --- a/CMakeLists.txt +++ b/CMakeLists.txt @@@ -1,16 -1,30 +1,32 @@@ - project(KDEBASE_APPS) -project(KDE_BASEAPPS) - + cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR) + ++project(KDE_BASEAPPS) ++ + set(QT_MIN_VERSION "5.4.0") + set(KF5_MIN_VERSION "5.24.0") + + find_package(ECM 1.7.0 REQUIRED CONFIG) + + include(FeatureSummary) +cmake_minimum_required(VERSION 2.8.9) + # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/ is checked - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ) + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) + + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDECompilerSettings NO_POLICY_SCOPE) + include(ECMInstallIcons) + include(ECMSetupVersion) - include(CTest) - include(CTestConfig.cmake) + set(KDE_BASEAPPS_VERSION "4.97.0") - #search packages used by KDE - find_package(KDE4 4.10.60 REQUIRED) - include (KDE4Defaults) + find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core DBus Gui Widgets) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED Archive Bookmarks CoreAddons Config ConfigWidgets DBusAddons KIO KDELibs4Support Parts Activities KDELibs4Support) + if(NOT WIN32) + find_package(KF5 ${KF5_MIN_VERSION} REQUIRED Su) + endif() find_package(ZLIB) set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed files and data streams" @@@ -19,43 -33,25 +35,25 @@@ PURPOSE "Required for building Konqueror" ) - find_package(KActivities 6.1.0) - set_package_properties(KActivities PROPERTIES DESCRIPTION "Interface library for the activity manager" - URL "https://projects.kde.org/kactivities"; - TYPE RECOMMENDED - PURPOSE "Needed for Dolphin integration with activities" - ) - - include(ConfigureChecks.cmake) configure_file (config-apps.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-apps.h ) - include_directories (${CMAKE_CURRENT_BINARY_DIR}) - - add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS} -DDISABLE_NEPOMUK_LEGACY) - add_definitions (-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) - include_directories (${CMAKE_CURRENT_SOURCE_DIR}/lib/konq ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES}) - - if ( KActivities_FOUND ) - include_directories (${KACTIVITIES_INCLUDE_DIR}) - endif ( KActivities_FOUND ) - - add_subdirectory( lib ) - add_subdirectory( dolphin ) - add_subdirectory( kdialog ) - add_subdirectory( keditbookmarks ) - add_subdirectory( konqueror ) - add_subdirectory( kfind ) - macro_optional_add_subdirectory( plasma ) - add_subdirectory( konq-plugins ) - if ( Q_WS_MAC ) - add_subdirectory( kdepasswd ) - endif ( Q_WS_MAC ) - if ( Q_WS_X11 ) - add_subdirectory( nsplugins ) - add_subdirectory( kdepasswd ) - endif ( Q_WS_X11 ) - macro_optional_add_subdirectory( doc ) + add_definitions(-DQT_USE_FAST_CONCATENATION -DQT_USE_FAST_OPERATOR_PLUS) + add_definitions(-DQT_NO_URL_CAST_FROM_STRING) - feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) + add_subdirectory(lib) + add_subdirectory(kdialog) + add_subdirectory(doc) + if(NOT WIN32) + add_subdirectory(kdepasswd) + endif() + add_subdirectory(kfind) -add_subdirectory( keditbookmarks ) ++add_subdirectory(keditbookmarks) + add_subdirectory(konqueror) + add_subdirectory( konq-plugins ) + # if ( Q_WS_X11 ) + # add_subdirectory( nsplugins ) + # endif () + + feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES FATAL_ON_MISSING_REQUIRED_PACKAGES) diff --cc konqueror/src/tests/historymanagertest.cpp index e27ec00,c1997af..4bf50d0 --- a/konqueror/src/tests/historymanagertest.cpp +++ b/konqueror/src/tests/historymanagertest.cpp @@@ -31,16 -28,16 +28,16 @@@ void HistoryManagerTest::testGetSetMaxC { KonqHistoryManager mgr(0); const int oldMaxCount = mgr.maxCount(); - qDebug( "oldMaxCount=%d", oldMaxCount ); - mgr.emitSetMaxCount( 4242 ); - QTest::qWait( 100 ); // ### fragile. We have no signal to wait for, so we must just wait a little bit... + qDebug("oldMaxCount=%d", oldMaxCount); + mgr.emitSetMaxCount(4242); + QTest::qWait(100); // ### fragile. We have no signal to wait for, so we must just wait a little bit... // Yes this is just a set+get test, but given that it goes via DBUS before changing the member variable - // we do test quite a lot with it. We can't really instanciate two KonqHistoryManagers (same dbus path), + // we do test quite a lot with it. We can't really instantiate two KonqHistoryManagers (same dbus path), // so we'd need two processes to test the dbus signal 'for real', if the setter changed the member var... - QCOMPARE( mgr.maxCount(), 4242 ); - mgr.emitSetMaxCount( oldMaxCount ); - QTest::qWait( 100 ); // ### fragile. Wait again otherwise the change will be lost - QCOMPARE( mgr.maxCount(), oldMaxCount ); + QCOMPARE(mgr.maxCount(), 4242); + mgr.emitSetMaxCount(oldMaxCount); + QTest::qWait(100); // ### fragile. Wait again otherwise the change will be lost + QCOMPARE(mgr.maxCount(), oldMaxCount); } void HistoryManagerTest::testGetSetMaxAge() _______________________________________________ kde-doc-english mailing list [email protected] https://mail.kde.org/mailman/listinfo/kde-doc-english
