summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Qt Designer: Add translation-attributes to string list properties.Friedemann Kleint2012-01-2010-88/+345
| | | | | | | | | | | | | - Add translation parameters to XML schema for ui. - Introduce PropertySheetStringListValue to property sheet, load & save code, add to property sheet and property editor. Task-number: QTBUG-8926 Task-number: QTBUG-20440 Change-Id: Ib5e9e2e9ba603bb68984a102e3c3fc8ff1cb4df0 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* lupdate: Handle translation-attributes of string list properties.Friedemann Kleint2012-01-201-13/+29
| | | | | | | | | | | | | Stringlists now have translation attributes that apply to all items. Initial-patch-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-8926 Task-number: QTBUG-20440 Change-Id: I230f3907631074df394238e30b3ed7a15adcca4b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Fixed compile.Rohan McGovern2012-01-202-4/+4
| | | | | | | | | | | QDir::convertSeparators -> QDir::toNativeSeparators convertSeparators was deprecated since Qt 4.2 (!) and recently was removed from Qt 5. Change-Id: I6a7dad582ed4270cfbd09defc94c73103bb2a9fe Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
* Remove the use of QT_MODULE()Gunnar Sletta2012-01-198-8/+0
| | | | | | Change-Id: I8b9f3c04b0089047c6583f986a2fb903cf7bf62d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
* Compile fix for accessibility.Friedemann Kleint2012-01-131-2/+0
| | | | | | Change-Id: Ib2e668441da3fa5ab176a2dea6b5b8f22dbfec5b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt Designer: Simplify property editor for translatable properties.Friedemann Kleint2012-01-116-275/+243
| | | | | | | | | | | | | | - Introduce sub-propertymanager for translatable properties inheriting PropertySheetTranslatableData. - Use common enumeration values for sub-propertymanager functions to make it easier to chain them. Task-number: QTBUG-8926 Task-number: QTBUG-20440 Change-Id: I8e99aa01fdca7e474a0ec83b7209a28a2a689bf9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update copyright year in Nokia copyright headers.Jason McDonald2012-01-112-2/+2
| | | | | | | | Update copyright headers from before 2011 Change-Id: I7d822c71326283db79fa392022baa09a3c22b331 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* sync.profile: introduce dependency on qtjsbackendRohan McGovern2012-01-101-0/+1
| | | | | | | | | | sync.profile needs to enumerate indirect dependencies too. qtdeclarative now depends on qtjsbackend; update sync.profile accordingly. Change-Id: Ia6ccda2cfb971b2cd58bd9e2d880c76a5603ad37 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Simon Hausmann <simon.hausmann@nokia.com>
* Replace Q_TYPENAME by typenameOlivier Goffart2012-01-094-13/+13
| | | | | | | | | Q_TYPENAME is being removed. Change-Id: I4b4b34dbf87e3f2f3a604d4370d1c0e55e1553c5 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Port assistant to QNetworkAccessManagerFriedemann Kleint2012-01-092-104/+95
| | | | | | Change-Id: Idd3f5ebbb6719861ee20d9cef2fc5d98c24360f3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt Designer: Simplify code for translatable properties.Friedemann Kleint2012-01-063-205/+108
| | | | | | | | | | | | | Introduce base class for PropertySheetStringValue, PropertySheetKeySequenceValue, which allows for removing redundant code to set/retrieve the translation parameters to/from the DOM classes. Task-number: QTBUG-8926 Task-number: QTBUG-20440 Change-Id: I5b65fff2bb27be82d04f96cf0d66652887b1c4b7 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-061098-1108/+1108
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Convert macros to functions.Stephen Kelly2012-01-022-12/+17
| | | | | | | Change-Id: I08104d1189ed7d7debcb9f5bd38e8862423ef2c3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Avoid using Trolltech logo in documentation.Jason McDonald2011-12-281-1/+5
| | | | | | Change-Id: Iafc6ec21069994599506562edfcd1c98a850c5f7 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Rename trolltech-logo.png.Jason McDonald2011-12-282-1/+1
| | | | | | | | This file contains a Qt logo, not a Trolltech logo. Change-Id: I67bdee76cb2e3e3ef762b98b729ec0babc668327 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Port to list(APPEND)Stephen Kelly2011-12-232-3/+3
| | | | | | | Change-Id: Ib0eeef10b68edb5a7edc07d400e1d11c1bb7ffc3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Port to MacroParseArguments.Stephen Kelly2011-12-212-36/+16
| | | | | | | Change-Id: I030eb6e1bcd99ec867ca4f5a97fcc3bc7002b6b2 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix CMake style.Stephen Kelly2011-12-212-197/+197
| | | | | | | Change-Id: I4ec793889a7f6564938203766737c957f2044a83 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Remove unused include.Stephen Kelly2011-12-191-2/+0
| | | | | | | Change-Id: I599b45ff8aaa17fb4a255b10b008fa6c0455c5d3 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alexander Neundorf <neundorf@kde.org> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* Fix compilation due to header changesSergio Ahumada2011-12-1810-13/+13
| | | | | | | | | | | | - Fix QtWidgets/QAbstractProxyModel => QtCore/QAbstractProxyModel - Fix QtWidgets/QItemSelection => QtCore/QItemSelection - Fix QtWidgets/QItemSelectionModel => QtCore/QItemSelectionModel - Fix QtWidgets/QSortFilterProxyModel => QtCore/QSortFilterProxyModel - Fix QtWidgets/QStringListModel => QtCore/QStringListModel Change-Id: Id410fb4c6ae89d32eac3242b9a8cbfb3442b0555 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
* Qt Designer/QtUiLoader: Remove support for QWorkspace.Friedemann Kleint2011-12-1513-219/+2
| | | | | | | Change-Id: Ic0ffb13c5d30528800c1beae85d5224e8f2f7104 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com> Reviewed-by: David Faure <david.faure@kdab.com>
* make $$join() implementation qmake-compliantOswald Buddenhagen2011-12-131-1/+1
| | | | | | | | | Task-number: QTCREATORBUG-6441 Change-Id: I1d18c81f76cda71654a85c23b7b53b4aae0d51c6 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 555e539760998fcff1e3117abc5080c4fee47275) Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Make sysrootify case-insensitive on windowsDaniel Teske2011-12-131-2/+8
| | | | | | | | | Task-Number: QTCREATORBUG-6419 Change-Id: If3ab035ee3a117744213d5e3db3ffa41f7283d53 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit e7c6b9dbbbba8224dd7abaa2b513bec66fbf3abf) Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Work around MinGW GCC version >=4.5 always_inline+dllexport bug.Ruben Van Boxem2011-12-131-1/+2
| | | | | | | | | | | Use regular inline instead of always_inline for MinGW GCC build. GCC 4.5 and later spit out an error on always_inline dllexport functions, which breaks the build for these versions of GCC (see bug 5938). Change-Id: I444380ff98071b4653a91d074494ace579b4a622 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 310b446a81dd927739e503b03389641f1aa13ab4) Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Removed dead assignmentsRobert Loehning2011-12-132-3/+2
| | | | | | | Change-Id: I1368cb534284016479211160cd8bf3cbc2f738e4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 75719f04ee2c41312c70fee2271796d05ea08c0e) Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* implement qt5 $$sort_depends() and $$resolve_depends()Oswald Buddenhagen2011-12-131-2/+55
| | | | | | | | | | | | Task-number: QTCREATORBUG-5289 Change-Id: I15e08005c13d12afd5791796d676b30c726fadc3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com> (cherry picked from commit 330e118424f67d7e9de764b2d1fb1dad8000974e) (cherry picked from commit 7cd17f3f41dfbcf6c7cb791dd4db890815f8468c) Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Qt Linguist: Fix crashesTakumi ASAKI2011-12-134-9/+19
| | | | | | | | | | | Fix crash when select translation after close and open file. This patches includes refactoring of b68b59f252930538cc124b31decc990ab57bea20 Merge-request: 1480 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 27c322e0f88fa0cccba8cf914655cacb5dae51de) Change-Id: I27c322e0f88fa0cccba8cf914655cacb5dae51de Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* Improve lupdateRoberto Raggi2011-12-1312-5118/+609
| | | | | | | | | | | | | | | | | Merge the QML and the Javascript front-ends. Also, change the way we process directives in QML/JS comments. The old code was processing all the directives before visiting the AST nodes. Unfortunately, this doesn't play nice with TRANSLATOR-like directives. Added support for translating extended Javascript files. That is, QML/JS extends Javascript with pragma directives (e.g. .pragma). We emulate the `real' QML engine and we simply remove the pragmas from the original source code. Change-Id: Ie2536b10199a587b97f41c5e0560acabae981807 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Avoid duplicating qtestlib usage text.Jason McDonald2011-12-131-16/+4
| | | | | | | | | | The valid qtestlib command-line options change over time. Refer to the documentation rather than creating an ongoing maintenance problem by duplicating the list of options. Change-Id: Id16b71e611f80b89c48b73490b816f5b908699d6 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Make it possible for CMake to find linguist and dbus tools.Stephen Kelly2011-12-1213-0/+574
| | | | | | | | | | This includes the BSD licenced CMake macros for invoking those tools. Change-Id: I57c2994af2220353a845b6622b89291de349008d Reviewed-by: Clinton Stimpson <clinton@elemtech.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Sanity-Review: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove TESTED_CLASS/TESTED_FILES comments from tests.Jason McDonald2011-12-062-7/+0
| | | | | | | | | | These comments were all empty. Appropriate naming of tests and appropriate placement of tests within the directory tree provide more reliable indicators of what is being tested. Change-Id: I00c7ec38e2febd68179952f683e579c82d3d79c9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Correct QtUiTools library suffix.Toby Tomkins2011-12-061-36/+15
| | | | | | | | | | | | The project file change cleans up the previous version and follows the coding style of the module. This fixes the suffix issue implicitly by correctly loading module configuration. Task-number: QTBUG-7169 Change-Id: If0a746ee3a61ba1a6b66f7d73f0470cdb9032064 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Pre-emptive changes to StringBuilder compile anomaly.Toby Tomkins2011-12-061-1/+2
| | | | | | | | | | | | The StringBuilder issue occured after making changes to the pro file. This change adds the use of QT_USE_QSTRINGBUILDER, however it does not compile correctly with the above change. Added QByteArray to explicitly define the dynamic name and return it back as char*. Change-Id: I23ec434deb52da2d7b27f3e7fb17ceba4aa36d4f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* lupdate: Allow trailing commas in QtScript/JS object literalsKent Hansen2011-12-065-512/+672
| | | | | | | | | | | | | | | As per ECMA-262 5th edition, section 11.1.5, trailing commas should be allowed in object literals. E.g. { foo: 10, } shouldn't cause a syntax error; the comma should simply be ignored. Task-number: QTBUG-22970 Change-Id: I3e730ad3001760475e5e40bb4a28a05b0baf5c7e Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* lupdate: Regenerate QtScript/JS parserKent Hansen2011-12-012-52/+67
| | | | | | | | | | | | The latest version of qlalr produces output that is different from the previous version, even if the grammar file didn't change. Also remove stale line from QtScript/JS grammar. (It had mistakenly been removed from the generated parser but not from the input file.) Change-Id: Icfc7d154230b5e908a9617c7c1a3cd607879bef9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
* Add correct namespace macros around Qt classes.Toby Tomkins2011-12-011-1/+3
| | | | | | | | | | | | | This change is required to support generation of correctly namespaced code that can be used by Qt binaries configured with the -qtnamespace option. Task-number: QTBUG-19579 Change-Id: I6f8db9e0c60a50b51a79c1c09ac6aa7e9ace07c0 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* fixed error generating wrong introspection string in header output fileRalf Habacker2011-11-291-1/+3
| | | | | | | | | | | When using dbus introspection files with CRLF encoding the CR is not handled and results into a CR code at a wrong location in the output file Bug 17634 Change-Id: If48a571a01ffe6d135f79872235341a06fb3a75f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Gracefully disable designer when QtCore sources aren't available.Rohan McGovern2011-11-241-0/+7
| | | | | | | | | | Designer directly includes some source code from the qtbase repository, so it can't be compiled against an installed Qt. Warn rather than fail in this case. Change-Id: I9b0395cabf13ad712cfbd4b2f661c873fa0b3b5f Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt Linguist: Fix crash after select 2nd translation in lengthvariantTakumi ASAKI2011-11-184-1/+12
| | | | | | | | | | | | | * MessageEditor keeps deleted editor as m_selectionHolder. QOjbect::destroyed() SIGNAL doesn't fit to fix this problem due to destruction order problem. Merge-request: 1466 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit b68b59f252930538cc124b31decc990ab57bea20) Change-Id: Ib68b59f252930538cc124b31decc990ab57bea20 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com>
* add -list-languages option to lupdateOswald Buddenhagen2011-11-093-0/+28
| | | | | | | | (cherry picked from commit 3b3788a25f58fc443a48672c8e852e1c8658ac4e) Change-Id: I4523cde9b12268790c32d4a129c962c3d48ed1b9 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* remove dead codeOswald Buddenhagen2011-11-091-7/+0
| | | | | | | | (cherry picked from commit a3e91910e6eed7f5523009eb0a5439f4019d16ed) Change-Id: I8b7cac5a65c9ee17f58562d1951496ede86c71a0 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Qt Designer: Fix static linking on Mac.Friedemann Kleint2011-11-091-2/+12
| | | | | | | | | | | | | | | Add a comment in shared.pri explaining the problem. See also e7762b60d519c9ae4b47f6c4ceece584408247ea (cherry picked from commit 74884dd3821b22453804cd726e8d10908f493adf) Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-22542 Change-Id: Id93bcc22f61825cb317c8e8f79d603589da3a10b Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* compileHarald Fernengel2011-11-041-1/+1
| | | | | | Change-Id: Ie0b7f1e38cdb0c81cd7b9c30738a503578b19302 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt Designer: Fix linking of QtQuick1 plugin on Windows.Friedemann Kleint2011-11-031-1/+1
| | | | | | Change-Id: I611aef8f621a4f26cbfdeab725fd4dec03def448 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Qt Designer: Remove QScript extension.Friedemann Kleint2011-10-2835-2068/+18
| | | | | | Change-Id: I351b1437442b65a96e07de6fa633e06f3953c128 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Designer: Fix warnings about assigned/unused variables.Friedemann Kleint2011-10-2714-33/+1
| | | | | | Change-Id: I99196befc6fe5578bc9a1813a9ec21c08c5c3b25 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Remove "Trolltech" from installation path.Jason McDonald2011-10-241-6/+6
| | | | | | | | | Note that this commit makes no attempt to fix the otherwise outdated test data. Change-Id: Idce7358175cdbdd7cbbc9d3094ae02efb2a1b768 Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com>
* Remove SkipMode parameter from QSKIP.Jason McDonald2011-10-241-1/+1
| | | | | | | | | | The SkipMode parameter has been removed from the API in qtbase, so it must be in all calls to QSKIP. Task-number: QTBUG-21851, QTBUG-21652 Change-Id: I7f4f5627242d942b02eb0e2b34bea7e4bcd08f7c Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Fixed compile; QDesktopServices -> QStandardPathsRohan McGovern2011-10-241-2/+2
| | | | | | | | Broken by qtbase dfa24768a3243eda68d91f573050bf23f96da2dd. Change-Id: Id5940e90ac4a0853a5bda99c9db95bc77d53dfe1 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QtTools: Remove qqmeegographicssystemhelper library.Friedemann Kleint2011-10-2016-1645/+0
| | | | | | | Acked-by: Samuel Rødal <samuel.rodal@nokia.com> Change-Id: Idf32af82727d81137c12d7d158d6fb792a720eb2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>