From ab1d3a36cce914e8a831cc702d4eda84ec014f99 Mon Sep 17 00:00:00 2001 From: Alex Richardson Date: Sat, 28 Nov 2015 15:08:19 +0000 Subject: [PATCH] Set the KXMLGUI component name to okular Without this the .rc files will not be found by the unit tests or other programs that use okularpart --- part.cpp | 4 ++++ shell/shell.cpp | 2 ++ 2 files changed, 6 insertions(+) diff --git a/part.cpp b/part.cpp index 4019680a7..ab11a2560 100644 --- a/part.cpp +++ b/part.cpp @@ -292,6 +292,10 @@ const QVariantList &args) m_tempfile( 0 ), m_fileWasRemoved( false ), m_showMenuBarAction( 0 ), m_showFullScreenAction( 0 ), m_actionsSearched( false ), m_cliPresentation(false), m_cliPrint(false), m_embedMode(detectEmbedMode(parentWidget, parent, args)), m_generatorGuiClient(0), m_keeper( 0 ) { + // make sure that the component name is okular otherwise the XMLGUI .rc files are not found + // when this part is used in an application other than okular (e.g. unit tests) + setComponentName(QStringLiteral("okular"), QString()); + // first, we check if a config file name has been specified QString configFileName = detectConfigFileName( args ); if ( configFileName.isEmpty() ) diff --git a/shell/shell.cpp b/shell/shell.cpp index 339c14d69..e69ecbb5e 100644 --- a/shell/shell.cpp +++ b/shell/shell.cpp @@ -65,6 +65,8 @@ Shell::Shell( const QString &serializedOptions ) { setObjectName( QStringLiteral( "okular::Shell#" ) ); setContextMenuPolicy( Qt::NoContextMenu ); + // otherwise .rc file won't be found by unit test + setComponentName(QStringLiteral("okular"), QString()); // set the shell's ui resource file setXMLFile(QStringLiteral("shell.rc")); m_fileformatsscanned = false;