summaryrefslogtreecommitdiffstats
path: root/tools
Commit message (Collapse)AuthorAgeFilesLines
* qmlplugindump: add an explicit -relocatable flagFawzi Mohamed2013-04-251-2/+7
| | | | | | | | | | | * explicit -relocatable will allows us to change the default to nonrelocatable. * add support for both -notrelocatable and the grammatically correct -nonrelocatable. * backport from qt5 Change-Id: I0f5335e2cf86ba2eda7ad80b4f7271b8b6ddcada Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Avoid macro re-definition after 65bd0bd1f047f6db6d67a8f089a9a409354b95a1Konstantin Ritt2013-04-241-1/+1
| | | | | | | based on qt5/qtbase: a9ba92740670ddbbcb0c68f80ad1a18cf2ff0598 Change-Id: Ie036d502950f5e3c0b0297d480af6cfd351e3db0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Make linguist's source viewer respect the encoding of files.Mitch Curtis2013-04-184-1/+13
| | | | | | | | | | | | It currently loads source files as latin1, which means other encodings are not supported. Qt 5 change: c4f1ac0fbcd452f440aee4a3304574cb7fbca0ce Task-number: QTBUG-27238 Change-Id: Ieb4de351d93bd5ac2939692c5c53bd681fea4386 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* qmlplugindump: correctly handle various versions of a meta objectFawzi Mohamed2013-04-181-9/+18
| | | | | | Change-Id: I2775c2cf4a3a2b1295d389da665e5e8aadea21e9 Reviewed-by: Alan Alpert <aalpert@blackberry.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* configure: Fix url about evaluacion licenseSergio Ahumada2013-04-091-3/+2
| | | | | Change-Id: Ife495cb67b9b378cbf2668157752219a98c6b435 Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
* Use delete[] instead of deleteSergio Martins2013-04-081-2/+2
| | | | | | This fix isn't needed in Qt5 as the code doesn't exist there. Change-Id: Icb8e0b45e5bc926cf0432ec3c990bc703f7b7b04 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix moving widgets in horizontal layouts in RTL mode.Friedemann Kleint2013-03-061-1/+4
| | | | | | | | Task-number: QTBUG-25872 Change-Id: Ia311b88f0ed3450d798bc5a9136e978c642d5b25 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/eb456f72052b02a77e22868bfa55a25d7af3e660)
* Active X plugin: Fix setting a control by task menu.Friedemann Kleint2013-03-051-2/+3
| | | | | | | | | | | | | | The property is a QString when set by the menu or a PropertySheetStringValue when loading the form. Breakage introduced by 8695c1753964eeb06b5d9306010b56be5fc151c0 . Task-number: QTBUG-29234 Change-Id: I84c3de80b99c8a20aaf1f8f7289882b0092d6a0a Reviewed-by: Andy Shaw <andy.shaw@digia.com> (cherry picked from qttools/3e43b158ce158dc1285593d2c7555351033fc3ce)
* unmess CONFIG/QT_CONFIG static/sharedOswald Buddenhagen2013-03-011-2/+5
| | | | | | | | | | | | | | | bring it to the state of 5.0.2: both QT_CONFIG and CONFIG in qconfig.pri contain the respective flag, so it is a) visible how qt was built and b) user code has a consistent default. before, on windows we had it only in qconfig.pri's CONFIG (so it was harder to find the qt config), and on unix we had it only in .qmake.cache's CONFIG (so it was impossible to find the qt config in a clean way, and there was no default (other than some arbitrary mess inside qmake itself)). Change-Id: Iad06de8c4435cec3e1407babde037ac96cb5bf66 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Try harder in matching the method signatureDirk Mueller2013-01-291-2/+11
| | | | | | | | | | | | | | In cases where the Propertiesdialog has no specific Implementation for a dbus data type, it creates a regular QLineEdit. In such cases, qdbusviewer then tried to call the method with the arg set to a string instead of the real datatype (for example uint64), which usually does not work. We can be more clever and try to implicitely convert the user input to the right datatype, which makes the invocation succeed. Change-Id: I9e16be6e7c5209745f2fa0c32acf08a3c42178f1 (cherry-pick of qttools/0c22eb9d9d1a0b72622fdf16ebf60712336b449e) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use path() as we need the path without the filenameAndy Shaw2013-01-281-1/+1
| | | | | | | | | | | On Windows, filePath() was used for a function that was supposed to get the bin directory for Qt. However path() should be used instead as this will remove the filename from the originally obtained string. Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> (cherry picked from commit 05dab891649b76fe7351d51950edf3caba2bfece)
* Doc: Updated HTML copyright year to 2013.Jerome Pasion2013-01-2212-12/+12
| | | | | | Change-Id: I62fa2443cc7cfd187458eb99d370472d553600f8 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
* Qt Designer: Use multiline validation for dynamic string properties.Friedemann Kleint2013-01-211-0/+20
| | | | | | | | Task-number: QTBUG-26394 Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/a7d61534acdb90b925d7f250665dcd30c3f37668)
* ActiveQt Designer plugin: Load control string correctly.Friedemann Kleint2013-01-211-1/+3
| | | | | | | | Task-number: QTBUG-29234 Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/8695c1753964eeb06b5d9306010b56be5fc151c0)
* Change all shmget calls to user-only memoryThiago Macieira2013-01-181-2/+2
| | | | | | | | | Drop the read and write permissions for group and other users in the system. Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876 (cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5) Reviewed-by: Richard J. Moore <rich@kde.org>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-131232-1244/+1244
| | | | | | Change-Id: I52bf8ef0447b701b4ebf7d7d240013a72adb9425 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* configure.exe: fix -inotify optionRafael Roquetto2012-12-111-0/+3
| | | | | | | cherry-picked from qt5 stable 675676aba1e71410fa6cfca430ab9bd64ebdcdaa Change-Id: I94e8ce037de7df50511be2471db842cca726ccef Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Bump Qt version to 4.8.5Sergio Ahumada2012-12-0710-30/+30
| | | | | Change-Id: I7e991d4b1f7f3b5a51170e6ff09e293c4285ea26 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* support indirect SUBDIRSLucas Wang2012-12-061-1/+6
| | | | | | | | | | that is, .file and .subdir "structs". (cherry picked from commit 3460395ebbf1e9eb05419854c0d5de28b89b9b0a) Change-Id: Ifdeedbbc0bccc9bc7a21707152750d7a2e839a5c Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* configure.exe: add inotify command line switchRafael Roquetto2012-12-031-0/+12
| | | | | | | | | akin to qt5/qtbase 31468563892a184d0a45cb0fdd7a91fa0da681e7, but without feature auto detection due to Qt4 configure.exe nature. Change-Id: I481e9ee01692dab9bd267a7b14722b8471719d1a Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Detect QMainWindow-separator as passive interactor in Qt Designer.Friedemann Kleint2012-11-281-2/+6
| | | | | | | | | Ensure that dock widgets in Qt Creator can be resized. Task-number: QTCREATORBUG-8284 Change-Id: If6aa55b2dde8fce53e1527db678f518b3912907b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com> (cherry picked from qttools/5e4bc7e3556cb5afcd82731277bdef60ae2cbe33)
* Fix syntax error on configure.exe source code.Rafael Roquetto2012-11-131-1/+1
| | | | | | Change-Id: I4859e5f02d84791f59652298f62abe8d2984af06 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Use slogger2 for logging on Blackberry instead of writing to stderrFabian Bumberger2012-11-081-1/+23
| | | | | | | | | Backport from Qt5: c86ed49a7989adb3e2e3c42794e44609f12ce493 Change-Id: I09d84b08f7c90348b4104f7e52d76ee27a4837af Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Peter Hartmann <phartmann@rim.com>
* Doc: Updated links on the documentation's headers.Jerome Pasion2012-11-025-23/+16
| | | | | | Change-Id: I4e13d27288ef50e7b9d04a12abbc299cb91a7501 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QtNetwork: introduce configure switch to use system proxies by defaultPeter Hartmann2012-10-311-1/+17
| | | | | | | | | | | | This option is opt-in (default: no). When configured with "-system-proxies", Qt automatically picks up the system proxies. (backport of commit f7893223e84db86dcdd860c625663d7006fcdad6) Change-Id: I95c3b17abee0691991a60a386052b4c2989f896c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Make the examples test for QtDeclarative pass.Friedemann Kleint2012-10-312-15/+37
| | | | | | | | | | | | | | | | | | | | | | | | - Fix check to indicate immediate errors, skip the loading state (using QTRY_VERIFY from shared/utils.h) and check for errors after loading again. - Exclude all broken examples. - Exclude shaders if import path is missing or OpenGL is not present. - Exclude Mac .app folders - Fix the DeclarativeViewer to check for the presence of the ImageMagick and ffmpeg executables only once, reducing test time. - Do not check for ImageMagick by running its command line tool 'convert' on Windows, since Windows has a tool of the same name that converts file systems (!). - Fix doc snippets to load correctly. Task-number: QTQAINFRA-428 Change-Id: Icc0a983bc42857b41ab1d9e93336f8265bfbec36 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Christopher Adams <chris.adams@qinetic.com.au>
* Support other platform names on configure.exeRafael Roquetto2012-10-302-9/+68
| | | | | | | | | | | | | | | | | | | | | | | Added three new methods, which are meant to be used internally to configureapp.cpp: - int platform(): returns an integer representing a platform - QString platformName(): returns the platform name string to be used when displaying the license agreement. - QString qpaPlatformName(): returns the value to be defined as QT_QPA_DEFAULT_PLATFORM_NAME. Currently supported names are Windows, Windows CE, QNX, Blackberry, and Symbian*. Default platform name is "Windows". * Symbian is not present on the original Qt5 patch. Symbian is not supported on Qt5. cherry-picked from qt5 b87c5cff24229b1bcc77ac68699f2f03acabc9e7 Change-Id: I6a97e00d59cce36804c857aa57c5754a2f6277db Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry mkspecs: Refine compiler optionsPeter Hartmann2012-10-142-0/+38
| | | | | | | | | | | | | | | | | | | | | stack-protector-strong gives performance benefits over stack-protector-all and is still checking more than -stack-protector, so seems to be a good middle way and we want to use it when it is there. The -shared option for the compiler (not the linker) prevents a RIM internal version of qcc from forcing -fPIE, and should not harm in general when set. In addition, add a method "compilerSupportsFlag" for Windows as is present in the Unix configure script. Original-patch-by: Greg Bentz (cherry picked from commit 80f6d7862c0e2e41768620d5bd81b0e1d5e3f61f) Change-Id: I5867fc03dde1ef6e2fbf3747bdb9aaf15518eb6a Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* More copyright changes to Digia Plc in translations and toolsjutaipal2012-10-1412-112/+112
| | | | | | | | Change-Id: Idb88b4e72548dfa641c6b8ce78a661fa61757ad0 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Changed Qt release version to 4.8.4jutaipal2012-10-0810-30/+30
| | | | | | | Change-Id: I45f7894f7e79617b6ccb8caa464bbbffaf9dd7b5 Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fixed window raise issue when handling remote commandsTaito Silvola2012-10-041-1/+1
| | | | | | | | | | | Fixed remote command hanling in Qt Assistant. Now Qt Assistant tries to raise and activate main help window after processing the remote command. Task-number: QTBUG-25407 Change-Id: I6408b9795bdf21bb920830608ba23bfda7d41604 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com> (cherry picked from qttools/883147fdaeeb2effbdb8a93a48f1ced49d56693e) Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix g++/MinGW compiler warnings.Friedemann Kleint2012-09-299-22/+11
| | | | | | | | | | - Assigned/Unused variables. - Unsigned comparison >= 0 is always true. - Constructor initialization order. - Signed/Unsigned comparisons. Change-Id: I1f9edab0506573420ed0bf3055252ba48625c8eb Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* Fix gcc 4.6 warnings about assigned/unused variables in Qt Designer.Friedemann Kleint2012-09-2913-30/+2
| | | | | | Change-Id: Ic983e09769c812412defd6f84298770235c3ed48 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-291244-28695/+28695
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: I280c0a575987d1770e354b4948f1d4d767d711ea Reviewed-by: Simo Fält <simo.falt@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* undo variable renaming in backportPeter Kümmel2012-09-171-1/+1
| | | | | | | | backport in commit fc6569921d4bc06e3d526f18d4b4cd3ef05c2025 was incomplete and broke building of configure.exe Change-Id: I2c8b3b38beeca5629bec5bb2ca814242b12f0318 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add msvc2012 supportPeter Kümmel2012-09-174-3/+11
| | | | | | | | | | | The only essential difference to msvc2010 is the define of _ALLOW_KEYWORD_MACROS. It is a documented breaking change: http://msdn.microsoft.com/en-us/library/bb531344.aspx Updated backport of qtbase/1a4f58d3e67f3d271d9e24d7f52950f796542d2f Change-Id: Iee8b900a214a9e5f289b2139d65f2e00c8113669 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Never compile QPA with EGL support on WindowsNicolas Arnaud-Cormos2012-09-071-6/+10
| | | | | | | | It's a follow-up of d7168ae0ff930f19f206a1b56c03fc35b22bb948, which is doing exactly the same on linux. Change-Id: Id9eb996d2edf5867491fd420bdf743e0f799a778 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add cross_compile to qconfig.pri for global advertisingPeter Kümmel2012-09-071-1/+6
| | | | | | | | | | | .qmake.cache is not necessarily accessible to other modules which depend on information about whether we are cross compiling or not. We might as well advertise this fact globally via the CONFIG variable in qconfig.pri. Backported qtbase/3c47b52bd37488d41a3ad068de7976c838b7d63c Change-Id: Ie2566a44fb26e26af97c791e1ed1592fd650dbbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make sure the parent widget still exists.Jarek Kobus2012-08-312-2/+4
| | | | | | | | | | | | It may happen that InPlaceWidgetHelper's destructor is called after parent widget destructor. Now inside InPlaceWidgetHelper's destructor we check if parent widget still exists. Task-number: QTCREATORBUG-7684 Change-Id: I4c9ecbfae7323fd95345ccabc113218a7011ebe8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> (cherry picked from commit aad795575646b37b5c531cb6314eaa049e90e076)
* Fix deleting of QTreeWidget items.Friedemann Kleint2012-08-201-0/+1
| | | | | | | | | | | | Breakage introduced by af617c319772a34115d0c4d802f25a807cb43065, which caused the autoconnections to no longer work. Task-number: QTBUG-26770 Change-Id: Id00341d93d4a830f3f48a1db6234818e6d262977 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> (cherry picked from commit c6616bcdc87b8665a2ea84b07dd04229f2ccbd7a)
* Disable 3DNOW on Blackberry/Win32Rafael Roquetto2012-08-171-0/+1
| | | | | | | | | | | 3DNow is being incorrectly auto-detected on Windows, causing it to be enabled by default when cross-compiling to Blackberry. In other words, the code line introduced by this patch should have already been there since the beginning, but it got lost somehow. So here it is. Change-Id: Iad0b90908602633e3046b54c1c60139c6483632d Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Prepare QtHelp library for modularized documentation.Pierre Rossi2012-08-1511-31/+65
| | | | | | | | | | | | | | - Support ".." in QCH documentation file paths. This essentially means that we stop using cleanPath, and where needed, prepend the virtual folder name, followed by "/..", in front of the original path. - Remove com.trolltech default DocPath since this was not used anymore. (Cherry picked from Qt5: I7309805000f343e2f58c74cd0655a936399fd939) Change-Id: I6508529de756bad979356c63bfcf6c55a609e827 Done-with: Casper van Donderen <casper.vandonderen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* add configure options for debug/release OpenSSLPeter Kümmel2012-08-152-10/+33
| | | | | | | | | msvc cannot use the same library for debug and release builds if openssl libraries are linked statically into the network library. Backported from 952788d64bc30c7aac5f9572533241ab8f48fb63 Change-Id: I8332b8293a27b6f9bd87ca1e6ebc63327589ab78 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Changed qt version to 4.8.3jutaipal2012-08-0810-30/+30
| | | | | | | | | Change-Id: Ib26f4c1d3b236f947d685ef5c376c203bda0e650 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
* Properly handle include cyclesKevin Ottens2012-08-081-28/+75
| | | | | | | | | | | | | | | | | | | | | | | Currently lupdate is just issuing a warning when it detects an include cycle. Since it's not a full preprocessor, most of those warnings are false positives, but they need special handling, this patch provides that. Now every result is stored as part of a cycle (so in the general case a cycle of one file). When detecting a cycle, instead instead of issuing a warning, we record the presence of the newly detected cycle for later use and merge the other relevant cycles with it. When retrieving results now it's not for a single file anymore but for a complete cycle at once (which can turn out to be a cycle of one file). This is a backport of the commit done in qttools with revision 3b99677b3376924e347ec4aeb0c363438146bfde Task-number: QTBUG-6587 Change-Id: Idc79fbac4f69478ccff1464c1f4278d4afbf9d61 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update contact information in license headers.Sergio Ahumada2012-08-011194-2395/+2395
| | | | | | | | | | | | | - Replace Nokia contact email address with Qt Project website. - Remove "All rights reserved" line from license headers. As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ie7ba62011752fcb149b99b26317c54f2a0cfa931 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Add defaults for Blackberry platform on configureRafael Roquetto2012-07-301-0/+25
| | | | | | | Adds default values for Blackbery platform configuration on configure.exe. Change-Id: I11e4f7135d88fcc6133194d6a82863ae494c8c82 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use improved QLibrary search heuristics for QMeegoRuntimeSean Harmer2012-07-271-1/+1
| | | | | Change-Id: Ibe649c6ca7f3dad96f1e624efdb2051eb724a6fb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Set correct QT_LFLAGS_SQLITE for default cases.Rafael Roquetto2012-07-181-4/+9
| | | | | | | | | | In systems where no pkgconfig is available, such as QNX, we set QT_LFLAGS_SQLITE to the default values. cherry-picked from qt5/qtbase: a94e917eeb7b19eb19c3cf74d71a9b4cabfb1124 Change-Id: Iccf4e403a90e85b41c70895e1c91fe2d8f0eb573 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* New command line switches for configure.exeRafael Roquetto2012-07-161-2/+184
| | | | | | | | | | | | | | | | | | | Adds support for the following command line switches to configure.exe tool: * -qpa * -nis (-no-nis) * -neon (-no-neon) * -largefile * -little-endian (-big-endian) * -fontconfig (-no-fontconfig) * -system-freetype * -gnu-iconv * -sun-iconv * -posix-ipc based on qt5/qtbase: 1838a6c2fb5e3b4368c871aa330d028b255b83af Change-Id: I4a5adf09e4c0e312372b96dceb87ff3310e26ba6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>