summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
Commit message (Collapse)AuthorAgeFilesLines
* Regenerate projects to correctly handle private dependenciesAlexandru Croitor2020-02-055-23/+8
| | | | | | | Change-Id: I7d84bc9962bff5c89a90367ae704974c6ce2ec89 Reviewed-by: Qt CMake Build Bot Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Regenerate plugin projects to get new target namesAlexandru Croitor2020-01-277-23/+25
| | | | | | | | | And also to get the original output names (qmake's "TARGET"), so that the plugin file names are as they were in Qt 5. Change-Id: I96a060d1a81693652847857372bec334728cb549 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge remote-tracking branch 'origin/dev' into merge-devLeander Beernaert2020-01-242-9/+9
|\ | | | | | | Change-Id: I31b761cfd5ea01373c60d02a5da8c33398d34739
| * Merge remote-tracking branch 'origin/5.15' into devLiang Qi2020-01-042-9/+9
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qvector.h Make QVector(DataPointer dd) public to be able to properly merge 5b4b437b30b320e2cd7c9a566999a39772e5d431 from 5.15 into dev. src/widgets/kernel/qapplication.cpp tests/auto/tools/moc/allmocs_baseline_in.json Done-With: Christian Ehrlicher <ch.ehrlicher@gmx.de> Change-Id: I929ba7c036d570382d0454c2c75f6f0d96ddbc01
| | * Replace usages of QVariant::value by qvariant_castOlivier Goffart2019-12-152-9/+9
| | | | | | | | | | | | | | | | | | | | | This is done automatically with a clazy check Change-Id: I3b59511d3d36d416c8eda74858ead611d327b116 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| | * Tidy nullptr usageAllan Sandfeld Jensen2019-12-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move away from using 0 as pointer literal. Done using clang-tidy. This is not complete as run-clang-tidy can't handle all of qtbase in one go. Change-Id: I1076a21f32aac0dab078af6f175f7508145eece0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Revert "Revert "Fix static linking when using bearer plugins""Alexandru Croitor2019-12-192-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The missing commit is in wip/cmake, so it should be safe to reactivate the plugins again. This reverts commit f2c57e83ab21f5f5ad01f309643821a8851493b5. Change-Id: I1a95dac3008674f8baf009cf5556a313cae3d8b3 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Post merge fixesLeander Beernaert2019-11-254-4/+8
| | | | | | | | | | | | | | | Change-Id: I78d3c9687f99c0a32da04257e297e88ef0b02581 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-197-602/+6
|\ \ \ | |/ / | | | | | | Change-Id: Ifecc2d9db396d783124df8567553ba5f846f30bb
| * | Fix static linking when bearer management plugins are built, part 2Simon Hausmann2019-10-247-602/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 5f160a3699d80d1736f691ad9ef774eb6aa28079 moved the code that's shared across all bearer management plugins into QtNetwork, there is one piece of code remaining that's shared across the connman and the networkmanager bearer plugin: The dbus ofono interface code. To avoid linking that twice (and causing duplicate symbol errors), this patch moves it into a static platform support library. This way for shared builds the code is included twice, but for static builds only once. Change-Id: Idf5414bc22fea45f11c600f28eaea91bb4dc6308 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | Regenerate src/*Alexandru Croitor2019-11-147-9/+9
| | | | | | | | | | | | | | | | | | Change-Id: I0314b4faa1e4860e86198eea4189987e527dfec2 Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Regenerate qtbase tests and src/* for some small fixesAlexandru Croitor2019-11-132-2/+0
| | | | | | | | | | | | | | | | | | Change-Id: I049829492971875a5c5ff159104707d9e2ad1e46 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Revert "Fix static linking when using bearer plugins"Alexandru Croitor2019-11-122-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the first patch that was required to fix duplicate symbols errors was merged from dev to wip/cmake, the second one 7a605edc226d4051602e157fe575f17dfaac0964 is not yet merged. So revert the revert to temporarily fix static builds until we do another merge from dev to wip/cmake. This reverts commit 307cd64c5726f93dbc91cafbce986875a6cce3e1 Task-number: Fixes: QTBUG-79211 Change-Id: I72052513fc0e0183b3ce8270b4ce3f2ff44b664d Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Regenerate everything under ./srcAlexandru Croitor2019-11-125-7/+0
| | | | | | | | | | | | | | | | | | | | | Change-Id: Ibdbdc17f8c2ee41356f490dd839a47e1bcf4c586 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* | | Fix static linking when using bearer pluginsAlexandru Croitor2019-11-082-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that 5f160a3699d80d1736f691ad9ef774eb6aa28079 is merged to wip/cmake, we should be able to remove the previous workaround of not linking in the bearer plugins. Reverts 78b89547ad00153a8e02553a2e87d45415bd2314. Fixes: QTBUG-79211 Change-Id: Iaa6633bd74d51ceeed9fa1ffb536445ef817764b Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Temporarily disable automatic static linking of bearer pluginsAlexandru Croitor2019-10-182-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bearer plugins cause duplicate symbol errors when linking executables in a static build. Re-apply commit b2662b05dd078c46b82f5f041f51b0b83554113d Task-number: QTBUG-79211 Change-Id: Ie4c1359f1f4d649a22570a31634c94fd22102730 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Add conversion code for Java codeLeander Beernaert2019-10-182-19/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support to pro2cmake to convert java code for android. Add support to override API_LEVEL for the Android sdk jar file. If the sdk is not found, we'll default to the one located by QT_ANDROID_JAR. Change-Id: If0b746dc7f9148ac43e6592a4a4dd23d46bbd4cd Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Re-generate affected cmake files and configure.json after the mergeSimon Hausmann2019-10-177-12/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | This also removes the workarounds of commit b2662b05dd078c46b82f5f041f51b0b83554113d now that it's fixed "upstream" in the .pro files. Change-Id: Idd5e6273873a700fcda5a6cad2039c4e88b61f6f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeSimon Hausmann2019-10-1724-698/+30
|\ \ \ | |/ / | | | | | | Change-Id: Ia1da879a7bd8f71a649661a1844144dd67d60b3a
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-171-5/+4
| |\ \ | | |/ | | | | | | Change-Id: Ica69de99be9c8af4d28a52e4b69e6af748ed983c
| | * macOS: Simplify Objective-C namespacingTor Arne Vestbø2019-10-151-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We only need to use the QT_MANGLE_NAMESPACE macro when declaring the interface of the class. As long as we couple that with an alias declaration using QT_NAMESPACE_ALIAS_OBJC_CLASS, any further uses of the class name can be un-namespaced, including declaring categories on the class. The only snag with QT_NAMESPACE_ALIAS_OBJC_CLASS is that it can only be used once per class and translation unit, so forward declarations get hairy, but we can avoid that by just including the headers instead. Change-Id: I333bcd18fe1e18d81fbd560b0941c98b1c32460e Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * | Fix static linking when bearer management plugins are builtSimon Hausmann2019-10-1524-693/+26
| |/ | | | | | | | | | | | | | | | | | | | | | | | | The bearer plugins include copies of moc generated code that results in duplicate symbols when static linking pulls in multiple bearer plugins. Instead of relying on toolchain defined behavior, this patch moves the code that is shared into the shared library as private API. This way it will exist only once in memory and once at link time, resulting no linking errors about duplicate symbols. Fixes: QTBUG-79211 Change-Id: Iafa45c234e7fdd998971fc9cb7116334d08907bc Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Temporarily disable automatic static linking of bearer pluginsAlexandru Croitor2019-10-142-0/+2
| | | | | | | | | | | | | | | | | | The bearer plugins cause duplicate symbol errors when linking executables in a static build. Task-number: QTBUG-79211 Change-Id: I9f6399bd803c154c07b096b0df1be864816f863e Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-10-114-39/+32
|\ \ | |/ | | | | Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
| * Say hello to Android multi arch build in one goBogDan Vatra2019-08-261-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Multi arch build in one go is need to support the new .aab packaging format. By default the users apps are built for all Android ABIs: arm64-v8a armeabi-v7a x86_64 x86 The user can pass ANDROID_ABIS to qmake to filter the ABIs during development, e.g. qmake ANDROID_ABIS="arm64-v8a armeabi-v7a" will build only for arm ABIs. [ChangeLog][Android] Android multi arch build in one go, needed to support the new .aab packaging format. Change-Id: I3a64caf9621c2a195863976a62a57cdf47e6e3b5 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
| * Short live qt_unique_lock/qt_scoped_lock! (until C++17)Marc Mutz2019-08-131-23/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that QRecursiveMutex is getting split off of QMutex, QMutexLocker will stop working on QRecursiveMutex once the split has been finalized in Qt 6. Even today, QMutexLocker contains casts from QBasicMutex to QMutex that some reviewers are uncomfortable with. One way to carry QMutexLocker forward is to template it on the mutex type, possibly with aliases like QBasicMutexLocker and QRecursiveMutexLocker. C++17 code would then not require a port, thanks to CTAD. But we have the problem now, and we can't template QMutexLocker in Qt 5. The alternative is to look at std and realize that they have surpassed QMutexLocker in expressiveness already. A scoped_lock cannot be unlocked again, a unique_lock can be moved around. QMutexLocker doesn't do either. The only "problem" is that the std lock classes are already templates, but we can't, yet, rely on C++17 CTAD to make them look as if they weren't. So, prepare for a future with C++17 CTAD by writing factory functions, qt_scoped_lock and qt_unique_lock, which will later port mechanically to their C++17 equivalents (mostly). The functions are added to a new private qlocking_p.h becauee we don't want to make them public. These are for use in Qt's own implementation, or for users that don't care about compatibility and will not mind them to be removed once we depend on C++17. Originally, I planned to use qmutex_p.h instead, but that header is not self-contained and causes build errors when we started to include it into libraries other than QtCore. Regarding the return value of qt_scoped_lock: Ideally, we'd like to return a std::scoped_lock, but two things stand in the way: First, scoped_lock was only added in C++17 (we fall back to lock_guard if scoped_lock is not available). Second, returning one from a function requires C++17 guaranteed copy elision, because neither scoped_lock not lock_guard have a copy ctor. In order for code not to come to depend on a particular lock class, we return any of lock_guard, unique_lock or scoped_guard, depending on what the compiler supports, and therefore wrap the functions in the unnamed namespace to avoid running into ODR if (private) headers are used from different projects (autotests, e.g.). By the time we can drop them, however, qt_*_lock will be semantically 100% identical to their replacements. Port some initial users. Change-Id: I2a208ef2a4a533ee8e675812273986460e6b4d00 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Port users of QDBusAbstractInterface::(async)callWithArgumentList() to new ↵Marc Mutz2019-08-072-16/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | variadic (async)Call() Except in the auto-generated files. Required to add a cast operator from QDBusObjectPath to QVariant, as the variadic call() uses QVariant(arg) instead of QVariant::fromValue(arg). [ChangeLog][QtDBus][QDBusObjectPath] Added explicit cast operator to QVariant. Change-Id: I3f3004f7b9300a6340d27488f5b97981cbab3c24 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Regenerate plugins bearer and imageformats projectsAlexandru Croitor2019-10-087-7/+37
| | | | | | | | | | | | Change-Id: I8858aaf6b96ea030a3af143099aee5dfd15655c8 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* | cmake: Add missing CLASS_NAMEAlbert Astals Cid2019-10-032-0/+2
| | | | | | | | | | | | Change-Id: I5853578f427ae1d1b32ee5405694c216e2dd17cf Reviewed-by: Qt CMake Build Bot Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | Add CMakeLists.txt for CoreWLANJean-Michaël Celerier2019-09-301-0/+36
| | | | | | | | | | | | | | Change-Id: I28a066b23e89ce2d96fd6cfa935c05b70788ed7a Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add Support for Android Bearer JarLeander Beernaert2019-08-272-2/+20
| | | | | | | | | | | | | | This is required to package an apk which depends on QtDelcarative. Change-Id: I1f6bdeb984f08d73f010fb4210242e5c99f1969f Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add some missing CLASS_NAME values to pluginsAlexandru Croitor2019-07-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This substantially decreases the number of warnings when doing a Qt static build with examples. This is a quickfix modifying the relevant files directly. A proper fix will follow that regenerates the whole files. Change-Id: I2a3cc2c4ea02b3412beb96f7b4be9d43365a460d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Qt CMake Build Bot
* | Merge remote-tracking branch 'origin/wip/qt6' into wip/cmakeAlexandru Croitor2019-07-115-83/+40
|\ \ | |/ | | | | Change-Id: I715b1d743d5f11560e7b3fbeb8fd64a5e5ddb277
| * Remove usages of QSysInfo's deprecated APIsSona Kurazyan2019-07-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | - Replaced QOperatingSystemVersion::WindowsVersion, QSysInfo::windowsVersion(), QSysInfo::macVersion(), QSysInfo::MacintoshVersion with QOperatingSystemVersion::current(). - Added QOperatingSystemVersion::WindowsVista for convenience, as it is used in lots of places. Change-Id: If9c4ac496005b2e70b5c70be160747afa74b98c1 Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * QCoreWlanEngine: port away from Java-style iterators (and other fixes)Marc Mutz2019-07-022-49/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The main goal of this patch was to port away from Java-style iterators, to make QtBase QT_NO_JAVA_STYLE_ITERATORS-clean. And this the patch achieves. But I couldn't resist a few drive-by fixes, too, to wit: - Use qDeleteAll() instead of while(!isEmpty()) delete takeFirst() - Use QMap::last() instead of iterating to the end, remembering the last-seen value - Use QMap::contains() instead of QMap::keys().contains() - Use qExchange() instead of copy+clear - Make some functions const (requires the mutex member to be marked as mutable, which is common for mutex members) I am almost certain that getSsidFromNetworkName() cannot work correctly. But this patch does not attempt to change the algorithm. Change-Id: Ifa04d7837bdc0837036c3a7a73f8c51f4e681f42 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io> Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
| * Merge remote-tracking branch 'origin/5.12' into devLiang Qi2019-06-251-6/+7
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf src/gui/painting/qdrawhelper.cpp src/gui/text/qdistancefield.cpp src/gui/text/qdistancefield_p.h src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/android/qandroidinputcontext.cpp src/widgets/styles/qstylesheetstyle.cpp Done-With: Timur Pocheptsov <timur.pocheptsov@qt.io> Change-Id: Ia7daad21f077ea889898f17734ec46303e71fe6b
| | * Fix crash when app is going to shutdown but conf manager is requestedVal Doroshchuk2019-06-121-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the app is finished and going to shutdown, qNetworkConfigurationManagerPrivate() returns nullptr. Change-Id: I01915021d8698802b3a1d0dee43203cd3d4aba74 Task-number: QTBUG-76090 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
| * | QNetworkManagerSettings: port DBus calls from callWithArgumentList() to call()Marc Mutz2019-06-191-27/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the new variadic QDBusAbstractInterface::call() API, this saves ~5KiB in text size on optimized GCC 6.1 Linux AMD64 builds. Change-Id: Idc43bb07083f98b4b652d7331e545ba79be1e296 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-06-033-26/+17
|\ \ \ | |/ / | | | | | | | | | | | | Take 5. Change-Id: Ifb2d20e95ba824e45e667fba6c2ba45389991cc3
| * | Remove usages of Q_OS_WINCEJoerg Bornemann2019-05-231-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This platform is history. Change-Id: Iddfab008a509f4828c321730414c8204055cf7af Reviewed-by: Maurice Kalinowski <maurice.kalinowski@qt.io>
| * | Migrate Windows system libs to external dependenciesJoerg Bornemann2019-05-081-1/+1
| | | | | | | | | | | | | | | | | | Started-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Change-Id: I211ce3252b836894aeeac1c85eb316d9596bca57 Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| * | Prefix textstream operators with Qt::Lars Knoll2019-05-021-15/+15
| | | | | | | | | | | | | | | | | | | | | As the non prefixed variants are deprecated Change-Id: I2ba09d71b9cea5203b54297a3f2332e6d44fedcf Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
| * | Merge remote-tracking branch 'origin/5.13' into devLiang Qi2019-04-241-1/+1
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/util/qshaderformat.cpp src/gui/util/qshaderformat_p.h src/widgets/graphicsview/qgraphicsitem_p.h Change-Id: Idafd88eb9a0a15b4af29f6143d009c1ec8ceecca
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Liang Qi2019-04-161-1/+1
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/tools/qlocale.qdoc tests/auto/corelib/io/qfileinfo/tst_qfileinfo.cpp Done-with: Edward Welbourne <edward.welbourne@qt.io> Done-with: Volker Hilsheimer <volker.hilsheimer@qt.io> Change-Id: I88e0757b2d020f0a244714c87844631df4b3fd13
| | | * Generic bearer engine - do not ignore WLAN interfaces (Windows)Timur Pocheptsov2019-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous code and comments refer to the "separate engine" and skip such interfaces. Given we explicitly disabled this "separate engine", skipping the interfaces is a bit cruel. Task-number: QTBUG-65593 Change-Id: Ie9dce1661bd697f22044ca6fb4a5e2485ef74253 Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
* | | | Fix cmake configure step on AndroidSimon Hausmann2019-06-032-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that ANDROID_EMBEDDED is not set by default anymore, we start descending into Android specific sub-directories. This patch generates a stub file but the Java bits still need to be ported. Change-Id: Icbfc3ad2c1ef266980161bca081c7c4275873efd Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | CMake: Fix src/plugins/bearerTobias Hunger2019-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Sorry, last-minute-typo hit again:-/ Change-Id: I7130ba3306a96584e2bc33bc1aa27990a3508035 Reviewed-by: Albert Astals Cid <albert.astals.cid@kdab.com>
* | | | CMake: Regenerate src/plugins/bearerTobias Hunger2019-05-064-10/+19
| | | | | | | | | | | | | | | | | | | | Change-Id: I6c900247eb03b8afc3f299b5dbca5bac64527a52 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | | | Merge commit 'dev' into 'wip/cmake-merge'Tobias Hunger2019-04-1611-30/+30
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
| * | | More nullptr usage in headersKevin Funk2019-03-148-25/+25
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Diff generated by running clang-tidy's modernize-use-nullptr checker on the CMake-based Qt version. Skipping src/3rdparty, examples/, tests/ Change-Id: Ib182074e2e2fd52f63093f73b3e2e4c0cb7af188 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>