summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QSystemSemaphore: Clear error after successful operationKonstantin Ritt2013-11-285-2/+15
| | | | | | Change-Id: I5c1021b2329439e3aefaa1c0d9c0b8a298d285de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Streamline font match() function.Friedemann Kleint2013-11-281-10/+6
| | | | | | | Determine writing system before executing the loop. Change-Id: I6c462bdef4d70860e76c7cc9d939e3e92983b173 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Remove unused variable in font match() function.Friedemann Kleint2013-11-281-3/+0
| | | | | Change-Id: I0752901556a44c3b7fb4440e3ba0ca88559c1fe2 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* Move the glxfbconfig configtest to qpa and rename it to glxJorgen Lind2013-11-284-26/+38
| | | | | | | | | | We require glx version 1.3 which is where fbconfig is first defined. Also make use of the configure test and report the glx status. GLX support should always take precedence when compiling the xcb backend Change-Id: Ie46834210bf5cd2ac4006ff08379e0d3434ffa2b Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Add new configure parameter for Xcb-XlibAndrew Knight2013-11-282-11/+25
| | | | | | | | | | | | | This adds a new configuration parameter, xcb-xlib, which allows overriding the configure test for that existing configuration option. The use of xcb-xlib in the xcb platform plugin becomes the preferred path for non-OpenGL ES 2 builds, while the EGL codepath is used otherwise. This has the advantage that EGL can be used with Desktop OpenGL if Qt is configured with -no-xcb-xlib. Change-Id: I5018e31fe0399b94f020c671eff9414d00431c44 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Remove stale xcb_dri2 code in QXcbNativeInterfaceJorgen Lind2013-11-282-3/+1
| | | | | Change-Id: Ifc8dc8d84fc60b70f8a49282dfe32cd248bef9ba Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-11-2811-20/+25
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableSimon Hausmann2013-11-2811-20/+25
| |\ | | | | | | | | | Change-Id: I860404a1ef18c88a968a9eded405bb67967047b9
| | * CMake: Parse the output of new CMake versions.Stephen Kelly2013-11-271-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | As of CMake 3.0, the output of `cmake --version` now has a second line showing that it is maintained by Kitware. Change the version parsing to look only at the first line of output. Change-Id: I347de4c376e0bde25a43a38d59587d9b63f6b43a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
| | * Revert "Store the font's scalability in QFontEngine."Yoann Lopes2013-11-273-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65b12fbdb13d34c61bcadd5cc8fd6ee28a8dfafd. QFontEngine is not always loaded from QFontDatabase, resulting in the flag not being set. Change-Id: I39bc5bd4a8dea153d191cfc55f4324195f75f64c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * QNX: Fix retrieving the window group nameFrank Osterfeld2013-11-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The code assumes that there is a root window, and crashed otherwise. Task-number: QTBUG-35121 Change-Id: Idbf0e0bfc03cd427f0aab81db88b34fe94228c81 Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
| | * Remove leading '/' from target paths.Stephen Kelly2013-11-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is inappropriate on Windows, and breaks non-prefix builds there. This is only needed when we calculate a relative path from a sysroot, so only add it in that case. Task-number: QTBUG-34880 Change-Id: I0e3b3d977a7b56649e4ba0077ac574aabf1dc915 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
| | * CoreWLan: Fix potential unhandled exception assertGabriel de Dietrich2013-11-262-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -[QNSListener notificationHandler:] was declared as not taking any parameter, but used as taking a single NSNotification. This would lead to an 'unrecognized selector' exception raised by Cocoa. Task-number: QTBUG-26844 Change-Id: I56d03a7738c2a1b9dcf3cdecc696b01e65d7b233 Reviewed-by: Liang Qi <liang.qi@digia.com>
| | * Android: Remove invalid error messageEskil Abrahamsen Blomfeldt2013-11-261-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All usage of context menus prints out an error message because onContextMenuClosed() is called more than once. We just return silently instead if the method is called after the menu has already been closed. Change-Id: Ifa27ed42d188fdf670f09c4b1450b9fec0d5941f Reviewed-by: BogDan Vatra <bogdan@kde.org>
| | * Fix for co-existence of QtDeclarative and QtQmlSimon Hausmann2013-11-262-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a follow-up to commit 2f87fde9bb4bad6787101c0d135419b350b201a5, we also need to change "hack" in the QGraphicsItem and QWidget destructor for early item destruction to support the _qml1 variant of the QObject destroyed callback. Task-number: QTBUG-35006 Change-Id: I65e37b1e9ddd8d14267aaba024408611b8cd3d77 Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Fix font lookup.Friedemann Kleint2013-11-282-16/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change match() to return an index and use that to reintroduce the blacklist bookkeeping for fonts for which font engine creation fails (for example, due to missing open type support). Change the algorithm to retry search if that happens. Add empty string as fallback for non-common scripts indicating 'try to find any font matching the script' as is done in Qt 4. Task-number: QTBUG-34908 Change-Id: I9ac81ff1c275ebb635675dc26b52394789fca60c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Improve digitToCLocale sign char handlingSamuel Gaist2013-11-281-2/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds more char tests for the plus and minus signs to ensure that e.g. number input widgets can be used with the locale and the known sign chars. [ChangeLog][QtCore] Fixed a bug that caused negative number input using '-' to be rejected because the current locale uses e.g. 0x2212. QIntValidator and QDoubleValidator now accepts both signs as well as the locale minus sign. Task-number: QTBUG-35069 Change-Id: I857105ca38b1d3826e27eb64645fef07149d74bc Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Fix sub-second handling in SQLite driverTobias Koenig2013-11-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | Use explicit format string, that contains milliseconds, when converting an QDateTime/QTime to a SQLite field content. Task-number: QTBUG-24200 [ChangeLog][QtSql][QSQLITE] Fix sub-second handling Change-Id: Ib89152b7c3dd780b57a8826beff8b6b118e9d3d6 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Fix sub-second handling in MySQL driverTobias Koenig2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | As stated in http://dev.mysql.com/doc/refman/5.7/en/c-api-prepared-statement-data-structures.html the content of MYSQL_TIME.second_part field is supposed to be in microseconds not milliseconds. Task-number: QTBUG-31124 [ChangeLog][QtSql][QMYSQL] Fix sub-second handling Change-Id: I5718868029bdedab9508213e800d2dcf3da9be9a Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* | Fix problem with QNetworkAddressEntry returning a invalid netmask.Christian Strømme2013-11-271-6/+6
| | | | | | | | | | | | | | | | | | | | | | The ip address should be set before the netmask. The reason for this is that QNetworkAddressEntry::setNetmask() compares the protocol of the netmask and the ip, if they don't match the netmask won't be set. Task-number: QTBUG-33911 Change-Id: Ic344b3653c5dfdc5df912dee16e4dbe069d57d24 Reviewed-by: Peter Hartmann <phartmann@blackberry.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | tests: fix tst_QSettings on MacKurt Pattyn2013-11-271-25/+20
| | | | | | | | | | | | | | | | | | | | | | | | * Add a check for the case sensitivity of the file system, so that unit tests can determine whether names of preference files with different case should generate an error or not. * Add check for OS X native file format in rainersSyncBugOnMac(). Task-number: QTBUG-32655 Done-with: Liang Qi <liang.qi@digia.com> Change-Id: I76821653dd4ebc00e20abdbb5b79c1a80290dece Reviewed-by: Liang Qi <liang.qi@digia.com>
* | QPrinter - Make PDF support required for QPrinterJohn Layt2013-11-272-9/+1
| | | | | | | | | | | | | | | | | | | | Most of QPrinter assumes that QPdf is available as the fall back engine in case either the plugin fails to load or there are no real printers configured. Make this assumption explicit in the feature configure and remove the two places where QT_NO_PDF is actually checked. Change-Id: Ibb1bdf3bafa5809fbc844c84d7127911a1685506 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Return the xcb_screen_t and not the QPlatformScreenJorgen Lind2013-11-271-1/+1
| | | | | | | | | | | | | | | | | | from QXcbNativeInterface. The QPlatformScreen is available from QScreen::handle() Change-Id: If81daf34c07f4a49c85c43d3755d1a9167626d6d Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Fix directwrite font engine compileLouai Al-Khanji2013-11-271-1/+1
| | | | | | | | | | | | | | Add missing comma that prevented compilation. Change-Id: If771366adf3a31427c2beefa09c0206653f8ec84 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* | Allow resetting Qt::WindowFullscreenButtonHintZeno Albisser2013-11-271-10/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Currently Qt::WindowFulscreenButtonHint is only respected on window creation. But flags can also be adjusted later on. Further setWindowShadow can be removed from within createNSWindow, as it operates on a Nil object in that case. It is however called by recreateWindow / setWindowFlags subsequently. Change-Id: I507d6fde5ad2f0ee5b9db322325ede99b70e151e Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | Do not disable egl on desktop gl automaticallyAlbert Astals Cid2013-11-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | desktop opengl and egl are not incompatible with eachother, so there is no need to disable egl when on desktop opengl Task-number: QTBUG-34949 Change-Id: I757c38674a480910d1cb23853c255eb993e107ff Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andrew Knight <andrew.knight@digia.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | QCocoaFileDialogHelper: Cache directory until delegate has been createdGabriel de Dietrich2013-11-272-2/+5
| | | | | | | | | | | | | | | | Task-number: QTBUG-34393 Change-Id: Idee9e879e586afe25fd099d157ed7af88c17c4a3 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* | Fix coding style in QLabel example codehjk2013-11-271-8/+8
| | | | | | | | | | | | Change-Id: I13838c1759b14089ba9f4daf442048fb5c8da738 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* | Check the thread in QOffscreenSurfaceLaszlo Agocs2013-11-271-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | The QWindow-based fallback will not work when the QOffscreenSurface is created outside the main thread. Show a warning in this case. Note that it is fine to use the QOffscreenSurface instance in another thread. It is just the creation that must happen on the main thread. Change-Id: If80da39e610813755b9ba2f6831b187b258b8266 Reviewed-by: Yoann Lopes <yoann.lopes@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | windows: Set forward compatibility bit properlyLaszlo Agocs2013-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | The bit should be set when QSurfaceFormat::DeprecatedFunctions is _not_ specified. The documentation was correct, the implementation was not. Change-Id: If7202d3a59d5336fff255a290b65fb4bfa7b79c9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Fix test compilation on WinRTAndrew Knight2013-11-264-7/+14
| | | | | | | | | | | | | | | | Tweak a handful of tests which didn't compile on this platform. Change-Id: I208d9eb289dfb226746c6d0163c3ea752485033b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
* | QCoreApplication: Add static setter for application file path.Friedemann Kleint2013-11-262-21/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where QGuiApplication is instantiated by a library embedded into another application via some plugin mechanism (for example, Active X controls built using Qt), the QPA platform plugin and other plugins cannot be found next to the application executable. In this case, the library should set the application file path to its deployment location such that plugin paths are set accordingly, the directory is added to the path and qt.conf is found, should it exist. Task-number: QTBUG-34989 Change-Id: I4a53104b5121a8d26751129912f999228be45dfd Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* | QPrinterInfo - Fix isNull() by fixing constructorsJohn Layt2013-11-263-20/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The QPrinterInfo copy and QPrinter constructors and the assignment operator were not taking the shared_null into account, and so any use of them resulted in a new null QPrinterInfo different to shared_null, which lead to isNull() always returning true in anything other than the simplest use case. While fixing this also make the shared_null a Q_GLOBAL_STATIC. Task-number: QTBUG-21087 Change-Id: I0beb24088208e9ed58d21ca26b0c8d00b02e5b8f Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | QPrintDialog - Fix casting print engineJohn Layt2013-11-261-2/+2
| | | | | | | | | | | | | | We want to cast the print engine, not the paint engine. Change-Id: Ia8f11f0215fa066417118fbfbcc921a60282d713 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Windows: Close handle to thread checking for adopted threads.Friedemann Kleint2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-34840 [ChangeLog][QtCore][QThread][Windows][QTBUG-34840] Fix handle leak. Change-Id: I537c1c81a43907f01a81be740746582266969c6f Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | do not embed manifests into Qt plugins by defaultJoerg Bornemann2013-11-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For plugins that are built with a different (but binary compatible) MSVC runtime than Qt is built with, the plugin's embedded manifests prevent a successful loading of the plugin. There's no need for having the plugins tied to a certain CRT version as they are bound to Qt's CRT version. Task-number: QTBUG-1297 Change-Id: I6ae4cadd99ee4657e613b07a40141a7bae08424f Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Fix compiler warnings.Erik Verbruggen2013-11-261-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | As seen with Xcode 5.0.2. qmacclipboard.mm:108:30: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast] promiseKeeper(paste, (PasteboardItemID)promise.itemId, flavor, this); ^ qmacclipboard.mm:316:56: warning: cast to 'void *' from smaller integer type 'int' [-Wint-to-void-pointer-cast] PasteboardPutItemFlavor(paste, (PasteboardItemID)itemID, QCFString(flavor), 0, kPasteboardFlavorNoFlags); ^ Change-Id: I94b8ea2ff32d606d4cab28981b26c2ef516035dc Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-2675-528/+1807
|\| | | | | | | Change-Id: I83ff8f4d7dffd7385013a1bd8a1732a89ee20d56
| * Fix deadlock when disconnecting connections made with function pointersv5.2.0-rc1Olivier Goffart2013-11-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | The regression was introduced in 5885b8f775998c30d53f40b7f368c5f6364e6df4 QMetaObjectPrivate::disconnectHelper may unlock the sender mutex. And while relocking it, we need to make sure to lock the sender and receiver mutex in the right order. So don't lock the receiver mutex in advance, but re-lock it for each connection. Change-Id: I4f6d19791cdcce3693d7f45e7beb6b564fd69277 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix formatting in the platform-specific changes part of the ChangeLogThiago Macieira2013-11-261-11/+8
| | | | | | | | | | | | | | | | | | | | | | No need to have the "Qt for" part of the platform. This was used back in the Qt 4 days when we referred to "Qt for Embedded Linux" or "QtopiaCore" before that. This also fixes the duplicated "Windows" and "Qt for Windows" sections. Change-Id: Ia04172d0f322079f667b64a90c5f23d03588d0db Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Reflow the ChangeLog part for QtNetworkThiago Macieira2013-11-261-15/+11
| | | | | | | | | | | | | | | | Wrap to column 76, add a space before the dash and remove the line between entries with no sub-bullets. Change-Id: Ibba86161659ccad9fe98dd37a9eba57e807aa3ac Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Update ChangeLog for 5.2.0 [QtDBus]Thiago Macieira2013-11-261-0/+10
| | | | | | | | | | Change-Id: I8b58ea636eac2be4da967c18057c38990bc9178f Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * Fix a race that occurred as we unlock the mutex to destroy the functor in ↵Olivier Goffart2013-11-262-23/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ~QObject When we unlock the mutex, we need to take in account that the Connection pointed by 'node' may be destroyed in another thread while it is unlocked Doing 'node->prev = &node' will make sure that 'node' is actually updated when it is destroyed. Setting isSlotObject under the mutex is safer and ensure that no other thread will attempt to deref the object. The regression was introduced in 5885b8f775998c30d53f40b7f368c5f6364e6df4 tst_qobjectrace was updated to catch races arising when we are connecting with function pointers. Change-Id: Ia0d11ae8df563dad97eb86993a786b579b28cd03 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * iOS: Update statusbar visibility and screen properties before window geometryTor Arne Vestbø2013-11-252-8/+12
| | | | | | | | | | | | | | | | | | | | | | | | When setting a new window state. Otherwise we set the geometry based on the old screen properties, and then rely on the properties causing another window layout, which may not always happen. We also need to explicitly update the screen properties when the statusbar changes visibility, as there are no callbacks from iOS that consistently gives us that information. Change-Id: I1c3328aa3f34d294bc7db8884e611d205fd2c761 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * iOS: Prefer window states over geometry-heuristics when laying out windowsTor Arne Vestbø2013-11-251-2/+6
| | | | | | | | | | | | | | | | | | A window that was resized to the full screen size of the screen would otherwise always stay in full screen, even if the window state was maximized. Change-Id: I4720f7b6ad1d85658ea96c6da0515693e8c827f3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * iOS: Don't warn about QBackingStore::resize() != window.size() for widgetsTor Arne Vestbø2013-11-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | QtWidgets uses stale geometry data to do its backingstore resizes in a lot of places, eg QWidgetPrivate::setGeometry_sys() and show_sys(). As the resize doesn't have any effect for our GL backingstore anyways we can skip the warning to keep console noise down. Change-Id: Ie578f7faf35985708fddd0bfca4a7080820192c5 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| * iOS: Don't enable translucent statusbar for iOS6 on iPadsTor Arne Vestbø2013-11-251-2/+5
| | | | | | | | | | | | | | It's only available on iPhone/iPods. Change-Id: I61b45c84ddb2b3db46fff36286a6582406fa7d26 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| * Revert "Android: Use native platform menus."Eskil Abrahamsen Blomfeldt2013-11-251-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 98f0b4668999d677d8bf91d57ac095d96e7a661c. The native menu popup would never exit its event loop, because there's no listener for the closing of the menu. Since this is very last minute and the change is not ready, we revert it and use the widget menus instead. Change-Id: Ie9ae707300a265130a90d1ccb5f093f50cc0b2fb Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
| * iOS: close keyboard upon hitting key 'done'Richard Moe Gustavsen2013-11-251-1/+4
| | | | | | | | | | Change-Id: I0098cc4d51ca600ba48baa15ed9c16e56529b947 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
| * Update ChangeLog for 5.2.0 [QtCore]Thiago Macieira2013-11-251-3/+126
| | | | | | | | | | Change-Id: I2f6adc13d454825a2f444121a87dfd189e1c70f9 Reviewed-by: Lars Knoll <lars.knoll@digia.com>