summaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
* QDebugStateSaver: Fix trailing space issuesKai Koehne2014-07-231-0/+23
| | | | | | | | | | | | | | ~QDebug() removes any trailing space if autoInsertSpaces() is true. However, if one uses QDebugStateSaver the global autoInsertSpaces might be false, but a space was added by a custom operator<<. Explicitly check for this in QDebugStateSaverPrivate::restoreState. Remove any trailing space if the local state asks for adding trailing spaces, but the original one doesn't. Add a trailing space if the local state doesn't ask for one, but the global state does. Change-Id: I243b5c76d5ed2c1ec4820da35ab6e254da1551d9 Reviewed-by: David Faure <david.faure@kdab.com>
* Make QRingBuffer::append() not leave empty arrays in buffer listAlex Trotsenko2014-07-231-0/+15
| | | | | Change-Id: I4c5af33488a70996299289ec2b953b7bf3b2c428 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Add QFileDevice::MemoryMapFlags::MapPrivateOption flag.Simon Sasburg2014-07-231-7/+15
| | | | | | | | | | Passing this flag to QFileDevice::map() will allow writes to the mapped memory without modifying the file that was mapped. These writes will be lost when the memory is unmapped. Change-Id: I7d46b044fc370585de8c06fdb4059f1f1be12d7d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Android: Add uninstall option.BogDan Vatra2014-07-211-0/+8
| | | | | | | | Uninstall option will uninstall the test afer has been executed. It is useful when you are using your own phone to execute the tests. Change-Id: I2a3f6c3a93099d70c98f9ce059da22c409b55843 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Android: Use androiddeployqt from qt path.BogDan Vatra2014-07-211-2/+3
| | | | | Change-Id: I085f2b20d1f53e3f5caf0b208f64a75c26a89219 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* Fix up existing high DPI manual test.Friedemann Kleint2014-07-182-53/+125
| | | | | | | | | Compile on Windows, add command line options to activate the various tests. Task-number: QTBUG-38858 Change-Id: I38c6a9a6711831b2bd8b6ea051dd19615cc911a1 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* RCC: Use macros not defined in qglobal.hhjk2014-07-161-14/+14
| | | | | | | | | This prevents conflicts in case of link time optimizations or precompiled headers are used since we don't include qglobal.h in the generated code. Change-Id: I4266c8ae38e6eafefd28b3bde5cb725a24d67ea0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QDebug: Add resetFormat()Kai Koehne2014-07-151-1/+18
| | | | | | | | | | Similar to QTextStream::reset(), this resets the stream format to the defaults. Its primary use is inside custom operator<< implementations, where you'd want to have a fixed format regardless of the current stream state. Change-Id: I421d76c61f164579bb90cf4195cc5376e2dcf0f3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QGroupBox: Exclude top level widgets from child event handling.Friedemann Kleint2014-07-151-0/+19
| | | | | | | | | Prevent the QGroupBox from changing the enabled state of dialogs parented on it. Task-number: QTBUG-40132 Change-Id: I91cc6ccf5ade0b3a491020ed947d4aceca62d7b6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix current directory setting in manual dialog test.Friedemann Kleint2014-07-152-6/+12
| | | | | | | | | It was always constructing a QUrl from the string causing the warning "Non-native QFileDialog supports only local files" with the new QUrl-based implementations of getOpenFileUrl(), etc. Change-Id: Idd9bb432a48865df137f8f39f53014dda150ffe9 Reviewed-by: David Faure <david.faure@kdab.com>
* Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devShawn Rutledge2014-07-144-5/+39
|\
| * Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-144-5/+39
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_qpf2.cpp Change-Id: Ib04f92c41d0edd55d3aef8fb1708d917fba0f2a8
| | * Android: Prefer "Droid Serif" as default serif fontEskil Abrahamsen Blomfeldt2014-07-101-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I've also updated the qfont test so it passes on Android now. Note that there are no suitable cursive/fantasy fonts on Android, so the regular default "Roboto" (or "Droid Sans" on older devices) will be picked here instead. [ChangeLog][Android] Fixed font selection to prefer "Droid Serif" when Serif style hint is set on QFont. Change-Id: I294eebcc4d79410e435bdddce552acc6044753b2 Reviewed-by: Christian Stromme <christian.stromme@digia.com>
| | * Fix fallbacks for adapted common scriptEskil Abrahamsen Blomfeldt2014-07-103-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the platform plugin gives us specific fallbacks for a specific script, we need to respect this, and load the correct font family regardless of which writing systems it supports. This is especially important since the common script is adapted to match surrounding, proper scripts, so characters such as digits next to e.g. Hebrew text will be marked as Hebrew. On stock Android, there is a single Hebrew font, and this would previously be put in all fallback slots for Hebrew regardless of what fallback fonts were dictated by the platform plugin. Since this font does not support the digits, they would show up as boxes. [ChangeLog][Android] Fixed common characters like digits and punctuation showing as boxes when positioned next to non-latin scripts. Task-number: QTBUG-39377 Change-Id: I1555e208a8ddc587c0bbdbfff1600cafdd9442e9 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | | tst_qfiledialog: ease debugging of "directoryEntered not emitted".David Faure2014-07-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | It can happen when the sidebar only has only one item, due to "My Computer" being missing. Change-Id: I2b38fef45139f1dfa20d88059e56185c3163a833 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | tst_qfiledialog: extend reject-test to test getOpenFileNames etc.David Faure2014-07-141-2/+14
| | | | | | | | | | | | | | | | | | | | | So that this method is at least called once in the test :) Change-Id: I3b5fc6b7c464d9e56264c709cfa313d475004207 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | | Fix some compiler warnings in benchmark tests.Friedemann Kleint2014-07-144-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | main.cpp(332) : warning C4307: '*' : integral constant overflow tst_qpainter.cpp(1293) : warning C4305: '+=' : truncation from 'double' to 'float' tst_qpainter.cpp(1474) : warning C4305: '+=' : truncation from 'double' to 'float' tst_qtbench.cpp(155) : warning C4267: 'initializing' : conversion from 'size_t' to 'int', possible loss of data main.cpp(68) : warning C4189: 'fontHeight' : local variable is initialized but not referenced Change-Id: If6aadd50df7c5cf7d0f33791c9247730a47ddd27 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | | Stabilize tst_QMenu::statusTip().Friedemann Kleint2014-07-141-2/+12
|/ / | | | | | | | | | | | | | | Instantiate the timer on the stack to prevent it from interfering with other tests. Change-Id: I91ffe23b502fcddaeb6d6d3f89ea3d27b083cdb0 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* | Speedup qDebug() << QDate(...)Jędrzej Nowacki2014-07-141-0/+9
| | | | | | | | | | | | | | We really do not need to do string parsing there. Change-Id: Ie2277d9ff0d0445285b7108023941af111d9baca Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Logging: fix support for %{time format} in QT_MESSAGE_PATTERNOlivier Goffart2014-07-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | This revert commit de1d5815c15ba1f944752cf7d441442efeb0accb which wrongly fixed a typo. There is no typo because we use startsWith with that constant. Also added a test because the %{time} support was added in commit 93563952d00f865b73136f6a316ca2b8732db85f but the test was missing Change-Id: Ic96e6f21f989ca3a2905ec6c89b93d2627b77b40 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | tst_qlogging: put the test for QT_MESSAGE_PATTERN in a data functionOlivier Goffart2014-07-131-94/+74
| | | | | | | | | | Change-Id: I9130b91dfe6bf1ee22431a423ec2d2f9ad62144a Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Revert "Session management for OS X"Olivier Goffart2014-07-131-5/+0
| | | | | | | | | | | | | | | | | | Broke tst_QMenu::statusTip by closing the menu while it should not. (and therefore, a QTimer::singleShot that fires while following test are running is making the test fail) This reverts commit 50c04d631858639c630e85456e7e003a80e33493. Change-Id: Ib4ef8190f945b915fe268745cc64d471994c5e2d Reviewed-by: Richard J. Moore <rich@kde.org>
* | Session management for OS XSamuel Gaist2014-07-101-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch aims to implement the session management available on OS X. Currently applicationShouldTerminate is just a go through that closes everything and ends the application. The new implementation calls first appCommitData and cancels the termination properly if required. This means that if a user wishes to logout, Qt applications can now cancel that like e.g. answering to Safari asking whether it is ok to close because of a number of opened tab/window. Task-number: QTBUG-33034 Change-Id: Icedc8590a1c0934d9bc87d3a43d6702a9903bfb8 Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
* | Introduce a new warning in moc, to notify about duplicated propertiesAleix Pol2014-07-101-0/+8
| | | | | | | | | | | | | | | | | | | | At the moment, it's possible to have 2 properties with the same name, which doesn't make much sense. Notify the user about that so she can react on it. Change-Id: I4865b71730921b79ce9dd8abb0cc760b3f1dbfd8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | Improve QString::arg testJędrzej Nowacki2014-07-101-0/+6
| | | | | | | | | | | | | | The function gives a warning if an argument doesn't exist. Change-Id: I6a4bbbaf2fd241ced06dc71edfe4ef69732606d1 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
* | Update QVariant testsJędrzej Nowacki2014-07-104-39/+6
| | | | | | | | | | | | | | | | Remove old message handler hack as we have a new and better api to ignore warning messages. Change-Id: Id967b2672fe3e3638db9977500118a19c2afb730 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-07-105-6/+117
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-105-6/+117
| |\| | | | | | | | | | Change-Id: Ia12ffdb27ecdf25c2a2bdb0eed1945387502108a
| | * QSslCertificate: blacklist NIC certificates from IndiaPeter Hartmann2014-07-093-0/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Those intermediate certificates were used to issue "unauthorized" certificates according to http://googleonlinesecurity.blogspot.de/2014/07/maintaining-digital-certificate-security.html , and are by default trusted on Windows, so to be safe we blacklist them here. Change-Id: I9891c5bee2dd82c22eb0f45e9b04abd25efeb596 Reviewed-by: Richard J. Moore <rich@kde.org>
| | * tst_qdir: Move QFINDTESTDATA() from init() to constructor.Friedemann Kleint2014-07-091-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check result in initTestData(). Previously, QFINDTESTDATA() was repeatedly invoked in init(). The data-driven cd() test then failed when invoked stand-alone since cd_data(), which relies on the data path, is executed before init(). Task-number: QTBUG-40067 Change-Id: I91039247e8dcaedd92fa990f1b5f82bc54b17c60 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
| | * REG: Fix nbsp in QTextLayoutEskil Abrahamsen Blomfeldt2014-07-081-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point since Qt 4.8, the nbsp character has acquired the whitespace attribute, causing it to be treated exactly like an ordinary space. To account for this, we add an extra check in the layout code to avoid breaking on non-breaking spaces even if they have the whiteSpace flag set. This is a temporary fix for the regression. The line breaking algorithm needs to be refactored and support Unicode tr14 properly, which it currently doesn't. [ChangeLog][Text] Fixed lines breaking on non-breaking spaces. Task-number: QTBUG-39832 Change-Id: Ibd7e1a11ce4b82c611ecda1542c8638a67bf3cae Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | | Add QDebug::noquote() stream modifierKai Koehne2014-07-101-3/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the user to disable the quoting of QString, QByteArray, QStringLiteral by passing a "noquote()" stream modifier. This requires another flag to be added to QDebug::Stream. To keep BC we're using the QMessageLogContext::version field to differentiate between QDebug streams created by earlier versions. Task-number: QTBUG-37146 Change-Id: I9b215eabfcfd754af16ea87f3ef928d698e37d77 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | MSVC: Fix the compilation of benchmark tests with strict string literals.Friedemann Kleint2014-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Introduced by 9f0e5d00ab51cc7c0dc87c8d72f48c4e6edaf120 . Change-Id: I704501bd7e543d971f9b8c9e75746b5749126c5f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@digia.com>
* | | Added autoHide property to QTabBarIvan Komissarov2014-07-101-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | This property is used to automatically hide tab bar if it has only one tab. Originally-by: Denis Kovalskiy <denimnumber1@gmail.com> Change-Id: I6967f760010fa55bad6a5986c29abe7ccf625cf8 Reviewed-by: David Faure <david.faure@kdab.com>
* | | Check for boost header in sysrootRainer Keller2014-07-101-1/+1
|/ / | | | | | | | | | | | | | | The check has to detect if boost header is present in the system we are building for. Change-Id: I700a11df208c8852ba094d8bff387ad21fa309b2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Reduce repetitive invocations of QFINDTESTDATA.Friedemann Kleint2014-07-109-129/+150
| | | | | | | | | | | | | | | | | | Store the file names in variables instead. Task-number: QTBUG-38890 Change-Id: I65f28bb62674f14aa099e935a9d7a4e9e6e90ba9 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Fix compilation of the manual dialog test with Qt 4.Friedemann Kleint2014-07-081-5/+7
| | | | | | | | | | | | Task-number: QTBUG-27186 Change-Id: I959c060930ad8a3fa6606be6df0562a96a18eac7 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* | Compile fix for configuration without SSL supportMaurice Kalinowski2014-07-071-0/+2
| | | | | | | | | | Change-Id: Ic0f7e2bfd1b5535d4a460a88a9152a5319ed00f6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Add context adoption support for WGLLaszlo Agocs2014-07-071-0/+63
| | | | | | | | | | | | | | | | | | | | | | This is trickier than the GLX and EGL implementations due to the way pixel formats, windows and contexts work. Apart from some restrictions, it should be fully functional nonetheless. Add also some proper documentation. Change-Id: Ia6e3eb1ab2701e439b8621b9092c2b0934ff2151 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | QObject: don't hold mutex when copying arguments in a QueuedConnectionOlivier Goffart2014-07-072-21/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | QMetaType::create can call user code and we should not keep mutex held as this may cause dead lock. Make sure the tst_qobjectrace actually emit some signal so the test check there is no race if the receiver object is destroyed while the mutex is unlocked. Task-number: QTBUG-39990 Change-Id: I56ca1ae7a11cd7b33c1a68727370972862e11c2f Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Make QTextStream use group separators in floating-point numbersThiago Macieira2014-07-051-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | Like for integers, this is activated only on QLocales other than C. [ChangeLog][QtCore][QTextStream] QTextStream now uses group separators when writing floating-point numbers when the locale is not the C locale. The old behavior can be restored by setting QLocale::OmitGroupSeparator on the locale. Change-Id: Ie451b91017746c3a9b11b6211b2ddd09cd295cd2 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* | Make QOpenGLTextureCache::bindTexture upload efficientlyAllan Sandfeld Jensen2014-07-041-5/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently QOpenGLTextureCache::bindTexture always convert any uploaded image to RGBA8888 before uploading. This is quite inefficient when OpenGL natively supports uploading formats in the original format. This patch adds support for uploading a few native QImage formats. This also get the performance of QOpenGLTextureCache::bindTexture on par with QGLContext::bindTexture. The texture brush used by QOpenGLPaintEngine is also converted to QImage, since bindTexture will convert it to QImage anyway, and going over QPixmap may cause an unnecessary conversion. [ChangeLog][QtGui][QOpenGLTextureCache] Support uploading common QImage formats directly to OpenGL when supported. Change-Id: I828a763126441a98e4547c32ef52dddf7c129a32 Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | Merge "Merge remote-tracking branch 'origin/5.3' into dev" into refs/staging/devFrederik Gladhorn2014-07-047-94/+134
|\ \
| * | Merge remote-tracking branch 'origin/5.3' into devFrederik Gladhorn2014-07-037-94/+134
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/accessible/qaccessiblecache_mac.mm src/gui/accessible/qaccessiblecache_p.h src/plugins/platforms/cocoa/qcocoaaccessibilityelement.h src/plugins/platforms/cocoa/qcocoawindow.h src/plugins/platforms/cocoa/qcocoawindow.mm src/widgets/kernel/qwidget_qpa.cpp Manually moved change in qwidget_qpa.cpp to qwidget.cpp (cd07830e3b27da7e96a0a83f91ba08c168b45e62) Change-Id: Ia51f471f9b53de2f3b07d77ea89db9303ac8961d
| | * Make tst_QLocale::macDefaultLocale() more robustMorten Johan Sørvig2014-07-021-28/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The assumption that we can test "en_US" and expect it to behave a certain way is flawed in that most of the formatting settings are independently configurable by the end user. Make the test more robust while attempting to preserve as much testing as possible: Make the decimalPoint/groupSeparator tests check for a range of possible values. Check that they are not the same. Remove the date formatting tests and the firstDayOfWeek() == Sunday test. Make the time zone test accept a non zero extended time zone. ("GMT+2" in addition to "GMT+02".) Change-Id: Ie1f89793eb785f526c5f6fafbb6726ef8c6cb016 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
| | * Fix some tst_qwidget test casesBernd Weimer2014-07-021-62/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed qwidget test cases for platforms that show windows full screen by default and that don't support WindowMasks. Incorporated QNX/BlackBerry peculiarities. Change-Id: I349ecab5cef35c7d9751aa547465f685d620164a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
| | * Skip unstable autotests in QtBase.Morten Johan Sørvig2014-07-024-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The combination of these unstable tests makes it very hard to get changes through the CI system due to the unrelated test failures. Skip the following test functions: tst_QIODevice::unget QTBUG-39983 (Mac) tst_QThreadPool:expiryTimeoutRace QTBUG-3786 (Windows) tst_QLocalSocket::processConnection QTBUG-39986 (Mac) tst_QTcpServer::adressReusable QTBUG-39985 (Linux) Change-Id: I96559bea0d437fd25966b6ccac1ece1490e06241 Reviewed-by: David Faure <david.faure@kdab.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
| | * qDebug: fix data race in qt_message_printDavid Faure2014-07-011-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The setting of (static) messageHandler to qDefaultMessageHandler if null was happening in multiple threads simultaneously, so it needs synchronization. Used an atomic pointer in case qInstallMessageHandler is called from a thread, but more importantly, initialized the static vars right away. Improve auto test to ensure that qInstallMessageHandler(0) still sets the default message handler. Change-Id: I70335af38c1d28a1cdba1df8a79c6006f227422e Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | | QImage support for RGB30 formatsAllan Sandfeld Jensen2014-07-042-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds basic support for 10-bit per color channel formats to QImage and the XCB plugin. This will make it possible to paint to and from these formats, but only at 8-bit per color channel accuracy. This also fixes Qt5 applications on X11 with native 30bit depth. [ChangeLog][QtGui][QImage] Added support for 10-bit per color channel image formats. Task-number: QTBUG-25998 Change-Id: I93ccd3c74bfbb0bd94b352476e5fe58a94119e1f Reviewed-by: Gunnar Sletta <gunnar.sletta@jollamobile.com>
* | | Update copyright to 2014 for accessibilityFrederik Gladhorn2014-07-042-2/+2
| | | | | | | | | | | | | | | Change-Id: I4210456122bf8a6d3730f017f3ce6dd1a1bcb3f5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>