diff options
| author | Andrew Stanley-Jones <asj@cban.com> | 2012-11-15 21:41:05 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-16 00:24:55 +0100 |
| commit | efbbf7e6c3d4f83e08c3e11ec29c757cc6c74426 (patch) | |
| tree | 6b4c33f59c13707566f40f66d3d7a9946a5103f7 /src/serviceframework | |
| parent | daec59aefa9b458a9e50fee85b359d9da964a6f1 (diff) | |
Change default linux backends when dbus is not present
Change the default linux backend to unix when dbus isn't
present. This is a better backend to default to than
the localsocket backend since it doesn't spin the Qt
event loop.
Change-Id: I7af9bf588504ee82c8269a76a7cbd0ff123df042
Reviewed-by: Lincoln Ramsay
Reviewed-by: Jonas Rabbe <jonas.rabbe@gmail.com>
Diffstat (limited to 'src/serviceframework')
| -rw-r--r-- | src/serviceframework/ipc/ipc.pri | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/serviceframework/ipc/ipc.pri b/src/serviceframework/ipc/ipc.pri index 500bdeae..a33a69c9 100644 --- a/src/serviceframework/ipc/ipc.pri +++ b/src/serviceframework/ipc/ipc.pri @@ -6,11 +6,11 @@ win32 { QT += core-private isEmpty(SFW_BACKEND) { - contains(DEFINES, QT_ADDON_JSONDB_LIB) { - SFW_BACKEND = unix + contains(QT_CONFIG,dbus) { + SFW_BACKEND = dbus } else { - !jsondb:!contains(config_test_jsondb, yes):contains(QT_CONFIG,dbus) { - SFW_BACKEND = dbus + linux { + SFW_BACKEND = unix } else { SFW_BACKEND = localsocket } |