summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-02-101-1/+0
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/harfbuzz-ng/harfbuzz-ng.pro src/gui/image/qimage_conversions.cpp src/gui/opengl/qopenglextensions_p.h src/gui/text/qtextengine.cpp src/network/ssl/qsslsocket_openssl.cpp src/plugins/platforms/eglfs/qeglfshooks_stub.cpp src/plugins/platforms/eglfs/qeglfsscreen.cpp src/plugins/platforms/eglfs/qeglfswindow.cpp src/plugins/platforms/windows/qwindowsfontdatabase.cpp src/plugins/platforms/windows/qwindowsfontdatabase_ft.cpp src/plugins/platforms/windows/qwindowsnativeinterface.cpp src/plugins/platforms/windows/qwindowsscreen.cpp src/plugins/platforms/windows/qwindowswindow.cpp src/plugins/platforms/windows/qwindowswindow.h src/plugins/platforms/xcb/qxcbdrag.h src/widgets/itemviews/qabstractitemview.cpp src/widgets/kernel/qwidget.cpp src/widgets/util/qsystemtrayicon_p.h tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp Thanks to Friedemann Kleint for resolving the qwindowsfontdatabase.cpp conflicts. Change-Id: I937232c30523d5121c195d947d92aec6f129b03e
| * CoreWLan: properly wait for scan thread to finishDyami Caliri2015-02-031-1/+0
| | | | | | | | | | | | | | | | | | | | Terminating the scan thread is leading to crashes. So was the previous solution to use wait(5000), since the scan thread may take longer than that. Task-number: QTBUG-36000 Change-Id: I5c37ba5ba3f5c156fca30f3dacaa998c15f76be8 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2015-01-213-510/+186
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/global.pri src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.h src/corelib/tools/qdatetime.cpp src/plugins/platforms/xcb/qxcbscreen.h src/plugins/platforms/xcb/qxcbwindow.h src/widgets/dialogs/qcolordialog.cpp src/widgets/dialogs/qcolordialog_p.h tools/configure/configureapp.cpp Change-Id: Ie9d6e9df13e570da0a90a67745a0d05f46c532af
| * Refactor networkmanager QtBearer backend to use QDBusAbstractInterface.Lorn Potter2015-01-083-510/+186
| | | | | | | | | | | | | | | | Using QDBusInterface causes introspection, which may not be permitted by some platforms. Change-Id: I953d27b9c0fc7c21d52fefeb8c7760a7235aed9d Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.4' into devSimon Hausmann2014-12-181-4/+4
|\| | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/platformsupport/platformcompositor/qopenglcompositor.cpp src/platformsupport/platformcompositor/qopenglcompositorbackingstore.cpp tests/auto/gui/kernel/qwindow/tst_qwindow.cpp Change-Id: I5422868500be695584a496dbbbc719d146bc572d
| * Qt should not print warning unless we have an API miss-usage caseAlex Blasche2014-12-181-4/+4
| | | | | | | | | | | | | | This warning is always printed. Change-Id: I524011f251f7f7e0d76eb94b16e1511e72f26422 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Add Q_DECL_OVERRIDE in the src subdirectoryOlivier Goffart2014-12-033-32/+32
| | | | | | | | | | | | | | | | | | | | Done automatically with clang-modernize on linux (But does not add Q_DECL_OVERRIDE to the function that are marked as inline because it a compilation error with MSVC2010) Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-11-2414-733/+1206
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qiodevice.cpp src/plugins/bearer/linux_common/qofonoservice_linux.cpp src/plugins/bearer/linux_common/qofonoservice_linux_p.h src/plugins/platforms/android/qandroidplatformtheme.cpp src/tools/bootstrap/bootstrap.pro src/widgets/styles/qmacstyle_mac.mm Change-Id: Ia02aab6c4598ce74e9c30bb4666d5e2ef000f99b
| * QtBearer networkmanager make sure to set flag ActiveLorn Potter2014-11-207-103/+263
| | | | | | | | | | | | | | | | | | | | | | Also, no need to create objects to get properties, when the properties can be had for free. Make plugin more robust to network-manager or ofono crashes Change-Id: Ibadb46bd51aa27f130f8d245e8c50aa7bff5f9c8 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com> Reviewed-by: Timo Jyrinki <timo.jyrinki@canonical.com>
| * Fix crash in QNetworkSession when engine is not setJoni Poikelin2014-11-071-1/+2
| | | | | | | | | | | | Task-number: QTBUG-42427 Change-Id: Ie35d5e0f72be3a16ecb6b928e12bc50d9f183590 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
| * make qtbearer networkmanager defaultConfiguration more reliableLorn Potter2014-11-073-0/+17
| | | | | | | | | | | | | | | | The defaultConfiguration could switch and be either active connection, so we determine the default should be what has the default route. Change-Id: I194f27b60e7a3598eca2ff09c2225ba1a46564d9 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Make QtBearer networkmanager backend respond to wired cabling changesLorn Potter2014-11-074-42/+124
| | | | | | | | | | | | | | | | Cabling changes can be detected right away, so we should act on that and change the configuration state. Change-Id: Ifa9709077215567001e11ab655208a2c1b090073 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| * Support dual sim in QtBearer's networkmanager backendLorn Potter2014-11-064-46/+60
| | | | | | | | | | | | Task-number: QTBUG-42368 Change-Id: I306733b5de7871fdeaa0accb512a3610753c84a5 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Use a property cache to cut down on blocking callsLorn Potter2014-11-0611-668/+855
| | | | | | | | | | | | | | | | | | Refactor old code Stop memory leaks Properly support mobile data (ofono) Change-Id: I7f23882ee0ee345a049a4a93ddd452b6d2e53710 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * QtBearer corewlan add list of remembered networksLorn Potter2014-10-281-5/+18
| | | | | | | | | | | | | | These should be at least Defined by the system even with wifi power off Change-Id: I0964ba82fe3fab98585ea7771687cef4d1b70cf9 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-2710-1245/+583
|\| | | | | | | | | | | | | Conflicts: src/gui/text/qfontdatabase.cpp Change-Id: I6ac1f55faa22b8e7b591386fb67f0333d0ea443d
| * Android: Fix android bearer implementation.Christian Strømme2014-10-271-27/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. If the interface used by a configuration changes, remove the whole configuration and replace it with a new one (instead of updating it). While this isn't intuitive, this is the exact behavior we used to have on android when using the generic plugin... 2. Setting the session state to roaming is not correct in this context as it's a transitional state where we should end up in connected state (forced roaming). Before this patch we would get stuck in the roaming state for mobile networks. 4. Use QNetworkInterface::name() instead of QNetworkInterface::humanReadableName(), as this is the expected value when querying the interface used. 3. Don't re-iterate through the interface list for each configuration. Task-number: QTBUG-41832 Change-Id: I315f725434bc6a1a8dca13dffd41f606c87bd06d Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| * Make networkmanager bearer backend work betterLorn Potter2014-10-276-221/+346
| | | | | | | | | | | | | | | | | | | | This fixes QNetworkConfigurations when user: - configures new AP - deletes connection configuration - switches wifi AP Change-Id: I38c543c6de7b61f49d7ac96fa05f7a6fc4fba70f Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * QCoreWLanEngine: Remove OS X 10.6 versionGabriel de Dietrich2014-10-242-929/+1
| | | | | | | | | | | | | | Snow Leopard support is dropped in 5.4.0. Change-Id: I7f13735fe5dc8ed3051d918feb7b5600a72c3493 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
| * Fix bogus error report when disconnect/stop actually worksLorn Potter2014-10-242-5/+31
| | | | | | | | | | | | | | | | | | | | The interfaces serviceActive does not mean the network is connected, so we get the next best thing - the interfaces associated ssid will be empty if a previously connected AP is now disconnected. Task-number: QTBUG-42087 Change-Id: I539811d9f18cc553a4022a03686fb8a864b98491 Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
| * Add better mobile connections to QtBearer NetworkManager backend.Lorn Potter2014-10-213-9/+142
| | | | | | | | | | | | | | Task-number: QTBUG-41807 Change-Id: Ifb5904d4887111416b4bb1a32d6d056029186f5c Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
| * update QtBearer NetworkManager backend APILorn Potter2014-10-214-84/+79
| | | | | | | | | | | | | | Task-number: QTBUG-41747 Change-Id: Idb4afea0215b94957a11895c7db97a72ae680804 Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-201-1/+1
|\| | | | | | | Change-Id: If7e51514ed6832750e3ad967e4d322ccf920d2bb
| * Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-10-141-1/+1
| |\ | | | | | | | | | Change-Id: Ic01820f2390e419a5b286643e7351e85ae032473
| | * Fix QtBearer connman backend report correctly on lte networkLorn Potter2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-41813 Change-Id: I977facc2ee59571d24e60ac9d5d41e957403b344 Reviewed-by: Richard J. Moore <rich@kde.org>
* | | Merge remote-tracking branch 'origin/5.4' into devFrederik Gladhorn2014-10-095-6/+6
|\| | | | | | | | | | | Change-Id: I05fcd8dc66d9ad0dc76bb7f5bae05c9876bfba14
| * | Don't use QStringLiteral in comparisonsMarc Mutz2014-10-095-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For QLatin1String, operator== is overloaded, so comparing to a latin-1 (C) string literal is efficient, since strlen() is comparatively fast. OTOH, QStringLiteral, when not using RVO, litters the code with QString dtor calls, which are not inline. Worse, absent lambdas, it even allocates memory. So, just compare using QLatin1String instead. Change-Id: I7af3bf3a67c55dae33ffaf9922d004fa168a3f9c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | Simplify QOfonoDataConnectionManagerInterface::getProperty()Marc Mutz2014-10-022-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make getProperties() return a reference and directly call value() on it. Almost is a tail-call now, if it wasn't inlined and if the dtor of the default argument didn't have to be called. Saves 288bytes in text size even so. Change-Id: Ie841501c1ce1379ca928f7474b90bc6487d77ab2 Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | | QOfonoService: use Q_SLOTSMarc Mutz2014-10-021-1/+1
|/ / | | | | | | | | | | | | | | | | The rest of the code uses Q_SIGNALS, even Q_EMIT, so be consistent, if nothing else. Change-Id: I6441d0a630e7b592d15431c2b9ff4398223bbe9c Reviewed-by: Valerio Valerio <valerio.valerio@jollamobile.com> Reviewed-by: Lorn Potter <lorn.potter@gmail.com>
* | Update license headers and add new license filesMatti Paaso2014-09-2438-714/+410
| | | | | | | | | | | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: Iec3406e3eb3f133be549092015cefe33d259a3f2 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* | Merge remote-tracking branch 'origin/5.3' into 5.4Frederik Gladhorn2014-09-236-63/+10
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isAlwaysAskOption was removed in 38621713150b663355ebeb799a5a50d8e39a3c38 so manually removed code in src/plugins/bearer/connman/qconnmanengine.cpp Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qcollator_macx.cpp src/corelib/tools/qstring.cpp src/gui/kernel/qwindow.cpp src/gui/kernel/qwindow_p.h src/gui/text/qtextengine.cpp src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h src/plugins/platforms/android/qandroidinputcontext.cpp src/plugins/platforms/xcb/qglxintegration.cpp src/plugins/platforms/xcb/qglxintegration.h src/plugins/platforms/xcb/qxcbconnection_xi2.cpp src/testlib/qtestcase.cpp src/testlib/qtestlog.cpp src/widgets/dialogs/qfiledialog.cpp src/widgets/kernel/qwindowcontainer.cpp tests/auto/corelib/tools/qcollator/tst_qcollator.cpp tests/auto/gui/text/qtextscriptengine/tst_qtextscriptengine.cpp tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp tests/auto/widgets/widgets/qlineedit/tst_qlineedit.cpp Change-Id: Ic5d4187f682257a17509f6cd28d2836c6cfe2fc8
| * CoreWLan: terminate scan thread in QCoreWlanEngine destructorDyami Caliri2014-08-272-2/+4
| | | | | | | | | | | | | | | | | | | | | | The scan thread can take an indeterminate amount of time, often longer than the 5 seconds we had previously waited. Since this destructor is only called when the application quits, it's ok that some resources may be lost. Task-number: QTBUG-36000 Change-Id: Ib184156b5a23c39ea4f7937a26ecb099554bd4de Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
| * remove always ask option.Lorn Potter2014-08-233-57/+5
| | | | | | | | | | | | | | | | | | | | | | Jolla removed the always ask option in the UI, which is the reason for all this code. Now, if mobile data is autoconnectable, whether roaming or home, it will be connected. Change-Id: I6a86315262e8c4c5551b2b2097389559096f14d5 Reviewed-by: Pasi Sjöholm <pasi.sjoholm@jolla.com> Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
| * Properly null-terminate ifreq::irf_nameMarc Mutz2014-08-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | It's unclear whether it has to be, but there are a lot of patches floating around on the net that indicate that Coverty requires this, and the SIOCGIFADDR micro-howto also NUL-terminates the string. So who is Qt to differ? Change-Id: I1aa5a2de47a58b1d9b73556d5a6ddc48b2c40ce3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Android: New bearer pluginChristian Strømme2014-07-1015-0/+1277
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replacement for the the generic bearer plugin. Compared to the generic bearer engine, this plugin provides a more detailed overview of the network configurations on Android. Added features are: - Correct bearer type, also for mobile connections. - Connection state (e.g., roaming). - Data statistics (On devices that supports it). - Polling is not required. Change-Id: I728cb91e04a66343648c0add6be2a003caca0f1f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devJ-P Nurmi2014-06-051-16/+19
|\| | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/features/qt.prf src/plugins/platforms/xcb/qxcbwindow.h src/tools/qdoc/qdocindexfiles.cpp src/widgets/kernel/qwidget_qpa.cpp Change-Id: I214f57b03bc2ff86cf3b7dfe2966168af93a5a67
| * plugin/bearer remove static QDBusConnection::systemBus() initializationDyami Caliri2014-05-261-16/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The static initialization of QDBusConnection::systemBus() can occur before the creation of QCoreApplication. This causes a warning from QDBusConnection and may cause the application to crash on exit. Since QDBusConnection::systemBus() is just an accessor, there is no real advantage to storing a static reference to it. Task-number: QTBUG-39248 Change-Id: I4401810c7c2ffd21a30f9ffd41b3a46e7e09214c Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
* | Assign a parent to QConnmanServiceInterface instancesJakub Adam2014-06-051-1/+1
| | | | | | | | | | | | | | Makes sure they are properly deleted. Change-Id: I60a64c43456308ad9b6d8d0e3e8cbef8c2afb43e Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* | Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Simon Hausmann2014-05-222-0/+4
|\ \ | | | | | | | | | refs/staging/dev
| * | Merge remote-tracking branch 'origin/stable' into devSimon Hausmann2014-05-222-0/+4
| |\| | | | | | | | | | Change-Id: Ia36e93771066d8abcf8123dbe2362c5c9d9260fc
| | * CoreWLan: wait for scan thread to finishDyami Caliri2014-05-182-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the scan thread is running when QCoreWlanEngine is destroyed it will access stale data and cause a crash. Task-number: QTBUG-36000 Change-Id: I8cc9e39a3f7d4736da39e8b31f6963db35318f19 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Peter Hartmann <phartmann@blackberry.com>
* | | fix crash in connman bearer backend when accessing null objectsLorn Potter2014-05-221-3/+9
|/ / | | | | | | | | | | Change-Id: Ib199b4093d86d1596b630223d0734171ba0d82c5 Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-05-061-2/+2
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mkspecs/qnx-x86-qcc/qplatformdefs.h src/corelib/global/qglobal.h src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp src/opengl/qglpixelbuffer.cpp src/opengl/qglshaderprogram.cpp tests/auto/opengl/qglthreads/tst_qglthreads.cpp Change-Id: Iaba137884d3526a139000ca26fee02bb27b5cdb5
| * Remove unneeded ;Albert Astals Cid2014-04-241-2/+2
| | | | | | | | | | | | | | Warnings returned by pedantic Change-Id: I501621df6e9f39b18576625b321714a862dc971a Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-03-242-0/+4
|\| | | | | | | | | | | | | Conflicts: src/gui/image/qjpeghandler.cpp Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0
| * Fix Mac Bearer when machine has no wifiFrederik Gladhorn2014-03-142-0/+4
| | | | | | | | | | | | | | | | | | | | | | This manifested itself for some continuous integration machine, all regular macs have wireless. In case there is no wifi, we would never emit updateCompleted(). Change-Id: I1c5b0da6e1d73fef2588beb1796207326d430e26 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
* | make sure connman bearer service is autconnect before connectingLorn Potter2014-03-201-1/+14
|/ | | | | Change-Id: I4c9a93d69f7fe990bf9d7f2e939abbe2c82ba449 Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Normalize signal & slot signatures in connectionThiago Macieira2014-02-221-2/+2
| | | | | | | | | | | Profiling showed that Qt Creator spent 2% of its load time normalizing signals and slots. By pre-normalizing everything, we ensure that there is no runtime cost. Profiling after this commit and the others in this series shows that the cost dropped down to zero. Change-Id: Ifc5a2c2552e245fb9a5f31514e9dd683c5c55327 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Refactor and remove dead code, add property caching.Lorn Potter2014-02-077-2013/+606
| | | | | | | This helps with a flood of dbus messages due to properties. Change-Id: I7aa9d36a077d84a88dab561d007d597b0780e096 Reviewed-by: Aaron McCarthy <mccarthy.aaron@gmail.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-204-5/+58
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qglobal.h src/corelib/tools/qstring.cpp src/gui/image/image.pri src/gui/image/qimage.cpp src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/plugins/platforms/eglfs/qeglfshooks_stub.cpp tests/auto/corelib/io/qstandardpaths/tst_qstandardpaths.cpp Change-Id: I3b9ba029c8f2263b011f204fdf68c3231c6d4ce5