Pull in QtSingleApplication class and use it as KDevelopApplication's base. Add a CMake option for this.
ClosedPublic
Actions

Authored by arrowd on Apr 11 2016, 7:14 PM.

Details

Reviewers

kfunk

Group Reviewers

KDevelop

Maniphest Tasks

T1339: Windows: Make sure we don't start/use dbus-daemon

Commits

Test Plan

KDevelop starts successfully on Windows. Launching it again doesn't cause second instance to show up.

Repository

R32 KDevelop

Lint

Automatic diff as part of commit; lint not applicable.

Unit

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

arrowd retitled this revision from to Pull in QtSingleApplication class and use it as KDevelopApplication's base. Add a CMake option for this..

arrowd updated this object.

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

arrowd added a reviewer: KDevelop.

Rest looks good to me. Great work.

app/CMakeLists.txt
12	Default to OFF
23	Add to config.h.cmake instead. Then use #if instead of #ifdef => safer.

In D1387#25810, @lnavet wrote:

Copyright really goes to Qt Company or just a copy/paste error ?

Well, we copied from there, so we need to play by the rules and keep the copyright.

Ideally QtSingleApplication functionality should be moved into KF5, but we've yet to find a good place for it.

Address comments.

kfunk added a reviewer: kfunk.

This revision is now accepted and ready to land.Apr 12 2016, 12:01 PM

This revision was automatically updated to reflect the committed changes.

		Path
M		app/CMakeLists.txt (12 lines)
M		app/main.cpp (14 lines)
A	M	app/qtlocalpeer.h (59 lines)
A	M	app/qtlocalpeer.cpp (178 lines)
A	M	app/qtlockedfile.h (70 lines)
A	M	app/qtlockedfile.cpp (154 lines)
A	M	app/qtlockedfile_unix.cpp (104 lines)
A	M	app/qtlockedfile_win.cpp (192 lines)
A	M	app/qtsingleapplication.h (70 lines)
A	M	app/qtsingleapplication.cpp (189 lines)
M		config.h.cmake (2 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	3282	93d3515		Apr 11 2016, 7:14 PM	★	★
Diff 2	3295	93d3515	Address comments.	Apr 12 2016, 11:18 AM	★	★
Diff 3	3297	cc20365	rKDEVELOP5043afa75025922ca42cde069d92543660e63b02	Apr 12 2016, 1:08 PM	★	★