3 years agoRe-order the uniqueDeviceId lookup order dev
Lorn Potter [Sun, 22 Mar 2015 21:06:02 +0000 (07:06 +1000)]
Re-order the uniqueDeviceId lookup order

* /etc/unique-id
* mac addresses
* /etc/machine-id
* /var/lib/dbus/machine-id

Change-Id: I4e0ee57f4b4f1557c27cba65fc46bf65f3973a9f
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
3 years agoChange Qt bugtracker URL to qt.io
Alex Blasche [Thu, 11 Dec 2014 13:28:15 +0000 (14:28 +0100)]
Change Qt bugtracker URL to qt.io

Change-Id: Ia1913f871ffeaeb3f87ce1b42b3706a420c5adbd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
3 years agoUpdate all license headers
Alex Blasche [Thu, 26 Mar 2015 07:27:43 +0000 (08:27 +0100)]
Update all license headers

Some files had wrong licenses too.

Change-Id: I7f940d4a136d102cb2c7755702308938530158c4
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
3 years agoAdd missing QDataStream include
Alex Blasche [Thu, 8 Jan 2015 13:05:16 +0000 (14:05 +0100)]
Add missing QDataStream include

This was triggered by header change in qtbase

Change-Id: Ic4764b6ddae129dd5964e8acc9e2d3733dceda69
Reviewed-by: Michal Klocek <michal.klocek@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
3 years agoRemove unnecessary \inqmlmodule parameter
Alejandro Exojo [Sat, 6 Dec 2014 13:21:15 +0000 (14:21 +0100)]
Remove unnecessary \inqmlmodule parameter

Change-Id: I3d826543268d9ae8dfa4964af0826c1a9b57985c
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoRe-add BatteryInfo qml
Lorn Potter [Sat, 29 Nov 2014 00:12:41 +0000 (10:12 +1000)]
Re-add BatteryInfo qml

The battery declarative class was never reinstated after the battery
class for refactored.

Also fix the upower backend to work correctly.

Task-number: QTBUG-42958
Change-Id: I4f627426f6c716a5317eb28ed85fd9da793f1940
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
3 years agoUse QUuid directly on the binary UUID representation
Thiago Macieira [Wed, 19 Nov 2014 06:43:12 +0000 (22:43 -0800)]
Use QUuid directly on the binary UUID representation

There's no need to convert to string representation, insert the dashes,
parse again into binary form and check if worked if we already have the
binary form. Just use it.

Change-Id: I30a5476a120433c188b9db11cf2a379592b7ec1e
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
3 years agoremove QStorageInfo
Lorn Potter [Wed, 24 Sep 2014 22:27:29 +0000 (08:27 +1000)]
remove QStorageInfo

This has been made redundant by the inclusion of QStorageInfo into

Change-Id: Icfea210a450302e49ae61997120325ba00313974
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
3 years agoFixed runloopThread being uninitialized and causing a crash in destruction.
Christoph Keller [Wed, 24 Sep 2014 14:19:15 +0000 (16:19 +0200)]
Fixed runloopThread being uninitialized and causing a crash in destruction.

Change-Id: I2e695f872d8d43978eba0030d72ee635c36f2103
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
3 years agoMake NetworkInfo work with new linux interface name scheme
Lorn Potter [Wed, 24 Sep 2014 04:31:03 +0000 (14:31 +1000)]
Make NetworkInfo work with new linux interface name scheme

Task-number: QTBUG-41283
Change-Id: I295ba589daede28dc6a75a47ca88533090bca84a
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQUPowerDeviceInterface: Fix a memory leak.
Robin Burchell [Wed, 20 Aug 2014 21:22:05 +0000 (23:22 +0200)]
QUPowerDeviceInterface: Fix a memory leak.

Change-Id: I5e671429dcfd2968ccf5153601b0e8855cf0482b
Done-by: Mohammed Sameer <mohammed.hassan@jolla.com>
Reviewed-by: Mohammed Sameer <msameer@foolab.org>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoAdd missing private headers warning
Samuel Gaist [Sat, 16 Aug 2014 22:33:15 +0000 (00:33 +0200)]
Add missing private headers warning

Change-Id: Ie9ba1ca09620b55d99b65ac7dd9bf0fa9e29da56
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoRemove QStorageInfo in favor of the QtCore replacement
Thiago Macieira [Sun, 10 Aug 2014 14:56:43 +0000 (11:56 -0300)]
Remove QStorageInfo in favor of the QtCore replacement

Change-Id: I0a22820d2f5ee554d2929ba7332c8a4e143121ce
Discussed-in: http://lists.qt-project.org/pipermail/development/2014-August/017938.html
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoAdd missing #include <QDataStream>
Thiago Macieira [Sun, 10 Aug 2014 14:56:34 +0000 (11:56 -0300)]
Add missing #include <QDataStream>

Change-Id: I462c22b1c85dad6afa4c580af085cc08f822625d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoUse QDBusReply instead of manipulating the QDBusMessage by hand.
Robin Burchell [Sun, 3 Aug 2014 01:10:06 +0000 (03:10 +0200)]
Use QDBusReply instead of manipulating the QDBusMessage by hand.

Not only is this neater, it fixes a screwup in
1be686159ce23a4fc683b1c17926f923ff957513. QVariant apparently doesn't want to
implicitly convert the QVariantMap via toMap, but instead silently returns an
empty map.

Change-Id: I0a71bf54a0d69a7f2da6a26fa77c53f7d3d9a588
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
4 years agoQUPowerDeviceInterface: Remove getProperty helper
Robin Burchell [Thu, 24 Jul 2014 11:56:04 +0000 (11:56 +0000)]
QUPowerDeviceInterface: Remove getProperty helper

Just call QMap::value directly.

Change-Id: Ic108b0585892986448ea7707b6cf7f54502e7e02
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQUPowerDeviceInterface: Make every property request except the first one asynchronous.
Robin Burchell [Thu, 24 Jul 2014 11:55:56 +0000 (11:55 +0000)]
QUPowerDeviceInterface: Make every property request except the first one asynchronous.

Fetching UPower properties can take a long time (I've seen >20ms on a device
that isn't even under load), so minimizing the amount of time we wait on the
main thread for the reply makes sense.

We keep the properties we had before around, and only emit changed signals when
the properties actually change.

Change-Id: Ia3a111d16bf0149a9aa153bf08f37409663ff7be
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQUPowerInterface: Do away with use of QDBusInterface.
Robin Burchell [Thu, 24 Jul 2014 11:20:25 +0000 (11:20 +0000)]
QUPowerInterface: Do away with use of QDBusInterface.

This requires a blocking DBus call to set up, so even though it's a little more
verbose to do it by hand, it's worth it.

Change-Id: Iccf264658a870b554e73bc817b4e9372a3adae83
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agoQUPowerInterface: dead code removal.
Robin Burchell [Thu, 24 Jul 2014 11:04:08 +0000 (11:04 +0000)]
QUPowerInterface: dead code removal.

changed() signal was only connected to a completely empty handler.
onBattery and getProperty are also unused, only called by the commented-out
bits removed here.

getProperty also had a fun memory leak/efficiency issue (always creating a new
QDBusInterface, which always involves blocking calls on creation,
and never freeing it)

Change-Id: I597f52d152afb2d605698cab48d3b8a916ddf33e
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoAdd support for retrieving device info from SSU.
Robin Burchell [Mon, 16 Jun 2014 10:02:58 +0000 (12:02 +0200)]
Add support for retrieving device info from SSU.

SSU is a tool for device management, used in the Mer Project (and by extension,
on Sailfish OS).

Done-with: Thomas Perl <thomas.perl@jolla.com>
Change-Id: I15a12f6adb93173b8b47d84230b18c4c41c1d522
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agoDisable strict strings under MSVC for QtSysteminfo
Thiago Macieira [Fri, 20 Jun 2014 22:51:33 +0000 (15:51 -0700)]
Disable strict strings under MSVC for QtSysteminfo

The Windows headers currently violate the standard. Worse, it's in
virtual functions...

Change-Id: I5e0ab21a6f6eb407ffa2c6eee117bcde3e0a18fa
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoadd missing EXPORT decl
Mark Brand [Tue, 10 Jun 2014 10:49:18 +0000 (12:49 +0200)]
add missing EXPORT decl

Change-Id: I5b725fe7f0abfc85c3df7b06c96ec3a5fb54b934
Sanity-Review: Qt Sanity Bot <qt_sanitybot@qt-project.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agofix filename case
Mark Brand [Fri, 23 May 2014 10:04:12 +0000 (12:04 +0200)]
fix filename case

Make it possible to cross compile on case sensitive system.

Change-Id: Ie6f255eeb4d71b40926d1d27aad52af4246f5602
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
4 years agoprefer os-release for operating system name
Lorn Potter [Wed, 5 Mar 2014 23:24:34 +0000 (09:24 +1000)]
prefer os-release for operating system name

Change-Id: I5b945948a17dbb830cdd451758c584d69eed7d24
Reviewed-by: Jakub Adam <jakub.adam@ktknet.cz>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agotry harder for unique ID, use wlan mac addy
Lorn Potter [Wed, 5 Mar 2014 23:21:52 +0000 (09:21 +1000)]
try harder for unique ID, use wlan mac addy

Change-Id: Iac5112c6a781620f71de33e0dbc07041e91c0312
Reviewed-by: Jakub Adam <jakub.adam@ktknet.cz>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoget model from hw-release
Lorn Potter [Wed, 5 Mar 2014 23:06:55 +0000 (09:06 +1000)]
get model from hw-release

Change-Id: I0d1bc0e943295cbaa43c2e5470acb24ed92fa63f
Reviewed-by: Jakub Adam <jakub.adam@ktknet.cz>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoBump module version to 5.4.0
Thiago Macieira [Wed, 19 Feb 2014 20:20:48 +0000 (12:20 -0800)]
Bump module version to 5.4.0

Change-Id: I7101adc0c15d3d7acb92bea41aa77baf8efc0349
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
4 years agoAllow searching a term in a specific release file
Jakub Adam [Wed, 5 Mar 2014 09:01:08 +0000 (10:01 +0100)]
Allow searching a term in a specific release file

Change-Id: I4a926c140101165a78107ae9d65f974d1b14b868
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agoStrip optional quotation marks from version string
Jakub Adam [Wed, 5 Mar 2014 09:23:40 +0000 (10:23 +0100)]
Strip optional quotation marks from version string

Change-Id: I072ef04026486d2591ef5f5143edb89c4299eb85
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agoPrefer VERSION_ID from /etc/os-release as QDeviceInfo::Os
Jakub Adam [Wed, 5 Mar 2014 09:10:04 +0000 (10:10 +0100)]
Prefer VERSION_ID from /etc/os-release as QDeviceInfo::Os

On Sailfish OS, where /etc/hw-release exists, QDeviceInfo::version()
used to wrongly return hardware adaptation VERSION_ID from that file as
the first value discovered by QDeviceInfoPrivate::findInRelease().

Thus, we look into /etc/os-release first. If the version isn't found,
the method resorts to the previous behavior.

Change-Id: Ia10c5d7b9cff83ab3006253931ca5a79f2e7c65f
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agoPrefer HW adaptation version as QDeviceInfo::Firmware on Sailfish OS
Jakub Adam [Wed, 5 Mar 2014 09:20:07 +0000 (10:20 +0100)]
Prefer HW adaptation version as QDeviceInfo::Firmware on Sailfish OS

On Sailfish OS, HW adaptation version is stored in /etc/hw-release.
If the value isn't found, QDeviceInfo::version() returns the kernel
version as before.

Change-Id: If742d2af1f719f45a59f4a937e18590060478651
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agostop serviceframework and qsysteminfo building on mac
Lorn Potter [Thu, 20 Mar 2014 20:27:45 +0000 (06:27 +1000)]
stop serviceframework and qsysteminfo building on mac

NOTE: these need to be fixed

Change-Id: I0b7a2cf7efe28aa03359b03d8921bbfb9dd4d09c
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
4 years agoFix battery related compilation errors on simulator
Samuli Piippo [Mon, 27 Jan 2014 14:08:21 +0000 (16:08 +0200)]
Fix battery related compilation errors on simulator

Change-Id: Icde8d7f9731e05193968a9f10f58556728d2a199
Reviewed-by: Travis Allen <tallen@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoUpdated Documentation for QBatteryInfo
Travis Allen [Thu, 16 Jan 2014 18:28:32 +0000 (13:28 -0500)]
Updated Documentation for QBatteryInfo

Fixed all of the documentation for QBatteryInfo with the new API

Change-Id: Ib00dc03b8c778d54ffed1dccf06e534babf5f202
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agowhitespace fixes
Oswald Buddenhagen [Fri, 17 Jan 2014 18:44:34 +0000 (19:44 +0100)]
whitespace fixes

remove trailing spaces & expand tabs

Change-Id: I7606f8c263e3660b307ac865090d11293e892598
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoRenames & Add new properties to QBatteryInfo
Travis Allen [Fri, 10 Jan 2014 17:58:31 +0000 (12:58 -0500)]
Renames & Add new properties to QBatteryInfo

-Renamed the Health enum values to Health*
-Added temperature
-Added isValid
-Added cycleCount
-Added level

Change-Id: Ib72eebfbb1b5426300de16f5329dff36953eb42f
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix build: CWGlobals.h does not exist anymore
Thiago Macieira [Tue, 3 Dec 2013 19:01:57 +0000 (11:01 -0800)]
Fix build: CWGlobals.h does not exist anymore

Change-Id: Iaabddc0612c3b52d4e84dca3a94521d70147e45d
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoupower: Return QBatteryInfo::LevelEmpty when the percentage is lower than 3%.
Robin Burchell [Fri, 13 Dec 2013 19:43:36 +0000 (20:43 +0100)]
upower: Return QBatteryInfo::LevelEmpty when the percentage is lower than 3%.

This gives applications some extra time to respond to this situation, and
prepare for system shutdown, as systems often turn off for safety before
absolute 0 is hit.

Change-Id: Ie6fc40bb80c9b2c07898c6fc1852c78add95b24f
Done-with: Vesa Halttunen <vesa.halttunen@jollamobile.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix qserviceinterfacedescriptor unit test
Alex Blasche [Mon, 16 Dec 2013 15:48:11 +0000 (16:48 +0100)]
Fix qserviceinterfacedescriptor unit test

It seems the debug stream removes a space at its end.

Change-Id: I2a4677d3fd2a136238034ea1a4ea5ed3dd618a86
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoQBatteryInfo Refactorization Step 2
Travis Allen [Tue, 26 Nov 2013 18:35:16 +0000 (13:35 -0500)]
QBatteryInfo Refactorization Step 2

-Remove EnergyUnit enum
-Change Win32 code to return mAh to conform to all other platforms
-Rename BatteryStatus to LevelState
-Add Health enum and property
-Rename a couple enum values

Change-Id: Ie359036f66f0b1f41d35cd8a574552f2a7b8bf00
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoRefactor the Linux/upower QBatteryInfo to match the other platforms
Travis Allen [Mon, 25 Nov 2013 18:41:41 +0000 (13:41 -0500)]
Refactor the Linux/upower QBatteryInfo to match the other platforms

I missed this refactorization in 15d5f78.

Change-Id: I21ee9514c4b6f5b153ab8d36c8baa1c75c72b1d7
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFirst steps towards QBatteryInfo Refactorization
Travis Allen [Wed, 20 Nov 2013 18:37:01 +0000 (13:37 -0500)]
First steps towards QBatteryInfo Refactorization

-Remove the QML wrapper registration temporarily
-Change the public API to lock it to one index
-Change the Linux private API to lock it to one index
-Change the Mac private API to lock it to one index
-Change the Windows private API to lock it to one index
-Change the tests to use the new API
-Change the Simulator private API to lock it to one index

Change-Id: I5b3d36a3baad339623281d79014c411c59dd1b59
Reviewed-by: Andrew Wooster <awooster@blackberry.com>
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoDriveType: Cope with mmc devices with more than 9 partitions
Iain Lane [Thu, 3 Oct 2013 09:43:47 +0000 (10:43 +0100)]
DriveType: Cope with mmc devices with more than 9 partitions

Previously they were reported as UnknownType always, now they get the
appropriate drive type.

Change-Id: I7c2cab0c01b105a7bed57450acad4c64d226feae
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agoDo not require signal strength information to return network status.
Timo Jyrinki [Mon, 30 Sep 2013 11:54:10 +0000 (14:54 +0300)]
Do not require signal strength information to return network status.

Do not require signal strength information to be available in order
to return network information. On some devices signal strength
is not available.

Task-number: QTBUG-33748

Change-Id: I1a6021483b9a2073595720a063f2de07ecdd98e1
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
4 years agouse resource file on qml example so they can run better
Lorn Potter [Sun, 6 Oct 2013 21:30:26 +0000 (07:30 +1000)]
use resource file on qml example so they can run better

Change-Id: I6f1fd110ef53fb772feceb57701ccca1a0860dff
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix method invocations with both custom and standard param types
Robert Griebl [Thu, 3 Oct 2013 22:19:33 +0000 (00:19 +0200)]
Fix method invocations with both custom and standard param types

Prior to this fix, method calls would only work if the method's
parameters were either just standard Qt types or just custom types.
Any combination would lead to a failure invoking the method.

Change-Id: I6f140767dfec1692ba7d766284f39916057cd017
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoFix simulator compilation
Samuli Piippo [Mon, 23 Sep 2013 07:25:38 +0000 (10:25 +0300)]
Fix simulator compilation

Change-Id: Ie93f12739bc2a2afbba0bf04bcf4132c4aec7bc1
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
4 years agoBump qtsystems version to 5.3.0
Thiago Macieira [Mon, 23 Sep 2013 02:44:53 +0000 (19:44 -0700)]
Bump qtsystems version to 5.3.0

Change-Id: Iab43fc52cf69571a3b51432392a1e99cf40d3c8e
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoPort bluetooth powered signal from qtmobility
Lorn Potter [Mon, 9 Sep 2013 07:04:20 +0000 (17:04 +1000)]
Port bluetooth powered signal from qtmobility

Change-Id: I757ad0a7a51515e4526df82eedef7fdf96421fb1
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agofix file permissions on images
Lorn Potter [Mon, 9 Sep 2013 03:24:50 +0000 (13:24 +1000)]
fix file permissions on images

Change-Id: I5c8d63c0237c6e14861783b25051c3644e845ca1
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoAdd operating system name and board name functions
Lorn Potter [Fri, 6 Sep 2013 19:44:08 +0000 (05:44 +1000)]
Add operating system name and board name functions

Change-Id: I438e98a942ee8dc574d11459f88244b20291435e
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoFix up some of these best guesses.
Lorn Potter [Tue, 27 Aug 2013 00:33:19 +0000 (10:33 +1000)]
Fix up some of these best guesses.

Try to support os-release

Change-Id: I0000f7175f7261aadea8cabb16ce39f5c154a079
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoRemove unnecessary dependency to qtjsbackend from sync.profile
Simon Hausmann [Tue, 13 Aug 2013 08:02:19 +0000 (10:02 +0200)]
Remove unnecessary dependency to qtjsbackend from sync.profile

Change-Id: I1cfdda45c711376444a4a062f9a70da2303ecbdc
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agotry harder to find unique ID, and validate it against QUUid.
Lorn Potter [Thu, 1 Aug 2013 23:53:50 +0000 (09:53 +1000)]
try harder to find unique ID, and validate it against QUUid.

Change-Id: Ic9cc84f3a14b62330c3fefc54e058142ab39e7df
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agoFix warning found by clang: private unused members in a class
Thiago Macieira [Tue, 4 Jun 2013 18:50:20 +0000 (11:50 -0700)]
Fix warning found by clang: private unused members in a class

qremoteserviceregister_dbus_p.h:151:22: error: private field 'connection' is not used [-Werror,-Wunused-private-field]

Change-Id: I445b478857e0807b468e5ba1daa92fa1c8c7d9da
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
5 years agomake signals work on mac
Lorn Potter [Tue, 30 Jul 2013 20:17:50 +0000 (06:17 +1000)]
make signals work on mac

Change-Id: Id93747bae03a1622e09ad40629a1885159e51e03
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoDisable tests failing on Windows.
Friedemann Kleint [Mon, 29 Jul 2013 14:51:02 +0000 (16:51 +0200)]
Disable tests failing on Windows.

Task-number: QTBUG-32666
Task-number: QTBUG-32667
Task-number: QTBUG-32707

Change-Id: I527120cf6c46bfb9f05baf7ece4d1b0399c773e6
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoStabilize qservicemanager_ipc.
Friedemann Kleint [Mon, 29 Jul 2013 14:38:54 +0000 (16:38 +0200)]
Stabilize qservicemanager_ipc.

Add constructor initializing variables, use QFINDTESTDATA
for service binary and verify its existence. Add QVERIFY
for the interfaces.

Task-number: QTBUG-32666
Change-Id: I83036d9d9c5e7efa0fde6d8d5025b9d8ff1cc8a7
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agodoc: Eliminate even more cases of multiple topic commands
Martin Smith [Wed, 17 Jul 2013 10:43:33 +0000 (12:43 +0200)]
doc: Eliminate even more cases of multiple topic commands

This fixes the examples in publish and subscribe.
Two instances where \page and \example occurred in
the same comment were corrected by removing the
\page and leaving the \example. The group page
for publish and subscribe was also corrected.

Task-number: QTBUG-31578
Change-Id: I7f5ab3384e73171a942719f841a6481ae0b216f2
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoAdd license files mandated by (L)GPL and FDL.
Timo Jyrinki [Wed, 3 Jul 2013 05:16:05 +0000 (08:16 +0300)]
Add license files mandated by (L)GPL and FDL.

Some rarer modules are still missing the required LICENSE files, which
are referred to from the code headers. The same files should
be distributed as part of all the modules, so that the
(L)GPL and FDL licenses are adhered.

These files were wget:d from:


Change-Id: I6efaf08bead39c625a8b2cef68d18a341fd8f4d0
Reviewed-by: Jason McDonald <macadder1@gmail.com>
5 years agoDon't increment batteryMap before inserting.
Lorn Potter [Thu, 11 Jul 2013 18:48:43 +0000 (04:48 +1000)]
Don't increment batteryMap before inserting.

Also indicate in docs how it should work.
Add brief statement about finding percent capacity.

Change-Id: I944adf4ca2ee19b31e1bb794ff0ce79b3528af57
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoAdd manual sysinfo-tester from mobility
Lorn Potter [Thu, 11 Jul 2013 03:58:20 +0000 (13:58 +1000)]
Add manual sysinfo-tester from mobility

Change-Id: I248d3b44e7e5a0cc277ab552d9df706ba0b5c8cc
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoFix compile warnings and build.
Lorn Potter [Thu, 11 Jul 2013 03:57:06 +0000 (13:57 +1000)]
Fix compile warnings and build.

Change-Id: Ib5afe055f216f7bb3020afbe2d66b7dd72808d2c
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoFix reading imei with ofono
Lorn Potter [Thu, 11 Jul 2013 01:25:44 +0000 (11:25 +1000)]
Fix reading imei with ofono

Task-number: QTBUG-32345

Change-Id: I6cdd1a38801de2a4ad61c2fb29d940b8c6450238
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoFix simulator build without ofono
Samuli Piippo [Thu, 4 Jul 2013 09:05:01 +0000 (12:05 +0300)]
Fix simulator build without ofono

Remove sfwnetreg defines that are no longer used.

Change-Id: I2f0628ed446654a834a44f9efcef2eec9ca8dfcf
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agomake x11 dependency a qmake CONFIG opt-out
Lorn Potter [Tue, 25 Jun 2013 07:27:18 +0000 (17:27 +1000)]
make x11 dependency a qmake CONFIG opt-out

This make it possible to compile with x11 in the build system, but not have
the x11 dependency. The tradeoff is that QScreenSaver disabling/enabling of
screenblanking is not possible at this time.

It may be possible using wayland, if not now sometime in the future.
In that case, QScreenSaver will be made to work with that.

Change-Id: I9f230dc906abc6eeafe2a18d31014974e8903442
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agomake ofono stuff compile
Lorn Potter [Mon, 17 Jun 2013 08:07:14 +0000 (18:07 +1000)]
make ofono stuff compile

Change-Id: I242393be59b3dbd8c07880958bc19a9edf77b9b6
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoRemove device profile, as it is depreciated.
Lorn Potter [Sun, 23 Jun 2013 07:14:53 +0000 (17:14 +1000)]
Remove device profile, as it is depreciated.

Change-Id: If1f2511f9f16f1a849b25e7d9ed99f0c9b2062f5
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoadd UPower backend for QBattery
Lorn Potter [Sun, 23 Jun 2013 00:24:34 +0000 (10:24 +1000)]
add UPower backend for QBattery

ported from qtmobility

Change-Id: If121f23c52eb81ed605a6cbe3435b0b260b2662f
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoRemove DisplayInfo
Lorn Potter [Sun, 23 Jun 2013 08:55:23 +0000 (18:55 +1000)]
Remove DisplayInfo

Change-Id: I29c4f64bf4a23dbc02daf5540cdbd5cd3d2ac7cb
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoremove libsysinfo, as there is not even config test
Lorn Potter [Mon, 24 Jun 2013 06:36:28 +0000 (16:36 +1000)]
remove libsysinfo, as there is not even config test

Change-Id: I10343700a4e3a73a63435a7daf3d228344afe15f
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoFix all qmake warnings
Alex Blasche [Wed, 19 Jun 2013 14:32:53 +0000 (16:32 +0200)]
Fix all qmake warnings

1. qdeviceprofile_p.h doesn't exist. Therefore remove it from
   the project file

2. Use proper include syntax for public headers

Change-Id: Ib2f4afe68799784201030f2d8eb36e5f12a821fc
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoRemove JsonDB dependencies (2/2)
Alex Blasche [Tue, 18 Jun 2013 11:53:42 +0000 (13:53 +0200)]
Remove JsonDB dependencies (2/2)

No more JsonDB in P&S.

Change-Id: Ic513b00f0d0d28d4da8c95a69e8bb2df04f0f223
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agoRemove JsonDB dependencies (1/2)
Alex Blasche [Tue, 18 Jun 2013 11:26:55 +0000 (13:26 +0200)]
Remove JsonDB dependencies (1/2)

No more JsonDB in QtSFW.

Change-Id: Ie2ffbd5e1beeae9058eec6133551ad8595c59b64
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoThe qtsystems dev branch should build against dev of its dependencies.
Alex Blasche [Mon, 17 Jun 2013 08:38:30 +0000 (10:38 +0200)]
The qtsystems dev branch should build against dev of its dependencies.

Change-Id: If68c95b803fcd22acf336040a26c2cd744c4e387
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agobump version to 5.2.0
Lorn Potter [Mon, 17 Jun 2013 07:41:52 +0000 (17:41 +1000)]
bump version to 5.2.0

Change-Id: Iea440b4b4eab4176655367812b56b26886d613ef
Reviewed-by: Alex <alexander.blasche@digia.com>
5 years agoUpdate all plugins.qmltypes files
Liang Qi [Tue, 28 May 2013 18:32:05 +0000 (20:32 +0200)]
Update all plugins.qmltypes files

Task-number: QTBUG-31388

Change-Id: I737d2520f6821cb43b3438b0a11fc8a7f6b57dbc
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
5 years agoUpdate qmldir files
Liang Qi [Tue, 28 May 2013 18:31:40 +0000 (20:31 +0200)]
Update qmldir files

Change-Id: I0498c939781da5e81cc2788f92c41d0488126f6e
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
5 years agoQ_GLOBAL_STATIC's use of noexcept makes QStringLiteral not work
Liang Qi [Mon, 10 Jun 2013 15:18:49 +0000 (17:18 +0200)]
Q_GLOBAL_STATIC's use of noexcept makes QStringLiteral not work

Change-Id: Ie999e33b39d7abc2dca418e5c27dbc619a8b74fa
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoremove proprietary libsysinfo stuff
Lorn Potter [Wed, 8 May 2013 22:28:37 +0000 (08:28 +1000)]
remove proprietary libsysinfo stuff

Change-Id: Iad21e043c67722244e069d09c08d63db779b5c60
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agorefactor the dir structure
Lorn Potter [Wed, 8 May 2013 21:51:50 +0000 (07:51 +1000)]
refactor the dir structure

putting system specific files into their own directories makes it look
nicer and easier to work on.

Change-Id: I485640a93d8fda8d60f6e92b34834f877f19f5b6
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoFix interesting warning found in publish-and-subscribe
Thiago Macieira [Mon, 8 Apr 2013 17:27:08 +0000 (10:27 -0700)]
Fix interesting warning found in publish-and-subscribe

jsondblayer.cpp:171:24: error: a temporary bound to ‘JsonDbSyncCall::mQuery’ only persists until the constructor exits [-Werror=extra]

This is probably a bug in the code. I have no clue why it needs to
initialise to "". That's REALLY weird.

Change-Id: I81f833235924ec51380a128ba73a59f9cbbbaa4f
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agoFix warnings found in headers (headersclean)
Thiago Macieira [Sat, 6 Apr 2013 20:46:18 +0000 (13:46 -0700)]
Fix warnings found in headers (headersclean)

qservicereply.h:95:9: error: declaration of ‘parent’ shadows a member of 'this' [-Werror=shadow]
qservicereply.h:112:5: error: declaration of ‘proxyObject’ shadows a member of 'this' [-Werror=shadow]

Change-Id: I697bb79fae7fbe77451f3652f5360fb79ba30373
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agoMake QServicePackagePrivate::clean non-virtual
Thiago Macieira [Sat, 6 Apr 2013 20:49:20 +0000 (13:49 -0700)]
Make QServicePackagePrivate::clean non-virtual

This class method does not need to be virtual, since nothing is
deriving from it. If something ever does, then the destructor should
be virtual too, to avoid this warning:

qservicepackage.cpp:49:10:   required from here
qshareddata.h:163:72: warning: deleting object of polymorphic class type ‘QServicePackagePrivate’ which has non-virtual destructor might cause undefined behaviour [-Wdelete-non-virtual-dtor]

Change-Id: I0e5ccc6edcb6a74e801edfbe73320cf5a0ece171
Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
5 years agodefine MODULE_VERSION
Oswald Buddenhagen [Tue, 26 Feb 2013 11:56:40 +0000 (12:56 +0100)]

Task-number: QTBUG-29838
Change-Id: I7e1ce29ec1db11c3f0d08e3d5812cf000d02c93b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix invalid use of lambda expressions in noexcept expression.
Aaron McCarthy [Fri, 1 Feb 2013 03:07:11 +0000 (13:07 +1000)]
Fix invalid use of lambda expressions in noexcept expression.

Using a QStringLiteral within a Q_GLOBAL_STATIC_WITH_ARGS macro
expansion results in the following error when lambda experssions are
available, such as when building with GCC 4.7:

qdisplayinfo_linux.cpp: In function ‘{anonymous}::Q_QGS_BACKLIGHT_SYSFS_PATH::Type* {anonymous}::Q_QGS_BACKLIGHT_SYSFS_PATH::innerFunction()’:
qdisplayinfo_linux.cpp:50:1: error: lambda-expression in unevaluated context
qdisplayinfo_linux.cpp: In lambda function:
qdisplayinfo_linux.cpp:50:1: error: types may not be defined in ‘noexcept’ expressions
qdisplayinfo_linux.cpp:50:1: error: ‘Size’ was not declared in this scope
qdisplayinfo_linux.cpp:50:1: error: template argument 1 is invalid
qdisplayinfo_linux.cpp:50:1: error: invalid type in declaration before ‘=’ token
qdisplayinfo_linux.cpp:50:1: error: scalar object ‘qstring_literal’ requires one element in initializer

The noexcept expressions is defined at qglobalstatic.h:76

Fixed by using QLatin1String instead, which can be used in this

Change-Id: Ia7f8219499ff348a4dc3f7dafb4641a96a982eb0
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agomake use of qtHaveModule()
Oswald Buddenhagen [Fri, 21 Dec 2012 10:02:25 +0000 (11:02 +0100)]
make use of qtHaveModule()

Change-Id: Id893f505be66103366d13b88cbb177d3bb401cc1
Reviewed-by: Andrew Stanley-Jones <asj@cban.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoRemove use of QT_{BEGIN,END}_HEADER macros.
Aaron McCarthy [Fri, 1 Feb 2013 03:02:47 +0000 (13:02 +1000)]
Remove use of QT_{BEGIN,END}_HEADER macros.

These macros were removed from Qt Core and they are no longer defined
causing qtsystems to fail to build.

Change-Id: I0e08e7a53f20a016e403d9022e349b25ba38a7ec
Reviewed-by: Andrew Stanley-Jones <asj@cban.com>
5 years agofix case of include files
Mark Brand [Fri, 1 Feb 2013 15:14:16 +0000 (16:14 +0100)]
fix case of include files

The case of these windows include files matters when cross compiling
on unix. With this change qtsystems builds successfully using MXE
(mxe.cc) based on mingw.org.

Change-Id: I2fd7560ef99bf650528a9ae13c45f50d2ee615e1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoReplace qml-battery example
Rainer Keller [Wed, 23 Jan 2013 11:29:30 +0000 (12:29 +0100)]
Replace qml-battery example

The existing code was missing several API updates and thus unable to
work properly. This patch replaces it with minimal rewrite to show the
same values but without any graphical effects.

Change-Id: I547f6afb3e3750484dabe42303121f791b12079d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
5 years agoDo not use interface as variable or parameter name
Oliver Wolff [Tue, 22 Jan 2013 09:15:03 +0000 (10:15 +0100)]
Do not use interface as variable or parameter name

As "interface" is defined as struct in objbase.h on windows it either
should not be used as a variable or parameter name or undefed before.
(see CI failure in https://codereview.qt-project.org/#change,45321 )

As parts of QtSystems rely on other windows headers which need interface
defined as struct it cannot be 'undef'ed "globally". Thus "interface" is
replaced with proper values in files where it occurs.

Change-Id: I9f77df966c7243fbc06aea87be075bfbd9b05d4a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Rainer Keller <rainer.keller@digia.com>
Reviewed-by: Cristiano di Flora <cristiano.diflora@gmail.com>
5 years agoremove some unnecessary CONFIG additions
Oswald Buddenhagen [Fri, 14 Dec 2012 18:39:43 +0000 (19:39 +0100)]
remove some unnecessary CONFIG additions

qt is already added by spec_pre.prf, warn_on and depend_includepath by

Change-Id: Id14d0e3adfd97ae37fbbc11a55ef4502690fe85e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agopoint dependencies to stable branches
Oswald Buddenhagen [Thu, 13 Dec 2012 10:07:49 +0000 (11:07 +0100)]
point dependencies to stable branches

Change-Id: I331464c9f227702ff305a308d21054cb61a47e7c
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoadjust to changed declarative api
Oswald Buddenhagen [Wed, 5 Dec 2012 12:56:10 +0000 (13:56 +0100)]
adjust to changed declarative api

Change-Id: I719805cce854613398c7b204d9742f635d05cd64
Reviewed-by: Andrew Stanley-Jones <asj@cban.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoDoc: Replace outdated macro
Christian Stenger [Fri, 7 Dec 2012 09:57:56 +0000 (10:57 +0100)]
Doc: Replace outdated macro

Change-Id: I212026e7c63a88900359f14ae240d6c16ec60d74
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoChange default linux backends when dbus is not present
Andrew Stanley-Jones [Thu, 15 Nov 2012 11:41:05 +0000 (21:41 +1000)]
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>
5 years agoAllow using QRemoteServiceRegister for types other than IPC.
Lincoln Ramsay [Mon, 17 Sep 2012 10:08:54 +0000 (20:08 +1000)]
Allow using QRemoteServiceRegister for types other than IPC.

Change-Id: Ic8ca7e4c48df42dad63bda87fc5d5ecb4cbd5410
Reviewed-by: Andrew Stanley-Jones <asj@cban.com>
5 years agoservicefw should not be built as an app bundle on Mac
Shawn Rutledge [Wed, 7 Nov 2012 16:44:59 +0000 (17:44 +0100)]
servicefw should not be built as an app bundle on Mac

It's a command-line tool only, and double-clicking the app does nothing.

Change-Id: I2b33f122b60b4fba0b042b5cce69f82219bd4f9c
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
5 years agoMinGW: compile fix from Linux host
Aleksey Sidorov [Fri, 26 Oct 2012 12:16:27 +0000 (16:16 +0400)]
MinGW: compile fix from Linux host

Change-Id: I09de505060c99eb6d793175d3aff27d51a500788
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
5 years agoRemoved sfwnetreg backend from SystemInfo.
Xizhi Zhu [Sat, 18 Aug 2012 05:39:15 +0000 (08:39 +0300)]
Removed sfwnetreg backend from SystemInfo.

Change-Id: I015503c6de8a38a3fc91b618f2e0106a2561dd24
Reviewed-by: Lorn Potter <lorn.potter@gmail.com>