summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QRegExp: fix \i \I \c \C \p \P escape sequencesGiuseppe D'Angelo2012-03-012-13/+50
| | | | | | | | | | | | | | Those escape sequences have a special meaning in the XML Schema 1.1 regular expressions, but not in Perl-compatible ones. An escape sequence that has no special meaning should match the escaped character itself; this patch fixes QRegExp's behaviour in that regard (previously, it added a character class matching nothing). Change-Id: I983f923baa7c2ec19938b96353f3a205e6c06d58 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* SHA-2 code does not compile on FreeBSDHolger Hans Peter Freyther2012-03-011-0/+9
| | | | | | | | | | | | | The code fails to compile with the below error: qcryptographichash.cpp:55: error: conflicting declaration 'typedef quint64 uint64_t' /usr/include/sys/types.h:99: error: 'uint64_t' has a previous declaration as 'typedef __uint64_t uint64_t' FreeBSDs types.h defines the used defines. Maybe it would be less ugly to switch the code to quint*, or use a define to do so, or to have basic os detection for stdint.h, not to include sys/types.h. Change-Id: Ic62ae4b742c1123b4b7e17158d216374e609f59f Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Add support for XCode 4 into qmakeAndy Shaw2012-03-012-73/+172
| | | | | | | | | | | | This adds support for XCode 4 into qmake and also indirectly fixes a couple of problems that are relevant for XCode 3.2 too Task-number: QTBUG-17247 Change-Id: I722470ad1854bd740cbbd28ff4956057a0e1906b Reviewed-by: David Forstenlechner <dforsten@gmail.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com> (cherry picked from commit b5871311457ca97816c0abbb8b935570bbfb657c) Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Windows - fix getsockopt calls for narrower than int optionsShane Kearns2012-03-012-5/+43
| | | | | | | | | | | | | | | | | | | | | | Windows unhelpfully writes to only one byte of the output buffer when getsockopt is called for a boolean option. Therefore we have to zero initialise the int rather than initialising to -1 as was done before. This in general only works for little endian architecture, because the word would look like 0x01000000 on big endian. So I have added some compile time asserts in the assumption that windows is always little endian. This is ok for comparisons with 0/false, but not comparisons with true or nonzero values. In the case of IPV6_V6ONLY, it is documented as DWORD (unsigned int) but on some windows versions it is returned as a boolean triggering the warning. I removed the warning, as the conversion to int works on both LE and BE since it is only compared with zero. Task-number: QTBUG-23488 Change-Id: I3c586d1ada76465fc045a82661f289920c657a4c Reviewed-by: Richard J. Moore <rich@kde.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
* Remove qhash_faster.Robin Burchell2012-02-293-73/+0
| | | | | | | | It's not faster under _any_ metric than the new algorithm, and it loses a lot of spread which is a bad thing. Change-Id: Ic87258f1c887822ffea1cb1517355564fabc3c26 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Copy Qt 4's QString hash algorithm.Robin Burchell2012-02-293-4/+32
| | | | | | | | | | We must do this the same way we do all other hash algorithms for fair comparison, as otherwise, the call to the PLT unfairly penalises QHash<QString>'s results, as it's in a different shared object. Change-Id: I69c891f5a97dcccdfcfbdbf32796f86242a42963 Reviewed-by: João Abecasis <joao.abecasis@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Move data generation to initTestCase() method and store the results.Robin Burchell2012-02-291-72/+58
| | | | | | | | | Per the comments on Ie4100a1ca4dbe7bf1cd73de883a9854377ac2f5e, having Q_ASSERT was not a good idea, and data functions can't really handle QVERIFY/QCOMPARE/etc, so do this in initTestCase instead. Change-Id: I19e61dec7fe415bb1fa0f53a2920d99b8c7c8ea7 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Add test data for string forms of numbers.Robin Burchell2012-02-291-0/+12
| | | | | | | Similar to the UUID benchmark, but won't have any non-numerical characters. Change-Id: I7487c97cab96fd53c180fe12061e7be3ca96e883 Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Add a test using lots of similar strings.Robin Burchell2012-02-291-0/+36
| | | | | | | | This attempts to emulate a dictionary usecase of sorts, done in code to avoid bloating the git repository by adding an actual word list. Change-Id: I878bc4af8877ba780ee699932f240c0d9c8ff12c Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
* Don't use deprecated QWheelEvent::delta()Morten Johan Sorvig2012-02-291-1/+3
| | | | | | | Replace with pixelDelta() and angleDelta(). Change-Id: Ie4b8b6fd39a5f8a28433554000940faef2f2542c Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove Mac qDebug ifdefs.Morten Johan Sorvig2012-02-292-34/+0
| | | | | | | Make qDebug work again with the new logging framework. Change-Id: Ib88a83182429636b274d6284933d5ea00db7279c Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Refactor the QPA dnd interface.Friedemann Kleint2012-02-2925-1070/+1154
| | | | | | | | | | | | | | | - Give QPlatformDrag a synchronous drag() function returning the Qt::DropAction - Move the base functionality for asynchronous event handling to the platformsupport library as QBasicDrag (extendable base class handling drag icon and providing new virtuals) and QSimpleDrag (sample implementation for drag within the Qt application). - Change the Windows implementation accordingly. - Change XCB to be based on QBasicDrag. - Clean up QDragManager. Change-Id: I654f76f0e55a385ba189bd74f3ceaded6a8fe318 Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* QFileSystemModel autotest fixesMiikka Heikkinen2012-02-292-59/+33
| | | | | | | | | | | | | For some reason, hiding files via executing "attrib +h filename" process didn't work realiably, so changed the file hiding to be done via Windows native API. Also changed the test to use QTemporaryDir to simplify temporary directory handling a bit. Task-number: QTBUG-24291 Change-Id: I4f02b16e2f9105bcf5e6c5bf136f55434a26e2f4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* network cookies: check "example.com" != "example.com."Shane Kearns2012-02-291-0/+12
| | | | | | | | Only test code change, we already have the correct behaviour Task-number: QTBUG-20001 Change-Id: I2296f405f47f9c8d15796e69f9d1854063e38d6a Reviewed-by: Richard J. Moore <rich@kde.org>
* Fix the include dir used by the CMake config files.Stephen Kelly2012-02-291-1/+1
| | | | | | | I missed this one in 018e78575c6f7f5a90b41274468a26b09b909443 Change-Id: I194b96d2b1a64025ddb17fe2ed81566838555e13 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove internal class QVolatileImage.Laszlo Agocs2012-02-298-802/+1
| | | | | | | | | | | | | | This made sense only for Symbian where there was a special CFbsBitmap-based backend present and it was used from the Symbian-specific VG and GL pixmap implementations. The generic version is merely a useless wrapper over QImage and is not in use anywhere in the codebase. Change-Id: I1dabe22dfb8cbbc35dce8e22703a3aff810fb5f9 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix a double-release when loading NIB filesJamie Kirkpatrick2012-02-291-1/+0
| | | | | Change-Id: I0c2c2a932b433a84e136da8e262739951a1d8c6e Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Make QJsonPrivate::String compile on big endian platforms.Jason Barron2012-02-291-1/+2
| | | | | | | Was missing a variable declaration and an explicit cast. Change-Id: I4f0fb9c3d9b8472adf0d91036442adc1fe255c7e Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix tests of QMimeDatabase.Friedemann Kleint2012-02-297-65/+121
| | | | | | | | | | | | | | | - Use temporary directories to avoid instabilities due to remains of previous failed tests and locked directories. - Replace SRCDIR by QFINDTESTDATA(), reference only the freedesktop.org.xml contained in the Qt source tree by $$QT.corelib.sources. - Improve some error messages, test suite instructions for Windows. Change-Id: Idee8e3767ef0a8299df3bdaaac20334164878db0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: David Faure <faure@kde.org>
* QPlatformTheme: Add virtual destructor.Morten Johan Sorvig2012-02-292-0/+7
| | | | | Change-Id: I78aab57cc16ef4542bfb88c81dd6a9d8b4c4d853 Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Skip test tst_QTextScriptEngine::thaiWithZWJ on Windows.Friedemann Kleint2012-02-291-0/+3
| | | | | | Change-Id: I9286ae8b1200b2d6638d1257a872450a9886fce0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
* Fix build of QImageReader tests with QT_USE_QSTRINGBUILDER.Stephen Kelly2012-02-291-1/+1
| | | | | Change-Id: I789d99d0741bc178d2d7fd82558edc684eb6daf8 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Fix build of QWizard tests with QT_USE_QSTRINGBUILDERStephen Kelly2012-02-291-2/+2
| | | | | Change-Id: Id276cdb9b84c61bf75a5bde149142f39f52f563e Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Remove Mac/QPA collision breaking library linkageDonald Carr2012-02-291-2/+0
| | | | | | | | Prior to this change, explicitly passing -qpa to configure breaks compilation on Mac. This is due to a false dichotomy between MAC/QPA Change-Id: I52cacf96ae8d8d203787f9bbade417f2c55ab3f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
* Added helpful notice in configure about how to enable the xcb plugin.Samuel Rødal2012-02-291-0/+2
| | | | | | | This should make it less confusing for people building Qt 5 on Linux. Change-Id: I3aa7151f790587d5944c837d701b1b1b580b4bc3 Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
* Cleaned up examples/opengl/cube/cube.pro, removed message()Rohan McGovern2012-02-291-9/+0
| | | | | | | | | It's arbitrary and confusing to put a message(OpenGL support is enabled) in this one OpenGL example and no others, especially since the message is output during configure. Change-Id: I7b55868d10c288f3459a7fda594fea1e6f45bf9a Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Remove unused selftest data file.Jason McDonald2012-02-292-7/+0
| | | | | | | | | The private git history shows that the test program associated with this data file was missing from the original commit and was never subsequently added. Change-Id: I3401724ac04168158a48eb06436db83d3557711f Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* QHeaderView - remove sectionCount variableThorbjørn Lund Martsum2012-02-292-69/+67
| | | | | | | | | | | | | A previous patch ensures that we have exactly one section in a Span. ( see SHA : b800d8b94a7861ecf8853621f6556fca186fb5b7 ) Therefore we no longer need the sectionCount variable. We have assess to it through the sectionSpan.count. To keep this patch quite simple the variable sectionCount has been changed to a function returning the count value. Change-Id: Ibc419eafa38ab64b08f93074cb6ae4b8518995f6 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Add support for QT_NO_SIGNALS_SLOTS_KEYWORDSStephen Kelly2012-02-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_NO_KEYWORDS can be used for example to ensure that foreach can not be used, but Q_FOREACH must be, that slots must not be used but Q_SLOTS must be, etc. Typically they are used to avoid symbol conflict with other libraries that may use the same keywords (I think boost uses signals). For 3rd party libraries, it makes sense to use Q_SLOTS and Q_SIGNALS instead of slots and signals, so that downstreams can still choose to use QT_NO_KEYWORDS in their code. The most convenient way to enforce that currently is to define QT_NO_KEYWORDS when building the 3rd party library. However, that has the inconvenient side effect of making foreach, forever and emit not usable within the library implementation. This patch makes it possible for the 3rd party library to use QT_NO_SIGNALS_SLOTS_KEYWORDS to exclude signals and slots without affecting whether the other keywords can be used in the library implementation. Change-Id: If1e16a4fa384bd3a2ddd737143499f8b587bc4f8 Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* QRingBuffer: make constructor explicitMarc Mutz2012-02-291-1/+1
| | | | | | | | | | | | | | This is a private class, but it's so close to the classical Stack(int) example for explicit that I just have to make this ctor explicit, too: QRingBuffer rb = 0; // oops: meant '*rb' now no longer compiles. Change-Id: I7d58c1f08c1b14d14930426159c5c8db71b4cf4d Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Activate replacements when installing .pc files for win32Hib Eris2012-02-291-7/+7
| | | | | Change-Id: Iaacbe8528bdbe1c1fca60ae8c94625e951f14554 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QPair: don't copy-initialise 'first'/'second' in the default ctorMarc Mutz2012-02-291-1/+1
| | | | | | | | Why would we want copy-initialisation if we can have the default constructor? Change-Id: Id2de36d42ef9f63793ff4e3ec36202d3f2bf5f30 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* De-duplicate platform-dependent pathsHib Eris2012-02-291-12/+8
| | | | | Change-Id: Ifee9f05fc8d924877f24edfddb0dc5e324a29080 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QPair: remove user-defined copy assignment operatorMarc Mutz2012-02-291-3/+1
| | | | | | | | | The compiler-generated copy assignment operator is fine, and the user-defined one prevents the compiler from synthesising a move assignment operator. Change-Id: I044104a2fd4d7522a910d5c2a68d11dabeca99c4 Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
* Implement missing replacements when installing .pc files for win32Hib Eris2012-02-293-1/+19
| | | | | | | | | | | | | | | | | | This implements replacements for win32 makefile generators similar to the replacement functionality in unix makefile generators. To enable Makefile code generation for replacements in win32 makefile generators, you must set QMAKE_STREAM_EDITOR to e.g. sed. When building for win32, sed is normally only available in the mingw/msys build environment and when cross compiling on unix. In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf. For other win32 build environments QMAKE_STREAM_EDITOR is not set in qmake.conf and the replacements Makefile code is not generated. Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't abuse $$fromfile() for inspecting entire projectsOswald Buddenhagen2012-02-292-4/+4
| | | | | | | | | | a project can rightfully expect a sane environment. $$fromfile() does not necessarily provide that. so instead use include() with a target namespace. Change-Id: I8d6d30ab1b760d4930c9b4453bc92f8f8ad0b0ae Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* look for mkspecs in the project root, not next to every projectOswald Buddenhagen2012-02-294-9/+36
| | | | | | | | | | | | | | | | | | qmake would look for mkspecs/ in the directory containing the current project file. this makes completely no sense with recursive projects: a) nobody would make per-project specs and b) specs meant to be global would not be found. consequently, we look for a project root when starting qmake and use only that directory. if .qmake.cache is found/set, we assume that to be the project root. otherwise, we search for mkspecs/ the same way we search for the cache - just to up until we find one or hit the root. if we are shadow-building, search the build dir as well. Change-Id: Ie66b189a40c21203d956e681cbef44a89f98cd17 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* factor out code to install default mkspecOswald Buddenhagen2012-02-292-17/+25
| | | | | | | Change-Id: I15f371df7bc24cd85c1c0924d1929da4dc3db16d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Add a new qmake feature to support OpenGL ES 1 appsJason Barron2012-02-281-0/+2
| | | | | | | | | | This is a convenience to make it easy for applications to simply add: CONFIG += opengles1 To their .pro file to link against OpenGL ES 1.1 instead of OpenGL ES V2 Change-Id: I48605f5f69f83d99cfb2ad6dbb4b318d41e00128 Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make the CMake files work with directory overrides.Stephen Kelly2012-02-284-19/+83
| | | | | | | | | | | | This allows us to create correct CMake config files when Qt is configured with directories outside of the prefix (which Qt allows), and also allows us to use correct values when a 'longer' relative lib directory is used such as lib/x86_64-linux-gnu. Change-Id: I6f88255a23752dc5b84cb20ce13fdeeee9d5ad51 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Compile SHA-2 code on systems without stdint.hBradley T. Hughes2012-02-282-3/+15
| | | | | | | | | | stdint.h is a C99-ism, which isn't available everywhere. The sha.h header tells us we need 4 typedefs. Add these to qcryptographichash.cpp before including sha.h and comment out the stdint.h include in sha.h. Change-Id: I1ede9569fa7eaa84de3befeb3c58cc6a05aa522c Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
* Skip QLocale test on Windows, improve process handling.Friedemann Kleint2012-02-283-34/+92
| | | | | | | | | | | | | - Skip the failing windowsDefaultLocale() test. - Improve the handling of the subprocess, locate the binary in initTestCase instead of repeatedly searching it. - Make all applications console/non-app bundles. Task-number: QTBUG-24543 Change-Id: I79dfaa3320cd5698f02e74a3fe53477d4a79d4fb Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Rename remaining references to QInputPanelPekka Vuorela2012-02-285-6/+6
| | | | | Change-Id: I747d37d10c78af6ad00322d5bd8d29c6b343828c Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Fix QLibrary autotest for WindowsMiikka Heikkinen2012-02-283-4/+17
| | | | | | | | | | | | The libraries were built into wrong directory in Windows. Fixed it so that the libraries are built into debug and release directories like the test executable. Also fixed QMAKE_CLEAN statement, which was using incorrect separator. Task-number: QTBUG-24151 Change-Id: Iade656af5f83ef2b79c2b9c4177df4a16b2f6821 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Initial import of the Blackberry QPA plugin for Qt5Sean Harmer2012-02-2832-0/+7553
| | | | | | | | | | | This is dependent upon the following Change Id's: I5ebcffb7153f4216d69921d4818051e6b3d14d8a Iec065f528f5edd848be580807a607488dc2e401f Change-Id: I234e3c4272d7474d8f8e20fc4fea20d95c829cb5 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
* simplify loop over modulesOswald Buddenhagen2012-02-281-1/+1
| | | | | | | | the earlier done topological sort already removes duplicates and only works with lower-cased names anyway, so we can remove the overhead here. Change-Id: I44fc39af9e94662717e1c8cfb0ddb87d2f597935 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* moc: Only generate IndexOfMethod for signals.Olivier Goffart2012-02-282-8/+13
| | | | | | | | | | | | | | | | | | | | moc is currently generating code to convert from a pointer to member function of a slot or signal to its index. The idea was that it could be usefull for slots to have the new syntax do the same as the old one (connecting signal index to slot index). But in practice, the new syntax do not use the IndexOfMethod for slots. Also, it does not work for all the slots (no Q_PRIVATE_SLOT, no static slots) So since it is not used, and that it would take room in the binaries to generate all the code to get the index of slots, we remove it. If ever we need it, we can still add it later. Change-Id: Ia417e3e524d7915ca86433ea86c66ac2b299c81a Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
* configure: fixed qconfig.h symlink warningsRohan McGovern2012-02-281-3/+3
| | | | | | | | | | | | | | configure was unconditionally attempting to create two symlinks to qconfig.h: include/Qt/qconfig.h, and include/QtCore/qconfig.h. include/Qt doesn't exist any more, so this would always cause a "No such file or directory" warning. Remove that one. include/QtCore/qconfig.h is usually created by syncqt now, so this would cause a "File exists" warning. Make that one conditional. Change-Id: I8c6244dcbcf9765444f0d5c40c91a0ca192ecbcb Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QDomNode: don't needlessly call virtual functionsMarc Mutz2012-02-281-5/+7
| | | | | | | | | | | | | | | | | | Commit 4dabe78387d10495f9f6d0a7395f2ba3c80432bd changed these functions from virtuals to inlines that check the return value of the remaining virtual function nodeType(). However, two of the functions call nodeType() more than once, which we know will return the same result each time, but requires a compiler with interprocedural optimization capabilities to figure out by itself. So instead of repeatedly calling nodeType(), call it once and store its return value in a temporary, and use the temp for further comparisions. Change-Id: Idbeafb7fd93d275d475218c6df2ad7fdc9162cc5 Reviewed-by: Richard J. Moore <rich@kde.org>
* Remove stale QWS considerations from configureDonald Carr2012-02-289-733/+24
| | | | | | | | | | | Remove all reference to QWS/EMBEDDED in configure script Remove legacy qws config tests Change-Id: I09ed3d82bdda0fd0f9da87634d0cd1b7457a782b Reviewed-by: Donald Carr <donald.carr@nokia.com> Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>