make plugins load installed data from resources if not found in filesystem
ClosedPublic
Actions

Authored by amccann on Nov 12 2015, 3:04 AM.

Details

Reviewers

mwolff
apol
kfunk

Commits

R32:fce3d10b1f6e: make plugins load installed data from resources if not found in filesystem
R33:ae3e0cd4168f: make plugins load installed data from resources if not found in filesystem
R32:ae3e0cd4168f: make plugins load installed data from resources if not found in filesystem

Summary

Store plugin data in qt5's resource system

Test Plan

Compile, remove file from 'regular' system locations, ensure related feature still functions

Diff Detail

Repository

R33 KDevPlatform

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

amccann updated this revision to Diff 1234.Nov 12 2015, 3:04 AM

amccann retitled this revision from to make plugins load installed data from resources if not found in filesystem.

amccann updated this object.

amccann edited the test plan for this revision. (Show Details)

amccann added reviewers: kfunk, mwolff.

Restricted Application added a subscriber: kdevelop-devel. · View Herald TranscriptNov 12 2015, 3:04 AM

Related To D529 for kdevelop

Thanks!

This revision is now accepted and ready to land.Nov 12 2015, 10:29 AM

@apol: Does that work fine with XMLGUI? I.e. having the .rc files in resources?

@kfunk Yes..

https://quickgit.kde.org/?p=kxmlgui.git&a=blob&h=a4305a4da9e85a3f060c9ed7a9d6d452a045918c&hb=1e4b16407dcfdbec93195f77c792f384bee6c2c0&f=src%2Fkxmlguifactory.cpp

Look at line 130 there in readConfigFile

xml_file = QStringLiteral(":/kxmlgui5/") + componentName + QLatin1Char('/') + filename;

Yes, as of the last KF5 release.

This could solve quite some issues regarding XDG paths lookup on OS X and Windows (that's why it was introduced, in fact).

\o/

address style

more style concern

Closed by commit R33:ae3e0cd4168f: make plugins load installed data from resources if not found in filesystem (authored by amccann). · Explain WhyNov 12 2015, 12:45 PM

This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

		Path
M		plugins/appwizard/CMakeLists.txt (5 lines)
A	M	plugins/appwizard/kdevappwizard.qrc (9 lines)
M		plugins/classbrowser/CMakeLists.txt (5 lines)
A	M	plugins/classbrowser/kdevclassbrowser.qrc (6 lines)
M		plugins/codeutils/CMakeLists.txt (5 lines)
A	M	plugins/codeutils/kdevcodeutils.qrc (6 lines)
M		plugins/contextbrowser/CMakeLists.txt (3 lines)
A	M	plugins/contextbrowser/kdevcontextbrowser.qrc (6 lines)
M		plugins/cvs/CMakeLists.txt (7 lines)
A	M	plugins/cvs/kdevcvs.qrc (6 lines)
M		plugins/documentswitcher/CMakeLists.txt (7 lines)
A	M	plugins/documentswitcher/kdevdocumentswitcher.qrc (6 lines)
M		plugins/documentview/CMakeLists.txt (6 lines)
A	M	plugins/documentview/kdevdocumentview.qrc (6 lines)
M		plugins/externalscript/CMakeLists.txt (5 lines)
A	M	plugins/externalscript/kdevexternalscript.qrc (6 lines)
M		plugins/filemanager/CMakeLists.txt (3 lines)
A	M	plugins/filemanager/kdevfilemanager.qrc (6 lines)
M		plugins/filetemplates/CMakeLists.txt (4 lines)
A	M	plugins/filetemplates/kdevfiletemplates.qrc (9 lines)
M		plugins/grepview/CMakeLists.txt (3 lines)
A	M	plugins/grepview/kdevgrepview.qrc (6 lines)
M		plugins/patchreview/CMakeLists.txt (4 lines)
A	M	plugins/patchreview/kdevpatchreview.qrc (6 lines)
M		plugins/problemreporter/CMakeLists.txt (5 lines)
A	M	plugins/problemreporter/kdevproblemreporter.qrc (6 lines)
M		plugins/projectmanagerview/CMakeLists.txt (4 lines)
A	M	plugins/projectmanagerview/kdevprojectmanagerview.qrc (6 lines)
M		plugins/quickopen/CMakeLists.txt (4 lines)
A	M	plugins/quickopen/kdevquickopen.qrc (6 lines)
M		plugins/standardoutputview/CMakeLists.txt (3 lines)
A	M	plugins/standardoutputview/kdevstandardoutputview.qrc (6 lines)
M		plugins/switchtobuddy/CMakeLists.txt (3 lines)
A	M	plugins/switchtobuddy/kdevswitchtobuddy.qrc (6 lines)
M		plugins/testview/CMakeLists.txt (5 lines)
A	M	plugins/testview/kdevtestview.qrc (6 lines)
M		shell/CMakeLists.txt (8 lines)
A	M	shell/kdevplatformshell.qrc (12 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	1234	fe5a107		Nov 12 2015, 3:04 AM	★	★
Diff 2	1243	fe5a107	- address style	Nov 12 2015, 12:40 PM	★	★
Diff 3	1245	fe5a107	- more style concern	Nov 12 2015, 12:44 PM	★	★
Diff 4	1246	fe5a107	Commit rKDEVPLATFORMae3e0cd4168f95f09b3081bd738f7e17b1ac90e4	Nov 12 2015, 12:45 PM	★	★

Commit	Tree	Parents	Author	Summary	Date
cda66da5e9e0	1d0c725c59b4	717e8104eefa	Andrew McCann	more style concern	Nov 12 2015, 12:44 PM
717e8104eefa	1fc9617be3a9	43f80750d7c8	Andrew McCann	address style	Nov 12 2015, 12:29 PM
43f80750d7c8	6f9bae66c950	fe5a1073d627	Andrew McCann	make plugins load installed data from resources if not found in filesystem	Nov 10 2015, 10:46 AM