From ff40714773ac10ae8fda0c6bfd2b9f48234c49f4 Mon Sep 17 00:00:00 2001 From: Christoph Feck Date: Sun, 31 Mar 2019 14:00:39 +0200 Subject: [PATCH 1/2] GIT_SILENT Upgrade KDE Applications version to 19.03.90. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 924ce51107..f048bffb18 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.0) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "19") set (KDE_APPLICATIONS_VERSION_MINOR "03") -set (KDE_APPLICATIONS_VERSION_MICRO "80") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") project(Dolphin VERSION ${KDE_APPLICATIONS_VERSION}) From 30a335cbcf1268bd35e6916c3649ec1b40134858 Mon Sep 17 00:00:00 2001 From: Elvis Angelaccio Date: Sun, 7 Apr 2019 22:18:14 +0200 Subject: [PATCH 2/2] [DolphinMainWindowTest] Fix testNewFileMenuEnabled The newFileMenu enabled status is updated whenever the KDirLister emits the `completed` signal: use QTRY_COMPARE so that we can wait for it. --- src/tests/dolphinmainwindowtest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/tests/dolphinmainwindowtest.cpp b/src/tests/dolphinmainwindowtest.cpp index 9cc6b84e8d..c98ababa6a 100644 --- a/src/tests/dolphinmainwindowtest.cpp +++ b/src/tests/dolphinmainwindowtest.cpp @@ -247,7 +247,7 @@ void DolphinMainWindowTest::testNewFileMenuEnabled() QVERIFY(newFileMenu); QFETCH(bool, expectedEnabled); - QCOMPARE(newFileMenu->isEnabled(), expectedEnabled); + QTRY_COMPARE(newFileMenu->isEnabled(), expectedEnabled); } QTEST_MAIN(DolphinMainWindowTest)