Merge remote-tracking branch 'origin/release/21.08'

This commit is contained in:
Albert Astals Cid 2021-09-18 00:08:46 +02:00
commit d11a7d42cb
2 changed files with 2 additions and 2 deletions

View file

@ -108,7 +108,7 @@ if(KF5Activities_FOUND AND BUILD_DESKTOP)
endif()
if(BUILD_DESKTOP)
ecm_add_test(annotationtoolbartest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp ../part/toggleactionmenu.cpp closedialoghelper.cpp
ecm_add_test(annotationtoolbartest.cpp ../shell/okular_main.cpp ../shell/shellutils.cpp ../shell/shell.cpp closedialoghelper.cpp
TEST_NAME "annotationtoolbartest"
LINK_LIBRARIES Qt5::Test okularpart
)

View file

@ -145,7 +145,7 @@ void AnnotationToolBarTest::testAnnotationToolBar()
QVERIFY(annToolBar);
// Check config action default enabled states
ToggleActionMenu *aQuickTools = dynamic_cast<ToggleActionMenu *>(part->actionCollection()->action(QStringLiteral("annotation_favorites")));
QAction *aQuickTools = part->actionCollection()->action(QStringLiteral("annotation_favorites"));
QAction *aAddToQuickTools = part->actionCollection()->action(QStringLiteral("annotation_bookmark"));
QAction *aAdvancedSettings = part->actionCollection()->action(QStringLiteral("annotation_settings_advanced"));
QAction *aContinuousMode = part->actionCollection()->action(QStringLiteral("annotation_settings_pin"));