summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-091-0/+3
|\ | | | | | | Change-Id: Ia762f6ebce1512f937a529f68eb02c008ecd9732
| * Bluez-DBus: Fix crash at calling disconnect while not connectedChristian Wassmuth2019-03-051-0/+3
| | | | | | | | | | | | | | | | | | | | | | Calling disconnectFromDevice() while not connected or in ClosingState caused a crash on accessing device which is null. [ChangeLog][QtBluetooth][Bluez-DBus] Fix crash at calling QLowEnergyController::disconnectFromDevice while not connected Change-Id: I5979e3e5fca62c4a1469014e4f553c7db24f8dac Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-165-47/+111
|\| | | | | | | Change-Id: Idd29729e80d44abe6404da2853c2fe1e887f7db4
| * Ensure signed int are written in base 10 notationAlex Blasche2019-02-151-3/+3
| | | | | | | | | | | | | | | | | | | | | | The code was converting signed ints/chars/shorts to hex notation without prepanding the '0x'. This led to Bluez reading the value as base 10 value and created the problem that values containing letters were improperly parsed. Fixes: QTBUG-73330 Change-Id: I9407a82495761b2e541e13b282ad6ccdb7cdd84a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * Cleanup QBluetoothServiceInfo xml stream writer on BluezAlex Blasche2019-02-151-11/+3
| | | | | | | | | | Change-Id: Iad66628307a2167cdd6c64080457c670697bd1f7 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Ensure SDP records can be byte arrays/hex encodedAlex Blasche2019-02-155-33/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This addresses the issue on Bluez only. macOS ignore such attribute values and WinRT implicitly converts them to hex strings. The macOS debug stream operator produced slightly different output compared to the other platforms. The output between the platforms must match though. Therefore, the general version was copied over to macOS. Task-number: QTBUG-73328 Change-Id: Ieea2a3a559b5686f7f7d16d5c75dd9ef2782cdf5 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | QDeclarativeBluetoothDiscoveryModel: Fix warningsFriedemann Kleint2019-02-112-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | Implement QAbstractItemModel::roleNames(), fixing the deprecationw arning: qdeclarativebluetoothdiscoverymodel.cpp:175:27: warning: ‘void QAbstractItemModel::setRoleNames(const QHash<int, QByteArray>&)’ is deprecated [-Wdeprecated-declarations] Add missing overrides to silence new warnings about insconsistent override. Fixes: QTBUG-73717 Change-Id: Iea9bd1d6cccfbecac7e3cf56101a5d65d466c023 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | btscanner example: Fix deprecation warningFriedemann Kleint2019-02-111-4/+4
| | | | | | | | | | | | | | | | | | | | device.cpp:112:49: warning: ‘void QListWidgetItem::setTextColor(const QColor&)’ is deprecated: Use QListWidgetItem::setForeground() instead [-Wdeprecated-declarations] device.cpp:114:49: warning: ‘void QListWidgetItem::setTextColor(const QColor&)’ is deprecated: Use QListWidgetItem::setForeground() instead [-Wdeprecated-declarations] device.cpp:221:49: warning: ‘void QListWidgetItem::setTextColor(const QColor&)’ is deprecated: Use QListWidgetItem::setForeground() instead [-Wdeprecated-declarations] device.cpp:226:47: warning: ‘void QListWidgetItem::setTextColor(const QColor&)’ is deprecated: Use QListWidgetItem::setForeground() instead [-Wdeprecated-declarations] Change-Id: I673b786d2d7b76ca4a51ba8eaad231592f4ad4fd Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-095-43/+97
|\| | | | | | | Change-Id: Ie734d2574c039a7f45d84455811472ea5b8c8e1c
| * Fix unit test failure on AndroidAlex Blasche2019-02-081-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It fixes the following failure FAIL! : tst_QBluetoothServiceDiscoveryAgent::tst_invalidBtAddress() Compared values are not the same Actual (discoveryAgent->error()) : InvalidBluetoothAdapterError Expected (QBluetoothServiceDiscoveryAgent::NoError): NoError This behavior was caused by the fact that the InvalidBluetoothAdapterError was already triggered in the QBluetoothServiceDiscoveryAgent ctor whereas convention for this class states that the error is set when QBluetoothServiceDiscoveryAgent::start() is called. The fix detects whether the requested local adapter address matches the existing local adapter address. If there is no match Invalid adapter error is thrown. Task-number: QTBUG-73571 Change-Id: I3216e1609820a66893768b33f0fc695fbad6966a Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Add Android exclamation to QBluetoothServiceDiscoveryAgent ctor docsAlex Blasche2019-02-081-0/+5
| | | | | | | | | | | | | | | | | | Passing the local address does not work because the passed address cannot be matched against the local adapter address. For privacy reasons this is not possible anymore since Android 6.0. Change-Id: Iacc632dda4af83265bdc3a062c0eba6c31cfa596 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Fix potential bug in osxbtcentralmanagerTimur Pocheptsov2019-02-081-1/+3
| | | | | | | | | | | | | | | | | | | | Similar to the problem found in osxbtleinquiry - 'timers' waiting to fire on "qt-LE-queue" know nothing about us, potentially deleting the delegate object in response to Bluetooth switched off. Task-number: QTBUG-73140 Change-Id: I1a39a1ca02d019f90a1b4214cdbbb76e26b9eea0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Bluetooth LE scan - fix a crash (CoreBluetooth)Timur Pocheptsov2019-02-071-30/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. When the central's state changes to powered off, we emit PoweredOffError and QBluetoothDeviceDiscoveryAgent deletes Obj-C instance - a delegate for CBCentralManager. But we can still have GDC timer waiting in a queue and triggering the crash while using a dangling pointer. So we have to properly cancel the timer. 2. CoreBluetooth under debugger warns about API misuse - calling stopScan, apparently, is not allowed if CBCentralManager is in a state different from 'powered on'. Change-Id: Ib218105735995dc7988751fa04a6c76cab10cba8 Fixes: QTBUG-73140 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * Doc: Fix link error to \macosNico Vertriest2019-02-071-1/+1
| | | | | | | | | | Change-Id: I82d691667232bebf7fed2cf9b24b234289e6d258 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Fully qualify the parameter in QNearFieldManager::adapterStateChangedv5.13.0-alpha1Andy Shaw2019-02-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The signal parameter needs to be fully qualfied so that it can be correctly matched when using the macros. This can cause a breakage if an application was connecting using the non fully qualified type, which can be the case if invokeMethod() or similar is used. However the chances of this are incredibly slim, and it is worth the risk to ensure normal connections will work correctly. [ChangeLog][Important Behavior Changes][QtNFC][QNearFieldManager] adapterStateChanged now has a fully qualified parameter - QNearFieldManager::AdapterState. This can cause a problem if the connection/method invocation was done with just AdapterState as the parameter type, in which case these need to be changed to use QNearFieldManager::AdapaterState instead. Change-Id: I7311ff4cb15b67089ceb5917961ee979c9566f28 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-02-026-2/+9936
|\| | | | | | | Change-Id: Ic64c5646f2a1c1b057f2a27e66b37364a320b12e
| * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-013-0/+9928
| |\ | | | | | | | | | Change-Id: Ia29ecbbdbbc7f7e042e0d4a4c136fbd78f3f74b8
| | * Add changes file for Qt 5.12.1v5.12.1Alex Blasche2019-01-171-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + d1cf8dad0e6d8d08b5c6f2f08d85a0e75b0bcf8a Bump version + 4821972696716f988b4b92f22a9a552be15c5401 qbluetoothlocaldevice_p.cpp: Make sure d_ptr is initialized + 29d0ef969273576792abfe0c76cc14df51d97e6b winrt: Document necessity of pairing devices before discovery + d55434e4e36132d0c09107f22323b02cd1dff3a9 winrt: Clarify situation of ServiceClassIds and ProtocolDescriptorList + f61b2803146aba90ec0084c12ef1a356eb5f062f winrt: Small code cleanup + 60863d840e5ed256bafddc2c98067dd28166df07 Android: Emit deviceDiscovered before deviceUpdated + a88d0ea41e5aab406e9d465a5165fc16fb9ca9fb Fix compilation with gcc 4.8 + 0a4366a16dfda251a4c2edf619f846cde8ad9f8a QQmlNdefRecord: port to QRegularExpression + 65bea2ce743d628773591793d35f2048fda5820a Prepare tst_qnearfieldmanager for configurations with builtin_testdata + b3b387698e8f685e8bd4f4843a170da40e17249b qnearfieldmanager_emulator: Use Q_GLOBAL_STATIC for tag activator + 9c7085322f8516f39df16094d2c5f12bbf129526 Prepare tst_qnearfieldtagtype2 for configurations with builtin_testdata + 4af2d432a08a17c741bd01d9a1517b2f17657291 Prepare tst_qnearfieldtagtype1 for configurations with builtin_testdata + 11c2589a51297324b6ed3320560c606bfbb051be Bump version + 4a6999d8f8ab2eefac53ebcde85a448d2b466d52 Fix use of the wrong constant: m_maximum should be INT_MAX + 9f5c8e5253a742d148f713dcbb137ba26ffa4089 GCD timer - refactor and fix warnings + 04084404ba35a6add235e110944b93c31eda9010 Add binary compatibility files for Qt 5.12 for QtConnectivity + db0f1f7ab0892c84744608e073fc99999ef28fdd Fix broken timeout handling in osxbtcentral manager + e9967647ffe20df0473a1fa9eb10957b4e32fbf3 CoreBluetooth - fix warnings ('-Wobjc-interface-ivars') + fb03b1e921e641a106722f8f3d59861ce7e6789e Add missing dbus registrations and change documentation + 99b308ab5488e5cfa77f5078eebc2fa9387217b8 Bump version Change-Id: Id0ab97122b779130383b6ef05076c437c1cbf28a Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| | * Merge 5.12 into 5.12.1Kari Oikarinen2019-01-0829-232/+314
| | |\ | | | | | | | | | | | | Change-Id: Ia4746e04af7784d9a33a6c1aa7e0f08fd7dafe1a
| | * | Add binary compatibility files for Qt 5.12 for QtConnectivityMilla Pohjanheimo2018-12-182-0/+9872
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Binary compatibility files for 5.12 added. Change-Id: Iaf08cb6ad76e9ff2dd15c1329fc82b918c7d059a Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | | LE/Android: fix crash when destroying DiscoveryAgent during scanKonstantin Marchenko2019-01-252-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | happens due to accessing already destroyed receiver from the queued call Change-Id: Ibc4a9abbb8c00ef9c8985f481b70db36fa508df8 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | LE/Android: trivial typo fixesKonstantin Ritt2019-01-251-2/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I2202fa305f4c50e97ae7701096b2f8e0bb9b3daf Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-223-18/+23
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ie774891eca63ff51e8829d189ca1b69d75adfe64
| * | | Check for system feature PackageManager.FEATURE_NFCAndré Klitzing2019-01-141-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Method enableForegroundDispatch and disableForegroundDispatch is not implemented on some WearOS devices and will throw an exception. Let's check if the NFC feature exists. java.lang.reflect.InvocationTargetException at java.lang.reflect.Method.invoke(Native Method) at org.qtproject.qt5.android.bindings.QtApplication.invokeDelegateMethod(QtApplication.java:157) at org.qtproject.qt5.android.bindings.QtApplication.invokeDelegate(QtApplication.java:146) at org.qtproject.qt5.android.bindings.QtActivity.onResume(QtActivity.java:626) at com.governikus.ausweisapp2.MainActivity.onResume(MainActivity.java:139) at android.app.Instrumentation.callActivityOnResume(Instrumentation.java:1355) at android.app.Activity.performResume(Activity.java:7117) at android.app.ActivityThread.performResumeActivity(ActivityThread.java:3556) at android.app.ActivityThread.handleResumeActivity(ActivityThread.java:3621) at android.app.ActivityThread$H.handleMessage(ActivityThread.java:1638) at android.os.Handler.dispatchMessage(Handler.java:106) at android.os.Looper.loop(Looper.java:164) at android.app.ActivityThread.main(ActivityThread.java:6494) at java.lang.reflect.Method.invoke(Native Method) at com.android.internal.os.RuntimeInit$MethodAndArgsCaller.run(RuntimeInit.java:438) at com.android.internal.os.ZygoteInit.main(ZygoteInit.java:807) Caused by: java.lang.UnsupportedOperationException at android.nfc.NfcAdapter.enableForegroundDispatch(NfcAdapter.java:1315) at org.qtproject.qt5.android.nfc.QtNfc$1.run(QtNfc.java:135) at android.app.Activity.runOnUiThread(Activity.java:6184) at org.qtproject.qt5.android.nfc.QtNfc.start(QtNfc.java:111) at org.qtproject.qt5.android.QtNative.updateApplicationState(Native Method) at org.qtproject.qt5.android.QtNative.setApplicationState(QtNative.java:260) at org.qtproject.qt5.android.QtActivityDelegate.onResume(QtActivityDelegate.java:1098) ... 16 more See: https://stackoverflow.com/questions/48437854/huawei-watch-2-nfc-feature-not-available-android-wear-2-0 Change-Id: I0e2cad3dce1c3c0a2ea2545fcc6731e2621cdc38 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Bump versionKari Oikarinen2019-01-141-1/+1
| | | | | | | | | | | | | | | | Change-Id: I347b943e3f99c54f8af678a5a2127624ae22669c
| * | | Fix a few clazy warningsAlex Blasche2019-01-112-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Covers static accessor, auto, nullptr and casting related warnings. Change-Id: I307438b662df908a2cfa37341722b78b5777e737 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-102-2/+18
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I9e22e3963466ff8909f58cfb252dceac6ee2e7bd
| * | | Ensure custom uuids are returned by QBluetoothServiceInfo::serviceUuid()Alex Blasche2019-01-091-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QBluetoothServiceDiscoveryAgent::start(FullDiscovery) uses an external tool called sdpscanner to perform the SDP inquiry. The tool uses Bluez's own API to perform the task and is GPL. In case a remote device offers a custom service the service uuid is returned as serviceClassUuid. QBluetoothServiceInfo::serviceUuid() remains empty although it should be populated as per API contract. This patch ensures that the first custom uuid is shifted from the serviceClassUuid list to serviceUuid(). The fix is limited because it picks the first custom uuid and does not consider a secondary custom uuid. Such a case is extremely unlikely though and I have not come across it. Fixes: QTBUG-72800 Change-Id: I7256440bcb1c9b0b2fb75249f977c43fecf1d910 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | | Don't reverse uuids which are derived from Bluetooth's base uuidAlex Blasche2019-01-081-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | The related bug only happens for custom uuids. Fixes: QTBUG-72681 Change-Id: I22d87b84bf3958ecce9b6020e3323f1e6c6a9255 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Bump versionKari Oikarinen2019-01-071-1/+1
| | | | | | | | | | | | Change-Id: I90dee13006e02c755454450a7c26d1967988c467
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2019-01-052-2/+9
|\| | | | | | | | | | | Change-Id: Ie9c7b69090355a65a5e175e02b6d39c0e0552fa9
| * | Add missing dbus registrations and change documentationAlex Blasche2019-01-042-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt DBus registration for Bluez specific types was done by isBluez5(). However Qt 5.12 introduced bluetoothdVersion() which is a bit more precise. It became necessary because runtime decisions based on exact minor release versions of Bluez became necessary. Therefore some code paths (depending on the user's use case) never called isBluez5() anymore. Subsequently the dbus registrations were missed out on. In the future isBLuez5() should be replaced by bluetoothdVersion(). QBluetoothSocket changed its underlying implementation when addressing QTBUG-68550. It uses dbus sockets to establish rfcomm socket connections to remote devices. The QBluetoothSocket::connectToService() overload that expects a port number is no longer possible as Bluez DBus API does not support connection establishment based on port numbers. Fixes: QTBUG-72742 Change-Id: If6adb391b0524cabc3a702d761e0cbd263508396 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-2526-229/+304
|\| | | | | | | | | | | Change-Id: Id27c2c0eff4731b075d952328404fe9550487cac
| * | Merge remote-tracking branch 'origin/5.11' into 5.12Liang Qi2018-12-230-0/+0
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ic7e6271274c0f60d3ec8a9caf3f054bec6544bf0
| | * | Bump version5.11Kari Oikarinen2018-12-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: I669cfada1d60cb975a39224c74ff94bbcea0bd61
| * | | CoreBluetooth - fix warnings ('-Wobjc-interface-ivars')Timur Pocheptsov2018-12-1820-98/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all i-vars into implementation part of declaration. Change-Id: I9ee71bc85308d899871dc680d438c504e591b091 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Fix broken timeout handling in osxbtcentral managerTimur Pocheptsov2018-12-185-101/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Trying to do several things (for example, discovering chars on several services) in non-sequential manner is allowed but will result in the broken 'object under watch' logic and thus a failure to report some operation finished. Task-number: QTBUG-72487 Change-Id: I9674f93e0c4d5cbfd50ac2f828d0d650031e056c Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | GCD timer - refactor and fix warningsTimur Pocheptsov2018-12-175-29/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. We move the logic 'object we are watching after and the query's type' into the GCD timer, since we'll need several timers in osxbtcentralmanager (and after all it's not a timer really, it's 'a timeout watchdog' more like. 2. Move i-vars into the implementation to suppress compiler warnings. Task-number: QTBUG-72487 Change-Id: I090e4cc2e0e747211aae8ec91c4e0ff4a53f570b Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Fix use of the wrong constant: m_maximum should be INT_MAXThiago Macieira2018-12-121-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | Found by ICC: warning #68: integer conversion resulted in a change of sign Change-Id: I4ac1156702324f0fb814fffd156f81e163e3d4d2 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-119-13/+96
|\| | | | | | | | | | | Change-Id: I337d146591585cfae67122b030b72f6f83986b76
| * | Prepare tst_qnearfieldtagtype1 for configurations with builtin_testdataOliver Wolff2018-12-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | We have to add relevant test data to TESTDATA and use them from the created qrc file. Change-Id: I1ce75822ba6bc9d00db40499c3e242c5012237fd Reviewed-by: Alex Blasche <alexander.blasche@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
| * | Prepare tst_qnearfieldtagtype2 for configurations with builtin_testdataOliver Wolff2018-12-063-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have to add relevant test data to TESTDATA and use them from the created qrc file. As the emulated TagActivator for configurations with builtin_testdata uses "nfcdata" as the root it searches for ".nfc" files, the test data has to be moved into a folder that is called like that. We cannot move the type 2 testdata into the shared nfcdata folder as this would mix up tag types 1 and 2 and thus make the tests fail. Change-Id: I424dbab5c952408b441f1d67bdcd2fad635f15f4 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | qnearfieldmanager_emulator: Use Q_GLOBAL_STATIC for tag activatorOliver Wolff2018-12-063-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a Q_GLOBAL_STATIC here fixes an issue in the auto tests for winrt. If we use a static object that is created before the QCoreapplication has been created, TagActivator's timer will complain, that it was not created inside a QThread. By postponing the creation until first usage we can avoid that problem. Change-Id: I9beca89930bfca2c71e0fce3d9c000dfcb71f431 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Prepare tst_qnearfieldmanager for configurations with builtin_testdataOliver Wolff2018-12-062-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | We have to add relevant test data to TESTDATA and use them from the created qrc file. Change-Id: I72ed86e09caf518f3f1b830ab4fec104a81313e6 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-051-0/+70
| |\ \ | | | | | | | | | | | | Change-Id: Iec198cf5c07227ff9486a92f6aee3fa24696ebdb
| | * | Add changes file for Qt 5.12.0v5.12.0-rc2v5.12.0-rc1v5.12.0Alex Blasche2018-11-071-0/+70
| | | | | | | | | | | | | | | | | | | | Change-Id: I0b3231b6eec403a7f8959fdfceb591b1700a00ad Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* | | | Merge remote-tracking branch 'origin/5.12' into devQt Forward Merge Bot2018-12-042-4/+3
|\| | | | | | | | | | | | | | | Change-Id: Id42e98826b0a992e80b84f91b3b5026d60e2699d
| * | | QQmlNdefRecord: port to QRegularExpressionSamuel Gaist2018-12-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the QQmlNdefRecord code to use QRegularExpression in place of QRegExp which is to be considered deprecated. Change-Id: Ibfbab39ca84f9e89d6f6bd2e15000359a4218234 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
| * | | Fix compilation with gcc 4.8Ville Voutilainen2018-12-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | GCC 4.8 doesn't like duplicate friend declarations. Change-Id: I2ec48ca7415b9fd7fe1c24f390519833b7d1f0aa Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Compile-fix (g++ 8): move #include of mocs outside namespaceEdward Welbourne2018-11-307-13/+14
| | | | | | | | | | | | | | | | | | | | Change-Id: I9adaa11043c94e0c4d5530fbafa2ef2f15681cac Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 17:25:37 +0000