aboutsummaryrefslogtreecommitdiffstats
path: root/share
Commit message (Collapse)AuthorAgeFilesLines
* Revert "QmlDesigner: bug fix for components"v2.3.1Eike Ziller2011-09-211-1/+1
| | | | | | | Fix wasn't fixing anything, the slash is not in libraryPath but in the string that is appended to it. This reverts commit 95009e0a414db61f5f6e1b2bf5f7048d35907f49.
* QmlDesigner: bug fix for componentsThomas Hartmann2011-09-191-1/+1
| | | | | | | | | | QLibraryInfo::location(QLibraryInfo::ImportsPath) might miss the '/' at the end. Change-Id: I552cef7efce7644fad82247850d8853c72edd0ea Reviewed-on: http://codereview.qt-project.org/5150 Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Updated Russian translationSergey Belyashov2011-09-141-49/+58
| | | | | | | Merge-request: 384 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I73077a68f3c674f32198a71eeafc60115f2465cc
* QtQuickApp: Fix qmake dependency to Qt Quick Components for SymbianKai Koehne2011-09-121-1/+1
| | | | | | | | | | | | The .prf to add the dependency is called qt-components.prf . This broke building a SmartInstaller package. Task-number: QTCREATORBUG-6075 Change-Id: I816eac60ab15f40ffc9d3c866f0bf695bfa0983e Reviewed-on: http://codereview.qt-project.org/4641 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Paweł Polański <jaggernod@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* QtQuickApp: Use QCoreApplication::applicationDirPath also for HarmattanKai Koehne2011-09-121-5/+1
| | | | | | | | | | | Latest Harmattan sources deprecate MDeclarativeCache::applicationDirPath http://meego.gitorious.org/meegotouch/meegotouch-applauncherd/commit/1c93b10b0aa6fa528d1a49e029a7158b4e2cea8d/diffs Change-Id: I4342c567265d192a580d572c6bec8d28ab363120 Reviewed-on: http://codereview.qt-project.org/4275 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Update japanese translation for 2.3.axasia2011-09-051-1/+100
| | | | | | | Merge-request: 376 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I611a10a7d3c5bd8cdc15d5924e182531befcff1f
* chinese translation fixesBeaver Xu2011-09-051-66/+67
| | | | | | | Merge-request: 375 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Ibbf38354f2d687e9991d0bc522574df4de5bd387
* Updated Russian translationSergey Belyashov2011-09-051-8/+44
| | | | | | | Merge-request: 2203 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I3adad8041ebcefb4802b0b010cfc938bcbd50e71
* QtQuickApp: Tweak template to enable Meego boosterKai Koehne2011-09-015-30/+88
| | | | | | | | | | | | | | | | | | Add support for the meego booster. This requires - Telling qmake to link to right libraries - Exporting main method - using QApplication, QDeclarativeView objects from cache - avoiding QCoreApplication::applicationDirPath() To keep compatibility, QmlApplicationViewer is still derived from QDeclarativeView. However, if the app booster is used it merely acts as a proxy to the view from the cache. Change-Id: I83e285d9ca3c2cfd86d1711e1fb93c72589ba14d Reviewed-on: http://codereview.qt.nokia.com/3730 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Qt Quick App: Make sure showFullScreen is used for HarmattanKai Koehne2011-08-251-0/+2
| | | | | | | | | | | | Make sure that the MEEGO_EDITION_HARMATTAN define is actually picked up for harmattan (it's defined in qplatformdefs.h) Change-Id: I3a0710992b5fa3e081821a66e32ed4a73eb5dd6e Reviewed-on: http://codereview.qt.nokia.com/3595 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@nokia.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Added some of the missing translationsRobert Loehning2011-08-241-0/+95
| | | | | | | | | Task-number: QTCREATORBUG-5912 Change-Id: Ib0df4038e2bdafd2536d068964557575e1b14617 Reviewed-on: http://codereview.qt.nokia.com/3531 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixes and improvements in German translationRobert Loehning2011-08-241-21/+21
| | | | | | | | | Done-with: Thomas Murach Change-Id: Iac23c85c9b328943329918dd0a73958f04b958c4 Reviewed-on: http://codereview.qt.nokia.com/3530 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Show 'what's new in Qt Creator' as fallbackDaniel Molkentin2011-08-242-5/+12
| | | | | | | | | ...if the network connection to the servers containing the rss cannot be obtained. Change-Id: I39a5706221eaa68e97b4f0abb58bea46a364dce1 Reviewed-on: http://codereview.qt.nokia.com/3424 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* WelcomeScreen: Don't move ScrollBar beyond scroll area.Daniel Molkentin2011-08-241-2/+1
| | | | | | | Change-Id: I931256ced736c9d5514e50e7a2bd383d2e3fcfd0 Reviewed-on: http://codereview.qt.nokia.com/3398 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* WelcomeScreen: Re-add lost hover-state on tabsDaniel Molkentin2011-08-241-0/+4
| | | | | | | Change-Id: I373544cd1fc6ad3b1518571f0a4c36ea160e9600 Reviewed-on: http://codereview.qt.nokia.com/3340 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* WelcomeScreen: Make Show all checkbox more prominent by moving it to the left.Daniel Molkentin2011-08-241-14/+15
| | | | | | | Change-Id: I3d163abbe58e7588eaec3698757a2a1547219967 Reviewed-on: http://codereview.qt.nokia.com/3186 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* disable poor hungarian translationOswald Buddenhagen2011-08-221-1/+3
| | | | Change-Id: Ib7a4c7548024ac6a056f2d2e1baf4697f912f929
* QtQuick wizard: Use com.nokia.meego for Meego/Harmattan componentsKai Koehne2011-08-222-2/+2
| | | | | | | | | | | | This is the namespace also used in the documentation. On the device, the components are available both under com.meego and com.nokia.meego, but mixing these two in one application results in runtime errors. Task-number: QTCREATORBUG-5850 Change-Id: Ia5db9456c0dd1052042af5a8e8760a34d58b93ab Reviewed-on: http://codereview.qt.nokia.com/3296 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Complete japanese translation for 2.3.axasia2011-08-191-25217/+12875
| | | | | | | Merge-request: 371 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Ibe500957e4fdd5c34700662f2621bee733179507
* WelcomeScreen: Minimize height of delegatesDaniel Molkentin2011-08-181-13/+24
| | | | | | | | | | | | Calculate the image height based on the height of all text in the delegate. This ensures that the delegate does not grow in height out of proportion simply due to a large image. Change-Id: Iae3053a520ef29764ac9ee2553e68025b2ea7edd Reviewed-on: http://codereview.qt.nokia.com/3112 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* WelcomeScreen: Add new tutorial, adjust names of existingDaniel Molkentin2011-08-181-8/+12
| | | | | | | Change-Id: I867dad4e1e0b18298e44870239d4a975b737307d Reviewed-on: http://codereview.qt.nokia.com/3113 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
* French translations for 2.3.Pierre Rossi2011-08-171-1207/+8519
| | | | | | | | | | | | | | | This is the squashed result of work done by Thibaut Cuvelier and Jonathan Courtois from developpez.com and myself (barely). Full history is available on the team's repository: http://qt.gitorious.org/+developpez-dot-com/qt-creator/qt-creator-fr Change-Id: Ia9317f894f2df7096cc6a9c39093b417d0a2ba35 Merge-request: 370 Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com> Reviewed-on: http://codereview.qt.nokia.com/3056 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed updating of translations for external toolsSergey Belyashov2011-08-161-2/+2
| | | | | | | Merge-request: 368 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Ic7d33860b072d2a905cf28459e1da10e46d584db
* Updated Russian translationSergey Belyashov2011-08-161-18/+65
| | | | | | | Merge-request: 369 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I51d19c6bcb8c30128500af5d9f7c7afb3360a570
* Fix translation of external tools.Eike Ziller2011-08-152-1/+12
| | | | | | Change-Id: I21541c579f3be75537763ad65b63f6804c329e50 Reviewed-on: http://codereview.qt.nokia.com/2951 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed typo in French translationRobert Loehning2011-08-151-1/+1
| | | | | | | | | Task-number: QTCREATORBUG-5794 Change-Id: Iacb63b2069a6601a2350d358b985eed86f17f50d Reviewed-on: http://codereview.qt.nokia.com/2948 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Updated Russian translationSergey Belyashov2011-08-121-8/+8
| | | | | | | Merge-request: 359 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: Iea721437f2615acb8fec5dabca34b0922bf551ee
* Update chinese translation for 2.3Beaver Xu2011-08-121-1025/+8248
| | | | | | | Merge-request: 360 Reviewed-by: ossi Change-Id: Ia6e6303dabcda2bf3b7abc44fdfde2d359bb61a7
* Update japanese translations for 2.3.axasia2011-08-121-1563/+8955
| | | | | | | Merge-request: 361 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I384b845fd586a90a7209fc22c8a1f7d2170feac5
* Polish Polish translationJarek Kobus2011-08-051-27/+1
| | | | | | | Change-Id: I5c48cd5cc5fcb8298dabb4a612a3fbb35ae6f491 Reviewed-on: http://codereview.qt.nokia.com/2679 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* Make Components installable. Fix Shadow Build.Daniel Molkentin2011-08-0381-8680/+15
| | | | | | | | | | Task-Number: QTCREATORBUG-5672 Done-with: Oswald Buddenhagen Change-Id: I61f8a83205bc338ba12e43b7471eaa957da2b004 Reviewed-on: http://codereview.qt.nokia.com/2451 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Make session rows half as big in height as pojects rows.Daniel Molkentin2011-08-031-1/+1
| | | | | | | Change-Id: I8c24d4e939d2701c10444bb2c37921a095fe636b Reviewed-on: http://codereview.qt.nokia.com/2523 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* QtQuickApp template: Don't enable qml debugging for every debug buildKai Koehne2011-08-021-1/+0
| | | | | | | | | | | | This can be confusing, since there is also the switch in the qmake step, which is on by default for debug builds too. However, if one disables it you expect that debugging has in fact been disabled. Change-Id: Ia15cf1e245311fd97dcbaef3533a077fc8da25d2 Reviewed-on: http://codereview.qt.nokia.com/2511 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com> Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
* QmlDesigner.propertyEditor: fix for Image (2)Thomas Hartmann2011-08-021-15/+0
| | | | | | | Task-Number: QTCREATORBUG-5699 Change-Id: I819e50a6dd3f1a78112bc29b7c4c44284d25f21a Reviewed-on: http://codereview.qt.nokia.com/2505 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: fix for ImageThomas Hartmann2011-08-021-35/+0
| | | | | | | Task-Number: QTCREATORBUG-5700 Change-Id: I8f3c5db7740aa4a18e09b9b7445362a5cfb33941 Reviewed-on: http://codereview.qt.nokia.com/2504 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: fix for border imageThomas Hartmann2011-08-021-35/+0
| | | | | | | | SourceSize is read only. Change-Id: If5fe2e25026098efde942bbc63948fd3e27f6545 Reviewed-on: http://codereview.qt.nokia.com/2506 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: crash fixThomas Hartmann2011-08-021-1/+5
| | | | | | | | We did not handle the case that a gradient is a binding. Change-Id: Ib6892420c6d5de7522cb2b051ff2b046ab781c14 Reviewed-on: http://codereview.qt.nokia.com/2503 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Update Polish translationsJarek Kobus2011-08-021-817/+817
| | | | | | | Change-Id: I949a1c40fe9555857a77066b966be2928c26f1ad Reviewed-on: http://codereview.qt.nokia.com/2502 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com>
* QmlDesigner.NodeInstances: Show binding in text if invalidMarco Bubke2011-08-021-1/+5
| | | | | | | | | | If a binding on a text property cannot be evaluated it will now will be show as #binding.text# Change-Id: Ib1d5f406724b262833215d30ec0966a75f9dc971 Reviewed-on: http://codereview.qt.nokia.com/2452 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Debugger[gdb]: Fix crash when stepping over QLocale initialization.Friedemann Kleint2011-08-011-0/+11
| | | | | | | | | | | Check the index before the array is accessed in the call item. Task-number: QTCREATORBUG-5576 Change-Id: I3f533ef76af42dad97c93087f2d434b58fdedd44 Reviewed-on: http://codereview.qt.nokia.com/2044 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: hjk <qthjk@ovi.com>
* L10n: German translation for 2.3.Friedemann Kleint2011-08-011-36/+199
| | | | | | Change-Id: I2a0ee7db27dba27d74a1d6a10a7e4ca7cb2d1282 Reviewed-on: http://codereview.qt.nokia.com/2428 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Provide qmlviewer in external tools menuKai Koehne2011-07-291-1/+2
| | | | | | | | | | Quite a few people have asked for previewing a .qml file in qmlviewer, independent of the current project format. Change-Id: I2d012282b035cbf977de1994b6c2ace31f3cdfd5 Reviewed-on: http://codereview.qt.nokia.com/2397 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* QmlDesigner.NodeInstances: Add version to puppetMarco Bubke2011-07-282-6/+19
| | | | | | | Change-Id: Id101295520418975a4f569f57709875d7213e9bf Reviewed-on: http://codereview.qt.nokia.com/2304 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Add a default dummy contextMarco Bubke2011-07-272-0/+34
| | | | | | | | | Task-number: QTCREATORBUG-5631 Change-Id: Id1ba102d6992b8a56b105c061be89677e13e9a8b Reviewed-on: http://codereview.qt.nokia.com/2300 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstances: Move context object to a context directoryMarco Bubke2011-07-272-5/+14
| | | | | | | | | | filename_contextdummy.qml -> context/filename.qml Task-number: QTCREATORBUG-5630 Change-Id: I76ae5432ff3052d17a3cec17d85b5cbb6d1ddc61 Reviewed-on: http://codereview.qt.nokia.com/2295 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.propertyEditor: layout fixThomas Hartmann2011-07-271-0/+3
| | | | | | | | | Adding an expanding widget to the layout Task-number: QTCREATORBUG-5567 Change-Id: I6b52804af2bc798559661620605e2f8922a79ff0 Reviewed-on: http://codereview.qt.nokia.com/2286 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstance: Update the screen object if the root item size changedMarco Bubke2011-07-272-0/+47
| | | | | | | Change-Id: Ifc06131f4a57a30ab9b20687372150b23c8416cb Reviewed-on: http://codereview.qt.nokia.com/2285 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* QmlDesigner.NodeInstance: Reset items if the aux size is invalidMarco Bubke2011-07-271-1/+5
| | | | | | | Change-Id: Ic5c8aa1a622b6e7d446bb1416038571b0b591f54 Reviewed-on: http://codereview.qt.nokia.com/2284 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* Fixed German translationRobert Loehning2011-07-261-1/+1
| | | | | | | Change-Id: I6ba537b28c8cdcf8dfdc3f194682170829605caa Reviewed-on: http://codereview.qt.nokia.com/2214 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* QmlJSLib: Fix linker errors with gcceKai Koehne2011-07-251-0/+5
| | | | | | | | | | | | usrt2_2.lib is passed to g++ before QmlJSDebugger.lib, which results in errors about __aeabi_atexit, __dso_handle being undefined. Work around this by explicitly adding usrt2_2.lib again after QmlJSDebugger.lib. Task-number: QTCREATORBUG-5556 Change-Id: Id9e1dc19a2ee54e59d92470a35ccfd4946b07dcc Reviewed-on: http://codereview.qt.nokia.com/2115 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>