summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix BlackBerry10 build on NDKs prior to 10.2.1Wolfgang Bremer2014-01-171-0/+7
| | | | | | | | | | | | | | | | This commit adds a dependency checking for a recently introduced define. On NDKs 10.2.1 and later it compiles with support for VIRTUALKEYBOARD_LAYOUT_ALPHANUMERIC. NDKs 10.2.0 and earlier do not know this define and therefore it will be ignored. This is necessary because there is no newer NDK publicly available than 10.2.0. Assuming pure QNX SDKs are missing the define completely, we are only including it on recent BB NDKs. Change-Id: I6f814e5c2d77c50edf8534f3567b157f71147555 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com>
* Cocoa Helpers: Add qt_mac_flipRect(const QRect &)Gabriel de Dietrich2014-01-172-0/+7
| | | | | | | Task-number: QTBUG-33082 Change-Id: If72b2744d3694b3899c124c7a6a6ccc6e6397165 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Replace win32-g++ with mingw scopeKai Koehne2014-01-1713-14/+14
| | | | | | | | Commit 773dd01 introduced a general mingw platform scope, which is cleaner and more flexible than matching the spec name. Change-Id: Ie3a9cb791a83f7c8a51bc4e23069190c452ab521 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QObject: fix connection to function pointer with non-copyable references ↵Olivier Goffart2014-01-171-2/+2
| | | | | | | | | | | | | argument For example, QObject is non copyable (its copy constructor is deleted or private via Q_DISABLE_COPY). It should still be allowed to pass a reference to a QObject as an argument to as signal (or slot). This fixes a compilation failure. Task-number: QTBUG-36119 Change-Id: I9bcf477e347d69fdae2543c99781b6421883be78 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* iOS: Remove unused fileTor Arne Vestbø2014-01-172-72/+0
| | | | | Change-Id: If082be4b5c50cd5e1d5660bbe26136b9a0ee0352 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* Improve code in sizeHint()Jan Arve Saether2014-01-171-30/+9
| | | | | | | | The plan is to do better caching in ensureColumnAndRowData(), and this patch will benefit for any such changes later Change-Id: Id1662e3fe7f70079e29ddb6e3d64e6e580ad9e0f Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QNX: Fixed window positioningBernd Weimer2014-01-172-36/+4
| | | | | | | | | | Child windows have to keep their relative position when the parent is moved. Change-Id: I7d24d67578c9aaa332136d18ad9b478b120e4696 Reviewed-by: Roger Maclean <rmaclean@qnx.com> Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Support multiple native surfaces on Android.BogDan Vatra2014-01-1767-1297/+1383
| | | | | | | | | | | | | | | | Support for multiple native surfaces is needed by applications that need to mix raster windows with GL windows. Rework the raster and opengl implementation, get rid of eglfs and fbconvenience dependencies. Create a single android platform plugin. [ChangeLog][Android] Rework the raster and opengl implementation. [ChangeLog][Android] Create a single android platform plugin. Task-number: QTBUG-34650 Change-Id: I9b1ab51554823329dda8cfbf8fef27c38f917c7b Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* QNX: Fixed some window issuesBernd Weimer2014-01-172-6/+11
| | | | | | | | Corrected EGL error code query and cover windows creation in the "no-rootwindow" case. Change-Id: I86aaa4b59283f7153f8ab63c5bf231bc9da7538c Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
* Suppress warnings for Qt builds only.Kurt Pattyn2014-01-171-2/+4
| | | | | | | | Qt should not dictate which warnings are disabled for client code. Therefore warnings will only be suppressed when building Qt. Change-Id: I1c470ba346c8272bae2a38385e425afa6eb50170 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QWizard: Fix frame when using Vista style/MSVC2012Friedemann Kleint2014-01-172-8/+30
| | | | | | | | | | | | | Work around GetSystemMetrics() returning the wrong value using MSVC2012 and later. The special handling of Windows 8 and later is then no longer required. [ChangeLog][QtWidgets][QWizard] Fixed frame when using Vista style/MSVC2012. Task-number: QTBUG-36192 Change-Id: I39c2ab70a266f12cd65fa740b10b86edffa60417 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* iOS: Don't try to use NEON drawhelpers, we don't build themTor Arne Vestbø2014-01-161-0/+7
| | | | | | | | | | | On iOS we don't build the NEON drawhelpers as they are implemented using GAS syntax assembly, so prevent drawhelpers.cpp from trying to use them. Follow-up to 01c59ac857927043e49d4725062faea715ed49a3. Change-Id: I3e3dc9b0e1d780db3184413d2ff3010ac8dcd37b Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Remove last traces of QT_COMPILER_SUPPORTS_NEONTor Arne Vestbø2014-01-166-10/+9
| | | | | | | | | | | Fixes ARM build, as the NEON drawhelpers and image conversion functions were ifdef'ed out. Follow-up to 1b12c0608be2359baa2f96ae28b135a84abd388c. Change-Id: I0b5e89c8f445741432db2dfe1f8d971b971c8605 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Added constructor to QJsonValue for const char *Matt Broadstone2014-01-162-3/+24
| | | | | | | | | | | | | | | | For convenience, it reads more easily (and is somewhat expected) to be able to add a string to a QJsonArray like you might with a QVariantList: QJsonArray() << "string". Previously, QJsonValue provided a private void* ctor to explicitly deny this case because it would implicitly convert to a boolean. This ctor provides a const char* ctor (much like QVariant) that interprets the incoming text as utf8 and creates a String type QJsonValue. [ChangeLog][QtCore][QJsonValue] Added constructor to QJsonValue for const char * Change-Id: Icafa954d3da1fb264f9d0fd7cd1a1d2fbbe15095 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Added convenience methods to QJsonArray for appending QJsonValuesMatt Broadstone2014-01-162-0/+33
| | | | | | | | | | | operators for +, +=, and << were added to QJsonArray to make it easier to work with, and more closely resemble the Qt container classes [ChangeLog][QtCore][QJsonArray] Added convenience methods to QJsonArray for appending QJsonValues Change-Id: I96e0a43015f7c0f980cbbef7f20bd2085ee04795 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Add detection of C++1y features (probably C++14)Thiago Macieira2014-01-161-0/+64
| | | | | | | | | | | | | | | I've added the most interesting features. I've skipped three features that GCC and Clang will support: N3323 contextual conversion tweaks N3653 member initialisers and aggregates N3664 clarifying memory allocation Of those, only N3653 brings a new syntax, so it could be added later. Change-Id: I8314d81e028c9fb22052f73961c81cdc69c1461e Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Optimize INV_PREMULAllan Sandfeld Jensen2014-01-162-7/+11
| | | | | | | | | | | | | | | | Our inverse premultiply is rather unoptimized. It's major weakness is using three divide operation which are the slowest integer operations. This patch reduces the three divisions to just one but using an approximation that is accurate for all uchar values. The patch also adds a general short-cut for alpha==255. Together these improvements makes it 2 to 16 times faster depending on how many 0 and 255 alpha values are encountered. Change-Id: I96d7098a1bc320793b0d0526637acd1fdb5a43eb Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* Make qt_memfill{16,32} unconditionalThiago Macieira2014-01-165-40/+23
| | | | | | | | | | | | | These two functions used to cause a runtime detection of the CPU features in order to improve their performance. Since the last two commits, there's no runtime detection of either SSE2 or Neon support, so there's no point in attempting runtime detection. Task-number: QTBUG-30440 Change-Id: I54fe92787c983003c2cc867ee636daec30063033 Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove runtime detection of Neon on ARM CPUsThiago Macieira2014-01-166-44/+41
| | | | | | | | | | | | | Now the only way to enable Neon support is to change the mkspec. [ChangeLog][Important Behavior Changes] Qt no longer checks for support for the Neon FPU on ARM platforms at runtime. Code optimized for Neon must be enabled unconditionally at compile time by ensuring the compiler supports Neon. You may need to edit your mkspec for that. Task-number: QTBUG-30440 Change-Id: I4df9b2bf3cd022f8ed70f02f16878cb2cb3fe6fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Remove runtime detection of SSE2Thiago Macieira2014-01-166-85/+72
| | | | | | | | | | | | | | | | | | If the compiler supports SSE2, we'll use our SSE2-optimised code unconditionally. Runtime detection is left for SSSE3 code. The SSE2 codebase is big and thus a timebomb if an inline function gets leaked out and run without runtime check. In reality, it's extremely unlikely people running CPUs without SSE2 support are running Qt 5 at this moment (they're either too old or too new, e.g. Intel Quark). The SSSE3 codebase is a lot more manageable. Task-number: QTBUG-30440 Change-Id: I3e586e4434e820365d5316b650ee3061d0acf767 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* remove qt_windows.h from qwinoverlappedionotifier_p.hJoerg Bornemann2014-01-154-8/+11
| | | | | | | Preparation for making QWinOverlappedIoNotifier public. Change-Id: Id443514a134b5c13e64d4d89450a7912ab38d40f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* constify some functions to improve readabilityJan Arve Saether2014-01-152-4/+4
| | | | | Change-Id: I4a5e68367f281f743a631272f57a848dc2833d12 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Remove unimplemented constructor in QTextEngineEskil Abrahamsen Blomfeldt2014-01-151-1/+0
| | | | | | | | | QTextEngine(LayoutData*) declaration seems to have been added in Qt 4.1 without an implementation. As far as I can see it has never been implemented. Change-Id: I4bbf032395f7c930c9e8d365cdbbcf47bb118d64 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Windows: Remove rarely used integration/theming logging categories.Friedemann Kleint2014-01-157-30/+6
| | | | | | | | Preparing the introduction of the categorized logging system for the plugin. Change-Id: I2b180d88cf508559f495d39d4e1d36b8f3da7051 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
* Mark error message in qfsfileengine_unix.cpp as translatable.Friedemann Kleint2014-01-151-2/+13
| | | | | | Task-number: QTBUG-35594 Change-Id: I7aeab890a5972813f38370ff20f5b68839833e3b Reviewed-by: David Faure <david.faure@kdab.com>
* Add method to QDBusServer to allow anonymous client connections.Roland Winklmeier2014-01-155-1/+41
| | | | | | | | | | | | | | | | This change adds a new method to QDBusServer to allow anonymous connections. This is part of the DBus API and was not yet possible to use with QDBusServer. It is set in the newConnection callback when a new client tries to connect. Anonymous connections are enabled by default in DBus but not allowed by default. [ChangeLog][QtDBus][QDBusServer] Added method to QDBusServer to allow anonymous client connections, even if the connecting client is not authenticated as a user. Change-Id: I984c9e634101ecd2e67bb25c8d12bb1071836fd3 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* moc: Fix -Wsign-conversion warning in the moc generated fileOlivier Goffart2014-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | There is the warning it fixes: moc_foo.cpp:28:9: warning: conversion to ‘qptrdiff {aka long long int}’ from ‘long unsigned int’ may change the sign of the result [-Wsign-conversion] - idx * sizeof(QByteArrayData) \ ^ qarraydata.h:282:49: note: in definition of macro ‘Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET’ { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \ ^ moc_foo.cpp:26:5: note: in expansion of macro ‘Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET’ Q_STATIC_BYTE_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(len, \ ^ moc_foo.cpp:33:1: note: in expansion of macro ‘QT_MOC_LITERAL’ QT_MOC_LITERAL(1, 23, 5), ^ [ChangeLog][moc][QTBUG-36128] Fixed sign conversion warning in generated file. Task-number: QTBUG-36128 Change-Id: Ibf00974dbfb419bb53a3109d93e4cee598bb0588 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Windows: Silence warnings about BitBlt() failing.Friedemann Kleint2014-01-151-2/+5
| | | | | | | | | | | | After showing the lock screen, spurious warnings about BitBlt() failing occur with last error set to ERROR_SUCCESS or ERROR_INVALID_HANDLE. Task-number: QTBUG-35926 Task-number: QTBUG-29716 Change-Id: I3e899cdf1ae60e76d13b81caec43716ad7c9725d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Add new BiDi control characters to Unicode control character menuKonstantin Ritt2014-01-141-1/+5
| | | | | | Change-Id: I0e3253965b36c7c831f0212c6e55ca310a3ad6c4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Regenerate the Unicode data tablesKonstantin Ritt2014-01-142-5436/+5458
| | | | | Change-Id: I2288c88ccfa0c9e339f8ef140cee74a518e72b35 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update the Unicode Data and Algorithms up to Unicode 6.3.0Konstantin Ritt2014-01-144-41/+68
| | | | | | | | | | | | | | | | | | | | * Mongolian and Phags-pa characters have been given a Joining_Type classification for contextual shaping. As a part of these additions, one Phags-pa character has the Joining_Type value of L (Left Joining), which no character had been assigned before. * The unassigned code points in the Currency Symbols block have been given the Bidi_Class property value ET and the Line_Break property value PR, to help implementations support new currency symbols, when they are encoded. * Hebrew letters and basic punctuation marks have been assigned the newly introduced Word_Break property values Hebrew_Letter, Single_Quote, and Double_Quote. * The Bidi_Class property has been extended with four new values for directional isolates. For more details, see http://www.unicode.org/versions/Unicode6.3.0/ Change-Id: Iad62d02edc58a8497898dcd6d6c70d5aece317ea Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* expand tabs and related whitespace fixes in *.{cpp,h,qdoc}Oswald Buddenhagen2014-01-13100-3279/+3279
| | | | | | | | the diff -w for this commit is empty. Started-by: Thiago Macieira <thiago.macieira@intel.com> Change-Id: I77bb84e71c63ce75e0709e5b94bee18e3ce6ab9e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* d-pointerize QWinOverlappedIoNotifierJoerg Bornemann2014-01-132-72/+104
| | | | | | | | | Preparation for removing the qt_windows.h include from qwinoverlappedionotifier_p.h. Change-Id: I27ab3891962327ab5db75fbfcc3cf57c50a0d1c4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Update the time zones database from CLDR v.24Konstantin Ritt2014-01-131-845/+851
| | | | | | Change-Id: Icab298f971980982412621a48c635a05f6ef5d36 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: John Layt <jlayt@kde.org>
* Update the internal CLDR tables up to v.24Konstantin Ritt2014-01-133-4359/+4541
| | | | | | | Change-Id: I9c0b110e36dd80c6a0b7275aa13bc548419aca9c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: John Layt <jlayt@kde.org> Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
* linuxfb: Migrate to QRegularExpressionLaszlo Agocs2014-01-131-15/+17
| | | | | Change-Id: Ieeef375a5f613c09b2c85f632a093dd575290ba2 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QPrinter - Add missing PaperSource valuesJohn Layt2014-01-133-2/+15
| | | | | | | | | Add extra PaperSource values for all Windows DM_BINS values. Also add CustomSource for use on OSX and CUPS when the PPD defines an InputTray value that cannot be matched. Change-Id: I2dfd565288942705a9872ab1b7c4cd32722ba674 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Compile fix for Windows PhoneAndrew Knight2014-01-131-1/+3
| | | | | | | | Shlobj.h should not be included on Windows Phone. As it isn't needed for WinRT in general here, exclude it. Change-Id: I1eaa50ab8825d2f43d59272c841673c3e9e1e12a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* WinRT winmain: fix linker error on x86 compilersAndrew Knight2014-01-131-1/+1
| | | | | | | | The x86 PC and Phone emulator compilers choke on WinMain's signature not matching the stdcall exported version. This fixes the issue. Change-Id: I30d8a5dab67f3f1f15869abe2928326e3401dc43 Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* Remove unnecessary call to updateHirarchyFabian Bumberger2014-01-131-2/+0
| | | | | | | | updateHierarchy is already called in the lower/raise member function in the QQnxWindow. Change-Id: If3765fa7a7e69273672d47003534b04e3615916c Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* qguiapplication_p.h: Compile fix for Android.Friedemann Kleint2014-01-131-1/+1
| | | | | | | | | | | | | In file included from qguiapplication_p.h:1:0, from src/qandroidplatformdialoghelpers.cpp:46: src/gui/kernel/qguiapplication_p.h: In static member function 'static Qt::Alignment QGuiApplicationPrivate::visualAlignment(Qt::LayoutDirection, Qt::Alignment)': src/gui/kernel/qguiapplication_p.h:171:45: error: ambiguous overload for 'operator==' (operand types are 'QFlags<Qt::AlignmentFlag>' and 'int') if ((alignment & Qt::AlignAbsolute) == 0 && (alignment & (Qt::AlignLeft | Qt::AlignRight))) { Initial-patch-by: BogDan Vatra <bogdan@kde.org> Change-Id: I560b5c4c1db59da6f2a5e1e05c32a31f8e1dac22 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Introduce a way of explicit selection of the platform themeŁukasz 'sil2100' Zemczak2014-01-131-6/+17
| | | | | | | | | | | | Introduce a way of explicit selection of the platform theme to be used, either through a new environment variable - QT_QPA_PLATFORMTHEME, or by the optional -platformtheme command line argument. Task-number: QTBUG-30091 Change-Id: Ieaa96b52265c3e48d056af7e56e793d8531fd7b3 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Extend QTRY_COMPARE and QTRY_VERIFY macrosJędrzej Nowacki2014-01-131-16/+26
| | | | | | | | | | | | | | | | | | | | We need to fix CI, one of the most common complains is that CI machines are overloaded and some tests simply timeouts. This patch extends QTRY* macros to gather statistics. Each time a QTRY* macro is used it is waiting for the expression to be true by certain time (by default 5 sec) Next, if it failed, it waits twice as much to prove that the expression is not affected by CI machine slowness, then fails anyway. Before the next major release, we should decide if this functionality should be included, as it changes behavior slightly. The following task should be kept open until the decision has been made: Task-number: QTBUG-36036 Change-Id: I7ab5070cb7eb7d96a7289dd7b2bebf91d93090e5 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Testlib: Add test duration to xml outputFrederik Gladhorn2014-01-132-1/+18
| | | | | | | | | | | [ChangeLog][QtTest] Added test duration to xml output. When running tests with xml output a new tag of the form <duration msecs="123"/> is added to each test function and the test as a whole. Change-Id: Ibc4db066b6acf5fac6c578f5e5ca5ce4b5d8ea8e Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
* QTimeZone - Change from Olson ID to IANA IDJohn Layt2014-01-118-101/+101
| | | | | | | | Complete changes from using Olsen/Olson in the code to IANA. Completes a change started in 5.2 release branch on the public occurrences. Change-Id: Ib077fcda2c77eef6f04ec28901d8d2d7210b8c72 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* BlackBerry: Add a private PPS APINehme Bilal2014-01-117-2/+1768
| | | | | | | | | | | The PPS API is needed to implement other Qt APIs on BlackBerry. It is a private API that cannot be accessed from outside Qt (*_p). Change-Id: Id33d2f9a415f49d51812ae860a15e8cc5636676b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Fix namespaced build on LinuxDonald Carr2014-01-102-3/+5
| | | | | Change-Id: I01f389517824e3ada4e4ab153c41c58f05a246fd Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
* QWizard/Windows: Add keyboard shortcut for 'Next'/'Back'.Friedemann Kleint2014-01-102-0/+7
| | | | | | | Task-number: QTBUG-35203 Change-Id: If7312e8675b21be9dc6836b92805dc87007205e7 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Use new connect syntaxFrederik Gladhorn2014-01-101-1/+1
| | | | | Change-Id: I61ada9387c6d09f86afa8ace46257c7e5ef27e72 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2014-01-1039-231/+303
|\ | | | | | | Change-Id: I99af0bef7f1c931533a324ebcfb27c40ee871a5e
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-11 04:00:56 +0000