[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [rekonq/frameworks] src/webwindow: adapt code to new rekonqui.rc location
From:       René J.V. Bertin <null () kde ! org>
Date:       2017-12-17 15:18:30
Message-ID: E1eQahy-0004mO-40 () code ! kde ! org
[Download RAW message or body]

Git commit d880651261ae8385d2f3f73d53c1c09d0a954309 by René J.V. Bertin.
Committed on 17/12/2017 at 15:17.
Pushed by rjvbb into branch 'frameworks'.

adapt code to new rekonqui.rc location

This restores the UI that got lost since 43205fb17fbcd34e4cac192e58a3e0450a0719f4

M  +2    -2    src/webwindow/rekonqfactory.cpp
M  +1    -1    src/webwindow/webwindow.cpp

https://commits.kde.org/rekonq/d880651261ae8385d2f3f73d53c1c09d0a954309

diff --git a/src/webwindow/rekonqfactory.cpp b/src/webwindow/rekonqfactory.cpp
index 13d4385e..a0f1e545 100644
--- a/src/webwindow/rekonqfactory.cpp
+++ b/src/webwindow/rekonqfactory.cpp
@@ -100,7 +100,7 @@ QAction *actionByName(const QString &name)
 QWidget *RekonqFactory::createWidget(const QString &name, QWidget *parent)
 {
     QDomDocument document( QL1S("rekonqui.rc") );
-    QString xmlFilePath = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QL1S("/rekonq/rekonqui.rc") ); +    QString xmlFilePath = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QL1S("/kxmlgui5/rekonq/rekonqui.rc") );  
     if (!readDocument(document, xmlFilePath))
         return 0;
@@ -231,7 +231,7 @@ QWidget *RekonqFactory::createWidget(const QString &name, QWidget \
*parent)  void RekonqFactory::updateWidget(QWidget *widg, const QString &name)
 {
     QDomDocument document( QL1S("rekonqui.rc") );
-    QString xmlFilePath = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QL1S("/rekonq/rekonqui.rc") ); +    QString xmlFilePath = \
QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
QL1S("/kxmlgui5/rekonq/rekonqui.rc") );  
     if (!readDocument(document, xmlFilePath))
         return;
diff --git a/src/webwindow/webwindow.cpp b/src/webwindow/webwindow.cpp
index 4ef975f2..10a9048c 100644
--- a/src/webwindow/webwindow.cpp
+++ b/src/webwindow/webwindow.cpp
@@ -1046,7 +1046,7 @@ void WebWindow::setupMainToolBar()
 void WebWindow::showToolbarEditor()
 {
     QPointer<KEditToolBar> ed = new KEditToolBar(actionCollection(), this);
-    ed->setResourceFile( QL1S("rekonqui.rc") );
+    ed->setResourceFile( QStandardPaths::locate(QStandardPaths::GenericDataLocation, \
                QL1S("/kxmlgui5/rekonq/rekonqui.rc")) );
     connect(ed, SIGNAL(newToolBarConfig()),this, SLOT(setupMainToolBar()));
 
     ed->exec();


[prev in list] [next in list] [prev in thread] [next in thread]