summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fixes problem with single precision floats in QDataStream (Windows).Christian Strømme2012-11-231-1/+5
| | | | | | | | | | | | When the floating-point behavior in MSVC is set to "precise" (default), assigning nan numbers to a float causes the bit pattern to be altered (only affects 32bit builds). We should therefore not assign the swapped value back to a float and use it. Task-number: QTBUG-25950 Change-Id: I7b6cc4d546e5c8aeafdede749056358b7d639ec7 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
* Add WindowFullscreenButtonHint.Morten Johan Sørvig2012-11-233-6/+8
| | | | | | | | | | | | | | | | Adds the fullscreen button on Mac OS X. Has no effect on other platforms. Regarding the name I dropped the "Mac" prefix (like MacWindowToolBarButtonHint). Other platforms can use and we don't want to accumulate "Mac" API's. Change logic in QCocoaWindow check for this flag instead of using WindowsMaximizebutton. Change-Id: I9f2db75e8e71b3da36777c7e48852eda3ce9d534 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Accessibility Mac: Return textArea as role for multi line text.Frederik Gladhorn2012-11-234-5/+8
| | | | | | Change-Id: I88eb4746463b7372c2dfe089ba74ea4cb0098396 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Accessibility: set multiline state for text edits.Frederik Gladhorn2012-11-232-2/+11
| | | | | | Change-Id: I22d3baac8fc57db0c89d8543019a93263b2023ca Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Account for the item spacing when using QListView::scrollTo()Pierre Rossi2012-11-231-0/+1
| | | | | | | | | Somehow this bug managed to stay hidden until the introduction of QFusionStyle. Task-number: QTBUG-27675 Change-Id: I86b049b869e9f2951426dc67a485ad7c60ef1403 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Return something from QPAEventDispatcherGlib::processEventshjk2012-11-231-1/+1
| | | | | | Change-Id: I0abaf73d4b6b96dbcf499ea86749ced76348c281 Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Get rid of deprecated functionality in QtOpenGL.Samuel Rødal2012-11-224-90/+4
| | | | | | | | | We will in any case not be able to support this in Qt 5, so best to just remove it to not give any false impressions. Change-Id: Ib52e86007b9e6483bd973f13502b078792a9fa40 Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix drops from external sources.Gatis Paeglis2012-11-221-6/+5
| | | | | | | Task-number: QTBUG-26832 Change-Id: Ia1ccce391178e73d26a4f09955bce6c37616384f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Pass extended key event infomation in xcb platform.Weng Xuetian2012-11-221-2/+2
| | | | | | | | Bare QKeyEvent missing some useful info for input method. Use new construct of QKeyEvent to create extended QKeyEvent Change-Id: I8c89e80e7329b92e3e04d5fe52d07c6f6f9e006f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QtPrintSupport: use CUPS defaults for UNIX print dialogTeemu Katajisto2012-11-223-290/+178
| | | | | | | | | | | | | | Update printer defaults in UNIX print dialog when printer is changed. Task-number: QTBUG-23037 Task-number: QTBUG-6239 Task-number: QTBUG-15351 Task-number: QTBUG-19233 Task-number: QTBUG-22036 Change-Id: Ib03635035211bd69b5b23da20ffd2c03ac318a1a Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QtPrintSupport: remove advanced tab from UNIX print properties dialogTeemu Katajisto2012-11-222-436/+15
| | | | | | | | | | | | | The Advanced tab shows CUPS options and duplicates some of the settings in Page tab. These duplicate settings cannot be kept in synchronization and thus the Advanced tab causes confusion which settings are used. Remove the Advanced tab because the same settings are either available in Page tab or can be configured in system printer settings. Change-Id: I2dc2bf8b3b84dd19f24b2e6c1c9539c925d5d725 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Cocoa: Properly set QNSView's geometry when it's a subviewGabriel de Dietrich2012-11-221-0/+3
| | | | | | Task-number: QTBUG-26960 Change-Id: Ib8ca76572c868305f378d22c21d13511b4999244 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Do not hide fullscreen widgets having a 0x0 geometryOliver Wolff2012-11-221-1/+1
| | | | | | | | | | | | It is possible that the widget which is to be shown full screen has a 0x0 geometry if an empty layout with 0 margin is set there. In that case the widget should not be hidden. Task-number: QTBUG-27602 Change-Id: I87fd20cc3a5bac89ceccdf639780c4bc721ce860 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Made renderText() work in samplebuffers example.Samuel Rødal2012-11-221-23/+17
| | | | | | | | | | | Since the OpenGL paint engine is now OpenGL 2.0 based, we need to save and restore all GL state to prevent it from being clobbered. Task-number: QTBUG-27020 Change-Id: I39831e074aa818583df34c4a88b13be559d0231b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Doc: Modified Qt Test's doc configuration to match file and dir names.Jerome Pasion2012-11-221-1/+1
| | | | | | | | | | -"qttestlib" should be the directory to match the name of the .index file. The names affect the cross linking and the "depends" variable. Change-Id: Ibd35e7a089c78c043527bd72741e57d72daa83d8 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Jason McDonald <macadder1@gmail.com>
* Add QMimeType::aliases().David Faure2012-11-224-0/+50
| | | | | | | | | Requested by Allan Sandfeld Jensen for QWebkit, which needs to register upfront all the mimetypes that a given plugin can handle. Change-Id: I64b8d39c7988adfc7db4ed8bfdc73acd16e999da Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Use QT_STRINGIFY in qobjectdefs.hOlivier Goffart2012-11-221-3/+1
| | | | | | | | | | | Since it is declared in qglobal.h, we do not need to re-implement the hack here. QTOSTRING was only defined if QT_NO_META_MACROS was defined, so practically not safe to use in other places. Change-Id: Ie5b07d0fa7537ba79380b882a4c822583ee5635e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Unbreak the bootstrap lib build on MinGWKonstantin Ritt2012-11-211-0/+3
| | | | | | | | With -std=c++0x, MinGW headers doesn't declare some common functions we're using in qglobal.cpp. Change-Id: I0ba68ee73b1099c8591a578f06f58db316631e8e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNXmfekari2012-11-212-20/+20
| | | | | | | Change-Id: I87708aad18ebe1c6a08fe89376290be66f9c0577 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Sérgio Martins <sergio.martins.qnx@kdab.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Remove warnings from qtbase.Mitch Curtis2012-11-212-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | geometryengine.cpp: In member function 'void GeometryEngine::drawCubeGeometry(QGLShaderProgram*)': geometryengine.cpp:159:93: warning: cast to pointer from integer of different sie [-Wint-to-pointer-cast] geometryengine.cpp:167:95: warning: cast to pointer f rom integer ofdifferent size [-Wint-to-pointer-cast] benchmarking.cpp: In member function 'void TestBenchmark::multiple()': benchmarking.cpp:85:9: warning: variable 'result' set but not used [-Wunused-but-set-variable] benchmarking.cpp: In member function 'void TestBenchmark::series()': benchmarking.cpp:120:9: warning: variable 'result' set but not used [-Wunused-but-set-variable] qstandarditemmodel.cpp:2717:45: warning: unused variable 'd' [-Wunused-variable] qxcbconnection.cpp: In member function 'xcb_timestamp_t QXcbConnection::getTimestamp()': qxcbconnection.cpp:930:40: warning: suggest parentheses around assignment used as truth value [-Wparentheses] tst_qguiapplication.cpp: In constructor 'BlockableWindow::BlockableWindow()': tst_qguiapplication.cpp:340:9: warning:'BlockableWindow::enters' will be initialized after [-Wreorder] tst_qguia pplication.cpp:339:9: warning 'int BlockableWindow::leaves' [-Wreorder] tst_qguiapplication.cpp:342:12: waring: when initialized here [-Wreorder] tst_qsqltablemodel.cpp:570:10: warning: unused parameter 'value' [-Wunused-parameter] tst_qabstractitemview.cpp:1546:8: warning: unused parameter 'index' [-Wunused-parameter] Change-Id: I49c88547182e4669cfde2c2536403fc5573ca2da Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update Qlocale data up to CLDR 22.1Konstantin Ritt2012-11-213-3929/+4402
| | | | | Change-Id: Ie6ddfec14cb052e0b89230dc93290ff79488fb25 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Update Qlocale data up to CLDR 2.0.1Konstantin Ritt2012-11-213-3414/+3933
| | | | | Change-Id: I4279fac57436d7009a6d61dab5936b72fd39fc14 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Use likelySubtags to instantiate a locale id from it's short formKonstantin Ritt2012-11-213-764/+1321
| | | | | | | | | ...just like described in http://www.unicode.org/reports/tr35/#Likely_Subtags. This is much more effective than current "guessing" algorithm + makes it possible to instantiate a locale by the script or territory code only. Change-Id: I674f8476e65b01c56960b6e83a1a346df0715274 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* [SIC/BIC] QLocale: update enums up to CLRD 1.9.1Konstantin Ritt2012-11-214-1194/+1411
| | | | | | | | | | This patch adds some missing codes (two-letter ones only), removes an outdated ones, and updates some names. The legacy language codes are handled in QLocalePrivate::codeToLanguage() (fortunately, there are only 4 of such codes). Change-Id: Iff50aecd1c762b6399cd151aebb955f341d366c6 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* QHeaderView - call viewport->update() in setDefaultSectionSizeThorbjørn Lund Martsum2012-11-211-0/+1
| | | | | | | | Just like in resizeSection, moveSection, swapSection (and more) we should call update on the viewport after setDefaultSectionSize. Change-Id: I88154138d98f644050054d7cd287a0addd9a9cf9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* QHeaderView::setDefaultSectionSize to handle auto size of sections.Thorbjørn Lund Martsum2012-11-211-0/+3
| | | | | | | | | | | setDefaultSectionSize should respect auto resized sections like QHeaderView::resizeSection(). When setDefaultSectionSize is called we should process a possible pending resize and afterwards we should do a (delayed) resize of the sections (if we have autosized sections) Change-Id: Ie09e6f073c944b58693ffbbd1d1a8b60104c1a55 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Rename DBus landing page according to rules.Frederik Gladhorn2012-11-211-2/+2
| | | | | Change-Id: Idf26f89f41940c4883cbbe99b3cdd868d0d36b06 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QHeaderView:setDefaultSectionSize add invalidateCachedSizeHint callThorbjørn Lund Martsum2012-11-211-0/+1
| | | | | | | | | We cannot rely on the previous sizeHint and we also call it in QHeaderView::resizeSection(). There seems to be no reason not to call it. Change-Id: Ia473fb7163369aafa5c019ff97a030f9f54a33d9 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* uic - fix to handle QTreeWidget with empty header(s)Thorbjørn Lund Martsum2012-11-211-0/+6
| | | | | | | | | | | | | | | | | | | This makes it possible for uic to handle QTreeWidget that in the designer has one or more empty headers. Before the right(most) empty items where there wasn't a non-empty header to the right of them would not be visible. The other empty items - where there was a header to the right of it would not be empty but initialized with a number. This patch ensures the same behavior that the QTableWidget is having. Task-number: QTBUG-18156 Change-Id: I19bfd3307befe46a1af2d6a3275f7446a15b3442 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Mark QDBusConnectionInterface::serviceOwnerChanged as deprecated.Mitch Curtis2012-11-211-0/+3
| | | | | | | | | | It warns that it is deprecated if used, but it is currently not marked as such. Task-number: QTBUG-28082 Change-Id: Ib0bf034c188650ae77eb5550769e032490d19783 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* [Doc cleanup] Fix typos and style of QAbstractButton, QButtonGroup, ↵David Gil2012-11-214-50/+49
| | | | | | | QCheckBox and QRadioButton Change-Id: Ie557f865f5bdec7241abced91bf10cee8feaf9d9 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Enable gui build with QT_NO_SYSTEMTRAYICONTasuku Suzuki2012-11-211-2/+2
| | | | | | Task-number: QTBUG-24816 Change-Id: I5b53392bee3990ec5c7235cc615b4a477fb62089 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Accessibility: unhide text() function in TextWidget subclasses.Frederik Gladhorn2012-11-211-0/+7
| | | | | Change-Id: Ib5a64ff8de175d1ffc6e4357ec9ec45c4c2f2917 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Made QWindowsXPStyle internalJ-P Nurmi2012-11-218-431/+433
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy and even merging style implementations (XP & Vista) later on, without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QWindowsXPStyle directly. Change-Id: Ib4fec35c2fcb3b5a193537a1de5b6e26fbbe0a06 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Made QWindowsVistaStyle internalJ-P Nurmi2012-11-216-236/+236
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy and even merging style implementations (XP & Vista) later on, without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QWindowsVistaStyle directly. Change-Id: I8b320036e241e877fc9bb5f4084cc6e63756cbc4 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* BlackBerry: Changed QSettings file accessBernd Weimer2012-11-212-5/+28
| | | | | | | | | | | | | On the BlackBerry platform, applications run in a sandbox. They are not allowed to read or write outside of this sandbox. Hence in QSettings there is no use for the system scope and differentiating between organization and application. This change will also improve performance. Change-Id: I79fee0140595385f3d33bd89fe5daa36b04836bc Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Alan Alpert (RIM) <aalpert@rim.com>
* BlackBerry: Restore proper BPS channel in event dispatcherBernd Weimer2012-11-211-8/+36
| | | | | | | | | | This change ensures that BPS events are delivered to the proper channel even if the application code would change the channel. Change-Id: Id44efbdd99350c639e391161dd89b8d422c4b330 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Jeff Kehres <jkehres@rim.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* Handle QEventLoop::ExcludeUserInputEvents in QWindowSystemInterface.Friedemann Kleint2012-11-212-36/+45
| | | | | | | | | | | Add a flag indicating user input events to the event type and leave those events in the queue if QEventLoop::ExcludeUserInputEvents is set. Task-number: QTBUG-27595 Change-Id: Ib41b826ef3be19253cd582d9894dd7c87953711f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Properly initialize glViewport() to appropriate value in QGLPixelBuffer.Samuel Rødal2012-11-211-0/+1
| | | | | | | | | | Since we are using a hidden window in order to make the context current, the viewport will end up with an arbitrary value. By setting it explicitly we ensure compatibility with Qt 4. Task-number: QTBUG-28115 Change-Id: I69fb5efda2b274b539c3d3b9fa842a2d32ad70b1 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
* Mac: fix invalid context in imageForGlyphTeemu Katajisto2012-11-211-1/+1
| | | | | | | | | | | | The bounding rectangle may have negative width or height when a graphics view with text is rotated in certain angles. Make sure that the image width and height are positive, otherwise the context will be null and the following messages can be seen in test logs: <Error>: CGContextSetFontSize: invalid context 0x0 Change-Id: I10f83f6909035fb3c4ac456123cf1922eaea7c73 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QNX: Fix crash due to re-entering QToolTip::show().Sergio Martins2012-11-211-2/+6
| | | | | | | | | | | | | | | | | | | The flushWindowSystemEvents() was added to send the geometry event synchronously. A side effect was that all input events were also sent. We don't want that. We're probably in setGeometry() because some other input event brought us here, and it's still in the call stack. One crashy example is the static method QToolTip::show() which uses static variables([1]). If we process input events while the first QToolTip::show() is still on the call stack, it will trigger a second one, deleting stuff ([1]) that the first invocation will still need once the stack unwinds. Change-Id: Iea22419a7f386d6b6231404666092340dfd1afed Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* qdoc: Make image paths relative to html fileMartin Smith2012-11-211-4/+5
| | | | | | | Task-number: QTBUG-28080 Change-Id: Ie552cacdf736f9f6da3148a11ef2362248775e1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Made QFusionStyle internalJ-P Nurmi2012-11-216-209/+210
| | | | | | | | | | | | | We will take this opportynity to remove various QStyle specializations from the public API in Qt5. This gives us much more freedom, for example changing the inheritance hierarchy, pluginizing etc. without worrying about BC. => Use QStyleFactory and/or QProxyStyle instead of creating an instance or inheriting QFusionStyle directly. Change-Id: I37d8acb13b6fd328a9cd53c74df971428bbbe443 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Fix possible crash/assertion in qt_fontHasNarrowOutlines()Konstantin Ritt2012-11-211-4/+10
| | | | | | | | | 1. cloneWithSize() may return 0 1bis. QRawFont::setPixelSize() may ivalidate the font (due to 1.) 2. using the data obtained from a temporary QString is never safe! Change-Id: I0cd5f807d8077ef5112704e475f1904bd6fc4b1b Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* QPAEventDispatcherGlib: Use correct flags when sending eventsOliver Wolff2012-11-212-3/+18
| | | | | | | | | | Instead of assuming that all events should be handled when a user event occurs, userEventSourceDispatch has to use the flags used in QPAEventDispatcherGlib::processEvents. Task-number: QTBUG-27595 Change-Id: Ib13607f89f7d3207ec83ab26f7d59b3c59a28c4e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* SIC QPrintSupport: Remove unused PPK_SuppressSystemPrintStatusJohn Layt2012-11-213-7/+0
| | | | | | | | | Print Engine key PPK_SuppressSystemPrintStatus was added in Qt4.1 for Cocoa dialog to suppress the progress dialog. In Qt5 all cocoa code has been removed and this key is now unused. Change-Id: I3a91e9651e16f81611a9a736163f76acf9f20096 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Patch file for ANGLE for fixing blackscreen after minimizeMiikka Heikkinen2012-11-211-0/+45
| | | | | | | Task-number: QTBUG-27994 Change-Id: Iee3d9ff992b0d99c9d1ec3f13631c137114a52a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QJpegHandler: err should be set before jpeg_create_decompress()Elvis Lee2012-11-211-2/+3
| | | | | | | | | | If ERREXIT2 is called in jpeg_create_decompress(), SIGSEGV occurs with no error message. ERREXIT2 macro uses jpeg_compress_struct.err to handle error case. Change-Id: I8517a4d6f6e6aa4c1c59cd1aaea435554cca7ac3 Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com> Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Qnx: Handle the MeasurementSystem value in QNXmfekari2012-11-202-0/+103
| | | | | | | Change-Id: I00837421431d82aa831b785d3effb0920b4541f3 Reviewed-by: Fabian Bumberger <fbumberger@rim.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix regression in QXmlStreamWriter with codec set to UTF-16Jan Arve Saether2012-11-201-7/+25
| | | | | | | | | | | | | Actually, this broke using QXmlStreamWriter with any codec where characters in the ASCII range have a different encoding than the ASCII standard. This was a regression from 558fe9383ba0aecbec09cc411c0ebab132aac137 Task-number: QTBUG-23310 Change-Id: I75bd013e9d5de53da564a76c2f06e95ff35303a8 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>