diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-07 12:37:08 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2016-06-07 12:37:33 +0300 |
| commit | 62095d715fb2149b73264b66660f9b7451721549 (patch) | |
| tree | 154de439ee901aa1da569c4c8b4f589374780479 /src/imports/bluetoothsettings/bluetoothsettings.pro | |
| parent | c1111b313bb348a63e847cc1a8b2a25ced9d4a4c (diff) | |
| parent | 1b7c6ed208ef553f99ad7eb185a9abffeb30455c (diff) | |
Merge remote-tracking branch 'origin/5.7' into dev
* origin/5.7:
Changed SettingsUI application install path to QT_INSTALL_BINS
Fixed WPA supplicant and made it default backend for wifi settings.
Replaced license headers with GPLv3
Replaced VirtualKeyboard import uri
Replaced Device Utilities import uris to QtDeviceUtilities.x
Separated SettingsUI to its own plugin.
Change-Id: I403452bc5a9a6b4d21ef635d07a22571581603bf
Diffstat (limited to 'src/imports/bluetoothsettings/bluetoothsettings.pro')
| -rw-r--r-- | src/imports/bluetoothsettings/bluetoothsettings.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/imports/bluetoothsettings/bluetoothsettings.pro b/src/imports/bluetoothsettings/bluetoothsettings.pro index 3475ffa..3e6e6b5 100644 --- a/src/imports/bluetoothsettings/bluetoothsettings.pro +++ b/src/imports/bluetoothsettings/bluetoothsettings.pro @@ -1,7 +1,7 @@ TEMPLATE = lib CONFIG += plugin QT += qml bluetooth bluetoothsettings -uri = com.theqtcompany.settings.bluetooth +uri = QtDeviceUtilities.BluetoothSettings TARGET = btsettingsplugin |