summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix Symbian key event code mapping in QSymbianControlRiikka Inkila2012-05-041-1/+1
| | | | | | | | | | | | | | | | Symbian key events that represent characters/symbols whose Unicode values are above the value range of S60 special keys are currently mapped incorrectly to S60 special key events within QSymbianControl class. This must be fixed as Symbian AknFEP can nowadays deliver character input from virtual keyboards to FEP-aware text editors only by simulating a corresponding key event and virtual keyboards can obviously contain characters and symbols whose Unicode values are above the S60 special key value range. Task-number: ou1cimx1#979068 Change-Id: I57c4e87f6a532641ece7d45f29d3956ebb25b736 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Add missing colon to tests/auto/auto.proRoy Mickos2012-05-041-1/+1
| | | | | | | | | | The pro file has a missing colon in the last line regarding help.pro. Although the intent was to exclude it from symbian compilation, the missing colon caused that it was dropped from all platforms. This fix will bring it back, while still excluding it from symbian. Change-Id: I3cf05505d969182556458272cf10bc8847476468 Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Pass configured timeout to callWithCallback too.David Faure2012-05-041-1/+2
| | | | | | | | | This was missing in ccf3b9e48b2d773999a9a88e249f79380618cde6. Backport of ac86c8397ceca7c46de6f104c7031716e053f9fb Change-Id: Ia473ef581db91506ea72e777a727d4b786ae3fee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix unit confusion in ccf3b9e48b2d773999a9a88e249f79380618cde6David Faure2012-05-042-6/+12
| | | | | | | | | | | I wrote nonsense in that commit. The older methods that take a timeout all take milliseconds, and the comments in the unit test really meant milliseconds, not seconds. 1s is not shorter than 100ms.... Backport of 972464262166752df0015fe1209a7ab307cc7105 Change-Id: I3539cf196848b483b8c3a96b45851a465fc2dfcb Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix compilation error on old Unix systems caused by ShapeInputSergio Ahumada2012-05-031-1/+3
| | | | | | | | | | Change 33bb996c83e541c26df632b3e8883a1190cc97f0 caused a build error on Solaris/HP-UX (at least) as ShapeInput type is not present in default system headers. Change-Id: I6e19351651856ed71bc9ceaeae625ceac74b27b0 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fixed crash issue in QtDBus if D-Bus not installedTero Ahola2012-05-031-1/+1
| | | | | | Task-number: QTBUG-23128 Change-Id: Iba47ddf2fbbfa56499c4c4e28899190f6b63efac Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix atomics on SPARCThiago Macieira2012-05-031-8/+8
| | | | | | | | | | Inspired by https://bugreports.qt-project.org/secure/attachment/26020/qt_atomic_sparc64.patch Task-number: QTBUG-22479 Change-Id: Ie3275df96c639d6a75e05f70fe5745aeb34457f9 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> (cherry-picked from commit 01ee0985319a0f41be12c3c8ff3813a74b43835e)
* mkspecs: Define compilers and linkers elsewhere for freebsd-g++46.Raphael Kubo da Costa2012-05-031-4/+10
| | | | | | | | | | | | | | | | Commit ae2060dc56501ab387863757c3fd90d5cfed7dd2 has made the freebsd-g++46 mkspec use g++-base.conf, which on its turn resets QMAKE_CC and QMAKE_CXX to other values. Redefine them to gcc46 and g++46, respectively (and fix the linker values) after the inclusion of g++-unix.conf so the settings are not lost. Cherry-picked from f42a61e76ac209db0bfeefdb03de22ce26b422bf to qt5/qtbase. Change-Id: I005bab3bc79ca3a0dc1b2d3a70d058b77c304f46 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Add implementation of virtual keyboard based on BPS eventsKevin Krammer2012-05-038-43/+339
| | | | | | | | Backport of a818a1eb2f3d2c5ac61da7e1a8cf1b341e63aed1 Change-Id: I32bc78eb465890702cbf657b077fdf1f8e8e4a63 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Handle navigator events in BPS event filterKevin Krammer2012-05-033-4/+81
| | | | | | | | Backport of 050ff2730c96831aedb5897a60eafaf13ae8d93e Change-Id: Ida0566e88d5f53ea879a7fd2bda6746814b4e365 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Updated WebKit to a096458b01a9387719308c99e5917a7b42196078Simon Hausmann2012-05-034-7/+33
| | | | | | | | | | QNX fixes for https://bugs.webkit.org/show_bug.cgi?id=77013 and http://trac.webkit.org/changeset/109105 backported by Nicolas Arnaud-Cormos <nicolas.arnaud-cormos.qnx@kdab.com> Change-Id: I4b57f26bac6ed61a8a48ea6ef4c2dedf0503675b Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com> Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com>
* Register for and handle screen events delivered through BPSKevin Krammer2012-05-038-52/+100
| | | | | | | | | | | | Delegates actual event inspection and reaction to the screen event handler class already used by the PPS screen event handler Backport of e212d25972dbc19e3cc687b8c7bd4503eec8a602 Change-Id: I0e7f2fb91bedd0b5200d90b9e67be55ec9386dde Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Fix auto-detected QNX mkspec paths in configureSamuli Piippo2012-05-031-2/+2
| | | | | | | | Removing 'unsupported' from QNX mkspec paths in configure when it auto detects missing platform and xplatform arguments. Change-Id: Icc180a0c1cb226865e3f416ae50eec16523114b5 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Use BPS based event handlingKevin Krammer2012-05-039-2/+399
| | | | | | | | | | | | | | | | Create a QPA specific subclass of the blackberry event dispatcher (basically the BPS equivalent to QPAEventDispatcherGlib or QEventDispatcherQPA. Create an event dispatcher event filter that will receive all BPS events and then either handle them itself or delegate to event subtype specific handlers. Backport of fa94f01489611f2c72d1678b4d9439a584e7c4f9 Change-Id: Ie51c064c5ef1faca04e09a4f7ff35069ff6afda5 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* test: Mark test as significant on platforms other than Mac OS XSergio Ahumada2012-05-021-1/+1
| | | | | | | | This test only fails on Mac OS X at the moment, so enabling it for all the other platforms. Change-Id: I1e816e9b7bbae802c868e31b367b7e43bd673d87 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* test: Mark test as significant on platforms other than WindowsSergio Ahumada2012-05-021-1/+1
| | | | | | | | | This test only fails on Windows at the moment, so enabling it for all the other platforms. Task-number: QTBUG-25563 Change-Id: I42d1bf9046a643c12385ce3bc6d88572216691b4 Reviewed-by: Jyri Tahtela <jyri.tahtela@nokia.com>
* configure: Escape '{' in getQMakeConf2 functionSergio Ahumada2012-05-021-1/+1
| | | | | | Change-Id: I7df0ca940a76b80d7b0da24dbedbabd2b8736bb8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 62185f07f8ac1515b9e884452b33978c5a521549)
* test: Remove insignificiation from qxmlquery test on WindowsSergio Ahumada2012-05-011-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: I8c0be5bd8430544853df1b0b77bf229b76a0668b Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Remove build_all when target is same for debug and releaseSamuli Piippo2012-04-3016-3/+71
| | | | | | | | | | | Change build rules for projects where both debug and release target are the same file. For these, it makes no sense building both targets, as they overwrite each other. Now build only release target, when build_all is used. Change-Id: Iffd1076028b1cc91e8151c346bf4761772dafe65 Reviewed-by: Simo Fält <simo.falt@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* test: Remove insignificiation from qhttpnetworkconnection test on WindowsSergio Ahumada2012-04-301-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: I3dac52588c7032935957bf2f258353116d320ba3 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* test: Remove insignficiation from networkselftest test on WindowsSergio Ahumada2012-04-301-2/+0
| | | | | | | This test has been always passing in the last 10 runs. Change-Id: Ic867f786104f118008cf810df21ac6e68438c881 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix crash with evaluation licenseSamuli Piippo2012-04-271-7/+2
| | | | | | | | | | With QWS, an infinite loop is formed at application startup when commercial evaluation license is used and QT_EVAL is defined. Change-Id: Ia8e9a02c95e7277f49cf4866bae2422e6cef7973 (cherry picked from commit bf3c3862b486bbc472117d8e11e03f621b11c064) Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix bug that made some autotests unrunnable on INTEGRITY targetKalle Viironen2012-04-278-19/+3
| | | | | | | | | | | Some autotests had else:integrity { patrs that defined SRCDIR so that those tests were unrunnable on INTEGRITY. This patch removes those defines. Task-number: QTBUG-24176 Change-Id: I26d3ee60c825fc57a60df1a7177176585733d099 Reviewed-by: Rolland Dudemaine <rolland@ghs.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Fix memory leak in 64-bits ODBC driverHonglei Zhang2012-04-271-1/+2
| | | | | | | | | This fix complements the commit 8c28db8cda. A similiar function call was forgotten in the previous fix. Task-number: QTBUG-25256 Change-Id: I38880e755a78951985484b718c89ac43a6dc2b4c Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Compile on Mac OS X with unsupported/macx-clangBradley T. Hughes2012-04-272-2/+2
| | | | | | | | Clang does not allow implicit const to non-const conversion like gcc does. Fix this. Change-Id: I1448975e1935a54405c20851841f0559c7bb9d3d Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@nokia.com>
* Fix crash in TextEdit when changing text content.Andrew den Exter2012-04-271-1/+1
| | | | | | | | | Verify the text cursor is not before attempting to deference the layout it refers to. Task-number: QTBUG-25389 Change-Id: I8a75393c5af9f81821ad91cbfdd7bbca0d84b1a2 Reviewed-by: Yann Bodson <yann.bodson@nokia.com>
* Take account of spanned items in QTreeView when dragging.Stephen Kelly2012-04-262-32/+42
| | | | | | | | | Also remove some code which has been unused since it was introduced in 32182d107fa75e5619ecc91a81f50626f429ebe1 Task-number: QTBUG-25140 Change-Id: I27f9496c2c998de7ea858b943c2f19d979ef18c2 Reviewed-by: David Faure <faure@kde.org>
* Use non-blocking reads on virtual keyboard pps device.Kevin Krammer2012-04-261-1/+6
| | | | | | | | Backport of 5c882dbb8955e3bcbd77027aae379aca50e9dfaa Change-Id: Ic9724138775cc2a33ec8a3279950c1332b9adbcf Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* docs: more tweaks to offline stylev4.8.2Daniel Molkentin2012-04-261-2/+3
| | | | | Change-Id: I50a51da61379a57e0b22785caf11874752ec3bf8 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* doc: use hooks introduced to qdoc for correct prev/next disambiguation.Daniel Molkentin2012-04-262-6/+10
| | | | | Change-Id: I076839b146e2c3f92c884fc932f0ace54d5b3545 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc: Disambiguate prev and next links in html sourceDaniel Molkentin2012-04-261-2/+2
| | | | | Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add icons for previous and next page.Daniel Molkentin2012-04-265-22/+47
| | | | | Change-Id: I3b16c70b4742a942ceec2035c46618ebc63b697f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* docs: fix conflicting resource file namesDaniel Molkentin2012-04-262-1/+1
| | | | | Change-Id: I10bd6abe214507f663cc7c6a0b3a6f3c69668360 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Remove the text around previous and next page links.Casper van Donderen2012-04-261-4/+4
| | | | | | | | | Previously we printed "[Previous: <link>] and [Next: <link>]. After this change we only print the <link>, which should include an icon. Change-Id: I7bf46623b3bce6b02067127338a1235861449e64 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com> Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Improved detection of libcrypto and libssl.Niels Weber2012-04-251-12/+51
| | | | | | | | | | | | The previous solution didn't work on systems where the libraries aren't in the same location. Now we search for both libcrypto and libssl and load them if their versions match, even if they are in different directories. Task-number: QTBUG-25398 Change-Id: I37164638890586947d07670d8a59fc53a84f9c42 (cherry-picked from commit 8643e1992f6c62983345f89d793742b3449a69ea) Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Add out-of-memory checks to QImagePauli Jarvinen2012-04-251-0/+11
| | | | | | | | | | | | | | | | Some of the methods of QImage crashed on out-of-memory situation as they referred to null pointer if creation of a new QImage instance had failed. Many cases like this were already fixed by commit a041e4eca3467c1baa6245b6fb47def127f30f41 which was a fix for QTBUG-1985, but few cases still remained. Now, all the lines creating a new QImage instance in qimage.cpp have been gone through and sanity checks have been added where it was necessary to avoid immediate crashing. Task-number: ou1cimx1#994957 Change-Id: I1f07e8890bc91de18af075be73b1a06c667f3776 Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Off-by-one-line error in QVGPaintEngine::drawImageMurray Read2012-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | QVGPaintEngine::drawImage(const QPointF &pos, const QImage &image) uses vgWritePixels if possible, and when the QImage is loaded from some file types, its lines are inverted, stored from bottom to top in memory. For inverted images, the image data pointer passed to vgWritePixels should be pointing at the start of the last line. However drawImage was actually passing a pointer to after the last line. This has undefined results, but in practice you either get the image contents drawn one line too high with the top line missing and and extra garbage bottom line, or you can also get a crash if beyond the last line is not readable memory. Fixed by correcting the pointer passed to vgWritePixels to point to the start of the last line for inverted images. Task-number: ou1cimx1#996894 Change-Id: I1cf5b976acc18adceec1e14633f8779441faa056 Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Symbian: fix symbian deffilesPasi Pentikainen2012-04-254-5/+8
| | | | | | | | | | | Absent removed and freeze added exports caused by change If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 "Moved qmljs_debug_arguments to QCoreApplication" (commit 8599a0e6397391634ee52197e164f6b7121f9a4d). Change-Id: I6974d1f38c233b2143fe2e4e59b730b2bab475dc Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com> Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix QThread start failure due to bad thread name on SymbianJuha Kukkonen2012-04-252-1/+156
| | | | | | | | | | | | | | | | | | RThread::Create() deems a thread name to be invalid, if it contains any of the characters: "*", "?", ":" or character is outside 0x20 - 0x7e range. This matches to the logic in User::ValidateName() that is used by RThread::Create() to validate thread name. In addition, maximum thread name length is 80 character on Symbian. It was possible that thread name contained e.g. colon that caused RThread::Create() to fail with KErrBadName (-28). Fix ensures that thread name contains only allowed characters. Task-number: ou1cimx1#996187 Change-Id: Ie6dd8c60bfed4e2f6cc48607ff0ff940d9cdae8a Reviewed-by: Murray Read <ext-murray.2.read@nokia.com> Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
* Integrate Blackberry Platform Services (BPS) with Qt event loop.Jeff Kehres2012-04-255-7/+388
| | | | | | | | | | | | | This ensures interoperability between the Blackbery C and C++ APIs and makes it easier to expose platform services in C++ that are exposed in BPS - since events from both APIs can be processed on the same thread. Backport of qtbase 0723e14699704c35d5d61fa7f5e9f3bdbb378afa Change-Id: Ie0d66e7f9b9984ad3acff61f01665a2b90ef40db Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Windows - "bypass proxy for local..." also affects IP addressesShane Kearns2012-04-252-2/+23
| | | | | | | | | | | | | | | | | If the "bypass proxy for local addresses" option is enabled in the windows proxy configuration, then do not use the proxy for any IP address in the subnet of any network interface. As the systemProxyForQuery api is now offering HTTP proxy tunnels for TCP sockets, this change avoids local ad-hoc network connections being routed through the proxy. In the case where the local address was on a different interface to the proxy server, it may have been unreachable through the proxy. For example IP over USB or Bluetooth. Change-Id: I0842732832a7795112be029d923ed168edc008d6 (modified version of fffc900f78a191970c4eebced9c1af016a9ea6f4 in QtBase) Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QSqlQueryModel::fetchMore() documentation fixMark Brand2012-04-241-1/+1
| | | | | | | Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad Reviewed-by: Andy Shaw <andy.shaw@digia.com> cherry-picked from qt5/qtbase: 508a90302b5bd2a1b228c62d1a1b24a3e66d24a9 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Do not force OpenGL sample buffers on in the qnx qpa pluginSean Harmer2012-04-231-1/+0
| | | | | | | | Backport of 4c0289c337f7793ec2f6b65bb3493f7299f8e4ef from qtbase Change-Id: I871629356adf081197bc89e9f28801e5da517c5e Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QHttpNetworkConnectionChannel: Warn if bytesAvailable and no replyMartin Petersson2012-04-231-3/+4
| | | | | | | | | | If there are no bytesAvailable and no reply then the channel can be closed without any need for this warning. Task-number: QTBUG-9315 Change-Id: Idd461a38ea932305cc227dbd68b9af61b7e855d2 Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
* Fix IPv6 address returned from QUrl::hostShane Kearns2012-04-231-5/+4
| | | | | | | | | | | | When passing an IPv6 address through QNetworkProxyQuery, it is stored in a QUrl internally. There was a bug in QUrl where it strips the [] surrounding an IPv6 address only if they were present in the input, otherwise it added them. Now the behaviour is the same as Qt5 ([] are always stripped). Change-Id: I42e020ce30d18a4108f1dd4428809fed07991680 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update QSettings and Mac OS X documentation with App Store informationPasi Matilainen2012-04-233-0/+74
| | | | | | | | | | | Add information about changing the location of global Qt settings to QSettings documentation, and general information about submitting Qt apps to the Mac App Store to the "Qt for Mac OS X - Specific Issues" document. Task-number: QTBUG-16549 Change-Id: Ic0210e8f4d3c3f6369032abd5c1e214b4200b179 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix annotation processing for qtTypeNameMartin Gräßlin2012-04-221-1/+1
| | | | | | | | | An old annotation was incorrectly ignored and not recognized as the deprecated annotation causing the tool to exit instead of printing out a warning and returning the type name. Change-Id: I703933f1f75ca37e908b095a2bde803226fd01a7 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Update com.trolltech -> org.qtproject in the bootstrapped toolsThiago Macieira2012-04-201-13/+40
| | | | | | | | | | | | | | | | The tools will now generate the new org.qtproject annotations only, matching the XML generator in the library. They accept both types of annotations as input though -- and will generate a warning about the older one. This commit should be backported to Qt 4, so XML files can start to be ported. Task-number: QTBUG-23274 Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com> (cherry-picked from commit f18a6c5fb569ab93e86ca4b75301a7495ba17768)
* Finish cleaning up com.trolltech -> org.qtproject in QtDBusThiago Macieira2012-04-205-10/+20
| | | | | | | | | | | | | | | Lots of uses of the annotations and error names, plus a bunch of local unit test names (including one file that had to be renamed). The meta object generator is updated to support both the old and new names. That means some references to com.trolltech *must* remain in the source code. Task-number: QTBUG-23274 Change-Id: Icc38ae040232f07c437e7546ee744a4703f41726 Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Lorn Potter <lorn.potter@nokia.com> (cherry-picked from commit e02a144a3c8e7858d879ac2d0038bc7d00906ae6)
* Moved qmljs_debug_arguments to QCoreApplicationRafael Roquetto2012-04-206-23/+55
| | | | | | | | | Enable the use of the QML debugger without QtGUI Based on Qt5's 9a096d9e. Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 Reviewed-by: Kai Koehne <kai.koehne@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>