OSDN Git Service

qt-creator-jp/qt-creator-jp.git
12 years agoDoc: add screen shot
Leena Miettinen [Wed, 14 Sep 2011 15:43:27 +0000 (17:43 +0200)]
Doc: add screen shot

Change-Id: I00b48066026929ef1773f8c231ee1c57e45f8f9e
Reviewed-on: http://codereview.qt-project.org/4925
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoUpdated Russian translation
Sergey Belyashov [Wed, 14 Sep 2011 15:38:47 +0000 (17:38 +0200)]
Updated Russian translation

Merge-request: 384
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I73077a68f3c674f32198a71eeafc60115f2465cc

12 years agoDoc: update Symbian information for Anna and Belle
Leena Miettinen [Wed, 14 Sep 2011 15:09:53 +0000 (17:09 +0200)]
Doc: update Symbian information for Anna and Belle

Change-Id: I7b59d10ceed278a98b6c7d3e99b87ca4986d8e20
Reviewed-on: http://codereview.qt-project.org/4921
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoDoc: update screen shot after Forum Nokia was renamed Nokia Developer
Leena Miettinen [Wed, 14 Sep 2011 15:09:20 +0000 (17:09 +0200)]
Doc: update screen shot after Forum Nokia was renamed Nokia Developer

Change-Id: I4c9e39c04e9773de2b239277e99ccbdd8be5e6e6
Reviewed-on: http://codereview.qt-project.org/4920
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoDoc: separate MeeGo and Maemo instructions
Leena Miettinen [Wed, 14 Sep 2011 14:36:18 +0000 (16:36 +0200)]
Doc: separate MeeGo and Maemo instructions

Change-Id: I2c7a9bce7ee92c59f91fa41f732f3c90a9e100e3
Reviewed-on: http://codereview.qt-project.org/4886
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
12 years agodon't try to strip the wrapper script
Oswald Buddenhagen [Tue, 13 Sep 2011 14:26:07 +0000 (16:26 +0200)]
don't try to strip the wrapper script

yet another hack

Change-Id: Ic041e8bdfb7331d6934620c8fbb91435f3495ba7
Reviewed-on: http://codereview.qt-project.org/4790
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
12 years agoQML Debugging: Fix crash for QML-only debugging on Symbian
Kai Koehne [Mon, 12 Sep 2011 14:59:21 +0000 (16:59 +0200)]
QML Debugging: Fix crash for QML-only debugging on Symbian

Task-number: QTCREATORBUG-6037

Change-Id: I01080d97d21c230a7a32ea943435b2f763b87c41
Reviewed-on: http://codereview.qt-project.org/4687
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
12 years agoQtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian
Kai Koehne [Mon, 12 Sep 2011 08:06:27 +0000 (10:06 +0200)]
QtQuickApp: Fix qmake dependency to Qt Quick Components for Symbian

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>
12 years agoQmlDesigner.contextMenu: crash fix
Thomas Hartmann [Mon, 12 Sep 2011 08:21:53 +0000 (10:21 +0200)]
QmlDesigner.contextMenu: crash fix

Task-number: QTCREATORBUG-6071
Change-Id: Iae2cc199cd8ec3809bc635084b8a8fa79bb36b08
Reviewed-on: http://codereview.qt-project.org/4643
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoQtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan
Kai Koehne [Tue, 6 Sep 2011 14:57:11 +0000 (16:57 +0200)]
QtQuickApp: Use QCoreApplication::applicationDirPath also for Harmattan

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>
12 years agoCode assist: Fix memory leak in completion
Leandro Melo [Wed, 7 Sep 2011 12:02:31 +0000 (14:02 +0200)]
Code assist: Fix memory leak in completion

One fix is in the runner, which is part of the completion
engine itself. The other is specific for C++.

Task-number: QTCREATORBUG-5947
Change-Id: Ib8fff1eb5adad1ffb2a11da66c50b545e1457df8
Reviewed-on: http://codereview.qt.nokia.com/4355
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
(cherry picked from commit e15443e9523df0e40414b1baf7d8182f641f7f2c)

12 years agoC++: Fix duplicate items in C++ completion for Qt methods
Leandro Melo [Thu, 8 Sep 2011 12:01:18 +0000 (14:01 +0200)]
C++: Fix duplicate items in C++ completion for Qt methods

In the old code completion engine items were created on the stack
and passed around by value. With the refactoring of the code assist
API they became heap objects manipulated through pointers. This
patch fixes one reminiscence not caught during the refactoring
in which the same actual pointer was being used more than once to
be appended on the list.

Change-Id: I2009fb0b6aa18df57aa5ca9bde0591536ca2cd74
Reviewed-on: http://codereview.qt-project.org/4444
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
(cherry picked from commit a1fa169219423641e65f81e3fbc27f0f9fb84dd5)

12 years agoFew more things to changes file.
Eike Ziller [Mon, 12 Sep 2011 06:35:19 +0000 (08:35 +0200)]
Few more things to changes file.

Change-Id: I96ec220e7df1cb5a683e0319641c30e43c1c573d

12 years agoFix glitch in c4fb17bef9175557ab071a154b6799e098fdb379.
Daniel Molkentin [Thu, 8 Sep 2011 15:08:11 +0000 (17:08 +0200)]
Fix glitch in c4fb17bef9175557ab071a154b6799e098fdb379.

Change-Id: I239af4d7f03553760bf1fd1de0cedd552246565c
Reviewed-on: http://codereview.qt-project.org/4476
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
12 years agoSymbian: QML Viewre version added to info button
Pawel Polanski [Thu, 8 Sep 2011 14:10:29 +0000 (16:10 +0200)]
Symbian: QML Viewre version added to info button

Change-Id: I413232e486053950230fe131dc156990ac1d96cf
Reviewed-on: http://codereview.qt-project.org/4470
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
12 years agoCODA: Fixed crash when redeploying
Pawel Polanski [Thu, 8 Sep 2011 13:57:52 +0000 (15:57 +0200)]
CODA: Fixed crash when redeploying

Change-Id: Id154468d6ee4db4eb045fde8a0e858ad5b17428f
Reviewed-on: http://codereview.qt-project.org/4469
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
12 years agoCODA: Debug output added to CODA 4.0.23
Pawel Polanski [Thu, 8 Sep 2011 09:34:09 +0000 (11:34 +0200)]
CODA: Debug output added to CODA 4.0.23

Change-Id: Idd2ea3d11a5ee193205c642cc6176ec70c6ef41a
Reviewed-on: http://codereview.qt-project.org/4418
Reviewed-by: Paweł Polański <jaggernod@gmail.com>
12 years agoRespect 64 bit library path for Qt Components
Daniel Molkentin [Wed, 7 Sep 2011 15:04:44 +0000 (17:04 +0200)]
Respect 64 bit library path for Qt Components

Task-Number: QTCREATORBUG-6033
Change-Id: Ib1734956ea88d576354afad686880fa91ea0a38e
Reviewed-on: http://codereview.qt-project.org/4371
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoFixed CVSSettings::equals
Robert Loehning [Thu, 1 Sep 2011 19:47:47 +0000 (21:47 +0200)]
Fixed CVSSettings::equals

Change-Id: I893d740558ddcca1ac20f27088d9388a854be16d
Reviewed-on: http://codereview.qt.nokia.com/4103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoList new changes-2.3.1 file in qtcreator.pro
Kai Koehne [Wed, 7 Sep 2011 11:14:05 +0000 (13:14 +0200)]
List new changes-2.3.1 file in qtcreator.pro

Change-Id: I611935b4c993d70a566fe1cbc6bcf5eb362339c2
Reviewed-on: http://codereview.qt.nokia.com/4349
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoHarmattan: Fix initial packaging icon.
Christian Kandeler [Wed, 7 Sep 2011 05:43:37 +0000 (07:43 +0200)]
Harmattan: Fix initial packaging icon.

The code had not been updated when the application icon file name
changed in the wizard.

Change-Id: I3f489ca09ac1bda4f10166235692a43ca23e638a
Reviewed-on: http://codereview.qt.nokia.com/4305
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoHarmattan: Fix package version updates.
Christian Kandeler [Mon, 5 Sep 2011 13:49:30 +0000 (15:49 +0200)]
Harmattan: Fix package version updates.

Obviously, we can't just globally replace all version numbers. Instead,
we now duplicate the latest entry and replace version number, date and
comments. Also implemented is a simple check guarding against
downgrading, which just checks whether the "new" version number already
appears in the changlog file.

Task-number: https://bugreports.qt.nokia.com/browse/QTCREATORBUG-5797
Change-Id: I17512169972415f60d1a9715ac8b98d185da8694
Reviewed-on: http://codereview.qt.nokia.com/4209
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoCreating changes-2.3.1 file
Kai Koehne [Wed, 7 Sep 2011 10:02:04 +0000 (12:02 +0200)]
Creating changes-2.3.1 file

Change-Id: I7c80df7a17c0ed99e4d66861980b0b0f6d2d4606
Reviewed-on: http://codereview.qt.nokia.com/4337
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoUpdate japanese translation for 2.3.
axasia [Mon, 5 Sep 2011 16:57:53 +0000 (18:57 +0200)]
Update japanese translation for 2.3.

Merge-request: 376
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I611a10a7d3c5bd8cdc15d5924e182531befcff1f

12 years agochinese translation fixes
Beaver Xu [Mon, 5 Sep 2011 16:48:02 +0000 (18:48 +0200)]
chinese translation fixes

Merge-request: 375
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Ibbf38354f2d687e9991d0bc522574df4de5bd387

12 years agoUpdated Russian translation
Sergey Belyashov [Mon, 5 Sep 2011 15:46:56 +0000 (17:46 +0200)]
Updated Russian translation

Merge-request: 2203
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I3adad8041ebcefb4802b0b010cfc938bcbd50e71

12 years agoSimplified code
Robert Loehning [Thu, 1 Sep 2011 19:40:26 +0000 (21:40 +0200)]
Simplified code

Change-Id: I43aa8182d77b4727a503a9a9ed6e7ebe7f7e9f1e
Reviewed-on: http://codereview.qt.nokia.com/4102
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoRemoteLinux: Don't show message box on remote process crash.
Christian Kandeler [Wed, 31 Aug 2011 12:01:46 +0000 (14:01 +0200)]
RemoteLinux: Don't show message box on remote process crash.

Apparently people find that annoying.

Task-number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=280162
Change-Id: Ia0cec0ef49fb0c6af48933e9a0f1caf890dc4bdc
Reviewed-on: http://codereview.qt.nokia.com/3964
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoMobileWizards: Add option for booster to harmattan configure page
Kai Koehne [Tue, 16 Aug 2011 11:41:08 +0000 (13:41 +0200)]
MobileWizards: Add option for booster to harmattan configure page

Split up maemo- and harmattan wizard pages, and add a checkbox
for enabling booster specifically for harmattan.

Change-Id: If5653abbf6d29b5f946718d10bc12404df19c16c
Reviewed-on: http://codereview.qt.nokia.com/3731
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>
12 years agoQtQuickApp: Tweak template to enable Meego booster
Kai Koehne [Wed, 17 Aug 2011 10:27:24 +0000 (12:27 +0200)]
QtQuickApp: Tweak template to enable Meego booster

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>
12 years agoHarmattan: Include Aegis manifest in list of files to add to project.
Christian Kandeler [Mon, 29 Aug 2011 15:10:45 +0000 (17:10 +0200)]
Harmattan: Include Aegis manifest in list of files to add to  project.

Change-Id: I04f8787e6a334ad801af2e3b8006c000a1fa0546
Reviewed-on: http://codereview.qt.nokia.com/3823
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoSymbian: Warn if EPOCROOT is on different drive from the sources
Tobias Hunger [Fri, 26 Aug 2011 10:09:38 +0000 (10:09 +0000)]
Symbian: Warn if EPOCROOT is on different drive from the sources

... even when using SBSv2

Task-Number: QTCREATORBUG-5907
Change-Id: Ibb79dc798b8146f9e5658e186f499bfd47fb3d9e
Reviewed-on: http://codereview.qt.nokia.com/3660
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
(cherry picked from commit 059e5f30deacdec5ad9449c6247b609be5cf9727)

12 years agoRemove CONFIG+=declarative_debug from imported build line
Kai Koehne [Thu, 1 Sep 2011 07:43:08 +0000 (09:43 +0200)]
Remove CONFIG+=declarative_debug from imported build line

Prevent CONFIG+=declarative_debug to show up in "custom arguments"
of an imported build.

Change-Id: Ib598addcb31b65853eea430a086f614c6dd498fd
Reviewed-on: http://codereview.qt.nokia.com/4044
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoQmlProject: Fix debugging with C++ language
Kai Koehne [Tue, 30 Aug 2011 13:55:44 +0000 (15:55 +0200)]
QmlProject: Fix debugging with C++ language

Because no ABI was specified, gdb bailed out with 'File format not
recognized'. Instead just use the ABI from one of the toolchains
available for the Qt version (assuming that they're all compatible).

Task-number: QTCREATORBUG-5957
Change-Id: I7db9bd45c6a015c6236ae1b672909e013fad1d65
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/4045
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoVersion bump
Eike Ziller [Thu, 1 Sep 2011 08:50:52 +0000 (10:50 +0200)]
Version bump

Change-Id: I9ef0aa6d47dca86fdd3169a40b9642c898607a05

12 years agoDoc: update screenshots and UI text to match Qt Simulator 1.2
Leena Miettinen [Fri, 26 Aug 2011 15:09:53 +0000 (17:09 +0200)]
Doc: update screenshots and UI text to match Qt Simulator 1.2

Change-Id: I1d05e82ffdd17b89963aa4d1ebde4d47d8dffb7f
Reviewed-on: http://codereview.qt.nokia.com/3736
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
12 years agoQt Quick App: Make sure showFullScreen is used for Harmattan
Kai Koehne [Thu, 25 Aug 2011 12:18:45 +0000 (14:18 +0200)]
Qt Quick App: Make sure showFullScreen is used for Harmattan

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>
12 years agoQmlCpp debugger: Fix clicking on QML stack traces
Kai Koehne [Thu, 25 Aug 2011 11:14:28 +0000 (13:14 +0200)]
QmlCpp debugger: Fix clicking on QML stack traces

Change-Id: I1e83dfc490bc871d106fb44357759829b3a1a6c4
Reviewed-on: http://codereview.qt.nokia.com/3593
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoAdded some of the missing translations
Robert Loehning [Wed, 24 Aug 2011 21:23:11 +0000 (23:23 +0200)]
Added some of the missing translations

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>
12 years agoFixes and improvements in German translation
Robert Loehning [Wed, 24 Aug 2011 20:11:56 +0000 (22:11 +0200)]
Fixes and improvements in German translation

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>
12 years agoDoc: fix image filename
Leena Miettinen [Wed, 24 Aug 2011 15:47:14 +0000 (17:47 +0200)]
Doc: fix image filename

Change-Id: Ice18f0689b38d05f86fdc7c643fb310a4db58cc7
Reviewed-on: http://codereview.qt.nokia.com/3527
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoDoc: Qt Mobility Libraries are preinstalled on MeeGo Harmattan devices
Leena Miettinen [Wed, 24 Aug 2011 15:18:28 +0000 (17:18 +0200)]
Doc: Qt Mobility Libraries are preinstalled on MeeGo Harmattan devices

Change-Id: I25f5540588387111ed4d7ec3220dbc9d55ec44e9
Reviewed-on: http://codereview.qt.nokia.com/3523
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoShow 'what's new in Qt Creator' as fallback
Daniel Molkentin [Tue, 23 Aug 2011 16:10:45 +0000 (18:10 +0200)]
Show 'what's new in Qt Creator' as fallback

...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>
12 years agoDebuggingHelper: Update UI even if compilation failed
Kai Koehne [Wed, 24 Aug 2011 10:15:58 +0000 (12:15 +0200)]
DebuggingHelper: Update UI even if compilation failed

This fixes all the buttons staying in disabled mode after an (unsuccessful)
compilation. Problem was that in the end, the finished() call informed
the option page that the build was over, while the updateQtVersions()
call updated the UI. The patch fixes the order, but also updates the UI
as reaction to the finished call, because relying on the delivery order of
two independent signals via Qt::QueuedConnection is fragile per se.

Change-Id: Ifdd03e3cb9d9bf96b30053e5e8aa0a3f0232ab1c
Task-number: QTCREATORBUG-5906
Reviewed-on: http://codereview.qt.nokia.com/3485
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoDetailswidget: Force minimum height
Tobias Hunger [Wed, 24 Aug 2011 09:04:19 +0000 (11:04 +0200)]
Detailswidget: Force minimum height

Task-number: QTCREATORBUG-5782
Change-Id: I3cd3584ca1f9878c36d75118302b76980cd8b4bc
Reviewed-on: http://codereview.qt.nokia.com/3506
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoDoc: use Qt Quick Application template in the tutorial
Leena Miettinen [Wed, 24 Aug 2011 10:48:45 +0000 (12:48 +0200)]
Doc: use Qt Quick Application template in the tutorial

Task-number: https://bugreports.qt.nokia.com/browse/QTCREATORBUG-5707
Change-Id: I3b6ae9dec8d65bfbf2eeeadf21da6f4a363c0a4c
Reviewed-on: http://codereview.qt.nokia.com/3489
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
12 years agoWelcomeScreen: Don't move ScrollBar beyond scroll area.
Daniel Molkentin [Tue, 23 Aug 2011 10:46:19 +0000 (12:46 +0200)]
WelcomeScreen: Don't move ScrollBar beyond scroll area.

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>
12 years agoWelcomeScreen: Re-add lost hover-state on tabs
Daniel Molkentin [Mon, 22 Aug 2011 18:16:41 +0000 (20:16 +0200)]
WelcomeScreen: Re-add lost hover-state on tabs

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>
12 years agoWelcomeScreen: Make Show all checkbox more prominent by moving it to the left.
Daniel Molkentin [Wed, 3 Aug 2011 16:20:05 +0000 (18:20 +0200)]
WelcomeScreen: Make Show all checkbox more prominent by moving it to the left.

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>
12 years agoCompile
Daniel Teske [Wed, 24 Aug 2011 10:04:33 +0000 (12:04 +0200)]
Compile

Change-Id: If1e0fe61ea873cf9ae6715a4758170acb97cdc21
Reviewed-on: http://codereview.qt.nokia.com/3479
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
12 years agoFix action ids of analyzer tools.
Eike Ziller [Wed, 24 Aug 2011 09:52:01 +0000 (11:52 +0200)]
Fix action ids of analyzer tools.

Change-Id: I7ea034b39e3b44eb58564a835034c17f9cfe61c1
Reviewed-on: http://codereview.qt.nokia.com/3476
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoFix crash with no generator selected
Daniel Teske [Tue, 23 Aug 2011 13:36:02 +0000 (15:36 +0200)]
Fix crash with no generator selected

Change-Id: If1e09d4f6fda3b266de17087aa9b1aa0014ecaf7
Task-Nr: QTCREATORBUG-5883
Reviewed-on: http://codereview.qt.nokia.com/3410
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoPartially revert -lastsession fix
Daniel Teske [Tue, 23 Aug 2011 14:00:46 +0000 (16:00 +0200)]
Partially revert -lastsession fix

Change-Id: I965c8e51ca38b343e65764f77fe1d204ff793f23
Reviewed-on: http://codereview.qt.nokia.com/3411
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoQmlCpp Debugging: Only set C++ breakpoints after QML is connected (CDB)
Kai Koehne [Wed, 24 Aug 2011 08:07:12 +0000 (10:07 +0200)]
QmlCpp Debugging: Only set C++ breakpoints after QML is connected (CDB)

Apply the change we did in 7c31bd6604 also for CDB. The mixed engine
directly calls attemptBreakpointSynchronization as soon as the QML engine
is connected.

Change-Id: I764f785bb5f0575a9a624e29632d21caf5dde39c
Reviewed-on: http://codereview.qt.nokia.com/3468
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoDoc: using dummy data and context
Leena Miettinen [Tue, 23 Aug 2011 12:54:35 +0000 (14:54 +0200)]
Doc: using dummy data and context

Change-Id: Ia054de58fd1ae6204c327c2a17001a5050128732
Reviewed-on: http://codereview.qt.nokia.com/3405
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoversion bump 2.2.85 -> 2.3.0
hjk [Tue, 23 Aug 2011 10:20:33 +0000 (12:20 +0200)]
version bump 2.2.85 -> 2.3.0

Change-Id: I0c62f4f1f637b48ae9d332ac4d6a255a9792ad28
Reviewed-on: http://codereview.qt.nokia.com/3394
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoQmlDesigner.propertyEditor: crash fix
Thomas Hartmann [Mon, 22 Aug 2011 15:01:02 +0000 (17:01 +0200)]
QmlDesigner.propertyEditor: crash fix

If the anchor target does not have a corresponding model node
we had a crash. This happens for e.g. Flickable because children
is redefined.

Task-number: QTCREATORBUG-5829
Change-Id: Ib3f609fe7c29778dd4fdd8ed1ac8526afbb36fe0
Reviewed-on: http://codereview.qt.nokia.com/3327
Reviewed-by: Marco Bubke <marco.bubke@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agodisable poor hungarian translation
Oswald Buddenhagen [Mon, 22 Aug 2011 10:19:27 +0000 (12:19 +0200)]
disable poor hungarian translation

Change-Id: Ib7a4c7548024ac6a056f2d2e1baf4697f912f929

12 years agoQmlDesigner.itemLibrary: Use com.nokia.meego for Meego/Harmattan components
Thomas Hartmann [Mon, 22 Aug 2011 09:43:03 +0000 (11:43 +0200)]
QmlDesigner.itemLibrary: Use com.nokia.meego for Meego/Harmattan components

Also fixing the documentation.

Change-Id: Ib40f7cea0be7f800b40272c4aed0babfc53ae433
Reviewed-on: http://codereview.qt.nokia.com/3301
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
12 years agoQtQuick wizard: Use com.nokia.meego for Meego/Harmattan components
Kai Koehne [Mon, 22 Aug 2011 08:40:19 +0000 (10:40 +0200)]
QtQuick wizard: Use com.nokia.meego for Meego/Harmattan components

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>
12 years agoComplete japanese translation for 2.3.
axasia [Fri, 19 Aug 2011 16:06:08 +0000 (18:06 +0200)]
Complete japanese translation for 2.3.

Merge-request: 371
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Ibe500957e4fdd5c34700662f2621bee733179507

12 years agoDoc: update debugging example
Leena Miettinen [Fri, 19 Aug 2011 13:51:46 +0000 (15:51 +0200)]
Doc: update debugging example

Change-Id: I7424f24561c91057be2f10bb0009dbe94e4db2fb
Reviewed-on: http://codereview.qt.nokia.com/3275
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoDoc: opening bug tracker for Qt Creator
Leena Miettinen [Thu, 18 Aug 2011 14:47:19 +0000 (16:47 +0200)]
Doc: opening bug tracker for Qt Creator

Change-Id: I083deb81ed746e39751ff5bd55a509d1d34914da
Reviewed-on: http://codereview.qt.nokia.com/3257
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoDoc: update screen shots
Leena Miettinen [Wed, 17 Aug 2011 10:38:10 +0000 (12:38 +0200)]
Doc: update screen shots

Task-number: QTCREATORBUG-5435
Change-Id: I098372261ff216e28a00254956cc2f643e899f26
Reviewed-on: http://codereview.qt.nokia.com/3090
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
12 years agoDoc: starting QML Viewer from external tools
Leena Miettinen [Thu, 18 Aug 2011 11:42:59 +0000 (13:42 +0200)]
Doc: starting QML Viewer from external tools

Change-Id: Idb9daecc8cd9b81864f59ddc07ceca434618a1f5
Reviewed-on: http://codereview.qt.nokia.com/3177
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoDoc: replace dynamic links with fixed links
Leena Miettinen [Wed, 17 Aug 2011 09:13:26 +0000 (11:13 +0200)]
Doc: replace dynamic links with fixed links

Change-Id: Ib99ca3b9b93ca62ec4fa63aa03e99a2260d9cb78
Reviewed-on: http://codereview.qt.nokia.com/3080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoDoc: update screenshots
Leena Miettinen [Wed, 17 Aug 2011 09:11:47 +0000 (11:11 +0200)]
Doc: update screenshots

Task-number: QTCREATORBUG-5439
Change-Id: Id6828d76fb8c3f2e2efbe6692dc6eb2c25480a03
Reviewed-on: http://codereview.qt.nokia.com/3079
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoWelcomeScreen: Minimize height of delegates
Daniel Molkentin [Wed, 17 Aug 2011 15:14:39 +0000 (17:14 +0200)]
WelcomeScreen: Minimize height of delegates

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>
12 years agoWelcomeScreen: Add new tutorial, adjust names of existing
Daniel Molkentin [Wed, 17 Aug 2011 15:17:44 +0000 (17:17 +0200)]
WelcomeScreen: Add new tutorial, adjust names of existing

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>
12 years agoFix argument parsing in projectexplorer, fixing -lastsession
Daniel Teske [Thu, 18 Aug 2011 13:53:34 +0000 (15:53 +0200)]
Fix argument parsing in projectexplorer, fixing -lastsession

Change-Id: I942c08b5dde0c014f223247bc77f65effcd45787
Task-Nr: QTCREATORBUG-5773
Reviewed-on: http://codereview.qt.nokia.com/3194
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
12 years agoKeep MultiFeedRssModel private in the context of C++
Daniel Molkentin [Thu, 18 Aug 2011 13:57:48 +0000 (15:57 +0200)]
Keep MultiFeedRssModel private in the context of C++

Change-Id: I9ec1948005928682cbaab39c5bc0f4e96b675bfe
Reviewed-on: http://codereview.qt.nokia.com/3195
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agore-add LD_LIBRARY_PATH script
Oswald Buddenhagen [Thu, 18 Aug 2011 11:03:12 +0000 (13:03 +0200)]
re-add LD_LIBRARY_PATH script

we need to override RUNPATHs from possible plugins.

due to d7d23226, this should not re-introduce QTCREATORBUG-1646.

unlike in the previous incarnation, we don't replace the binary with the
script, but give the script an extension. this is nicer for packagers
and less confusing in creator's own run configurations. the .desktop
files created by our installers need to be adjusted for that.

Task-number: QTCREATORBUG-5565
Change-Id: Icd2fa55456754a05257376b8288e8bdf423c62db
Reviewed-on: http://codereview.qt.nokia.com/3180
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>
12 years agoSDK Integration for Example Manifests
Daniel Molkentin [Wed, 3 Aug 2011 12:19:10 +0000 (14:19 +0200)]
SDK Integration for Example Manifests

Change-Id: I3cdf8e299267b0cb2c21322bb9cd147f43dfb851
Reviewed-on: http://codereview.qt.nokia.com/2573
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
12 years agoFrench translations for 2.3.
Pierre Rossi [Tue, 16 Aug 2011 20:15:26 +0000 (22:15 +0200)]
French translations for 2.3.

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>
12 years agoDoc: generating core files while debugging
Leena Miettinen [Tue, 16 Aug 2011 11:51:42 +0000 (13:51 +0200)]
Doc: generating core files while debugging

Task-number: QTCREATORBUG-5740
Change-Id: I5426cb5adfc3943416c9fc24f86f54045784629e
Reviewed-on: http://codereview.qt.nokia.com/3010
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoShow images also for examples
Daniel Molkentin [Tue, 16 Aug 2011 12:56:18 +0000 (14:56 +0200)]
Show images also for examples

Change-Id: Ic67eea8abb19ab9e398d68cf568a1c99acfb6564
Reviewed-on: http://codereview.qt.nokia.com/3033
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoDoc: update screenshot and instructions for opening examples
Leena Miettinen [Tue, 16 Aug 2011 10:39:31 +0000 (12:39 +0200)]
Doc: update screenshot and instructions for opening examples

Change-Id: I01760cd26f5ac814ee3ce2f7985a08bd172fbf98
Reviewed-on: http://codereview.qt.nokia.com/3002
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
12 years agoHelp: Remove margins around the visual root elements.
Daniel Molkentin [Sun, 7 Aug 2011 15:28:01 +0000 (17:28 +0200)]
Help: Remove margins around the visual root elements.

12 years agoFixed updating of translations for external tools
Sergey Belyashov [Tue, 16 Aug 2011 08:36:22 +0000 (10:36 +0200)]
Fixed updating of translations for external tools

Merge-request: 368
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Ic7d33860b072d2a905cf28459e1da10e46d584db

12 years agoUpdated Russian translation
Sergey Belyashov [Tue, 16 Aug 2011 08:34:34 +0000 (10:34 +0200)]
Updated Russian translation

Merge-request: 369
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I51d19c6bcb8c30128500af5d9f7c7afb3360a570

12 years agoVersion bump
Eike Ziller [Tue, 16 Aug 2011 08:20:21 +0000 (10:20 +0200)]
Version bump

Change-Id: I62c13a4f70aacd083884316f997c049fd4202353

12 years agoDebugger: Fix "Run to Line", "Jump to Line".
Friedemann Kleint [Mon, 15 Aug 2011 14:52:08 +0000 (16:52 +0200)]
Debugger: Fix "Run to Line", "Jump to Line".

Change-Id: I33d7d6e0ef2f10d9198491e0562118687726d2aa
Reviewed-on: http://codereview.qt.nokia.com/2979
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: hjk <qthjk@ovi.com>
12 years agoC++: Fix BaseSpecifierAST::firstToken return
Leandro Melo [Mon, 8 Aug 2011 07:54:06 +0000 (09:54 +0200)]
C++: Fix BaseSpecifierAST::firstToken return

Change-Id: I105d94f543d22319571320cd88f791278aac3239
Reviewed-on: http://codereview.qt.nokia.com/2734
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoFix translation of external tools.
Eike Ziller [Mon, 15 Aug 2011 10:51:16 +0000 (12:51 +0200)]
Fix translation of external tools.

Change-Id: I21541c579f3be75537763ad65b63f6804c329e50
Reviewed-on: http://codereview.qt.nokia.com/2951
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFixed typo in French translation
Robert Loehning [Mon, 15 Aug 2011 10:29:38 +0000 (12:29 +0200)]
Fixed typo in French translation

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>
12 years agoFix possible crash in git branch dialog
Tobias Hunger [Mon, 15 Aug 2011 11:37:04 +0000 (11:37 +0000)]
Fix possible crash in git branch dialog

Do not crash when checking out a branch while not currently
on any branch.

Task-number: QTCREATORBUG-5784
Change-Id: I5d007e91c1778e6f09a5d543990d948bc1427599
Reviewed-on: http://codereview.qt.nokia.com/2958
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
12 years agoDebuggingHelpers: Pass mkspec on command line
Kai Koehne [Mon, 15 Aug 2011 09:59:20 +0000 (11:59 +0200)]
DebuggingHelpers: Pass mkspec on command line

We didn't pass actually the targetMode and mkspec to qmake. E.g.
on Mac, debugging helpers therefore couldn't compile if the default
qmake mkspec is xcode.

Task-number: QTCREATORBUG-5806
Change-Id: I575012386983e1e285a500f99a34b7f21dcba29d
Reviewed-on: http://codereview.qt.nokia.com/2947
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agofakevim: fix action used in Edit->Advanced
hjk [Mon, 15 Aug 2011 08:52:28 +0000 (10:52 +0200)]
fakevim: fix action used in Edit->Advanced

Variable was uses in wrong scope.

Change-Id: I0c9343742cf75b118c14cbf8bf4cec9f983c32d5
Reviewed-on: http://codereview.qt.nokia.com/2941
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoEditors: Make sure folded blocks remain consistent
Leandro Melo [Fri, 12 Aug 2011 10:13:23 +0000 (12:13 +0200)]
Editors: Make sure folded blocks remain consistent

When folding indents change and a block becomes no longer
folded we need to update the user data. This patch tries
to handle general inconsistencies that might arise in such
situations. Notice however that there are stil other problems
to be addressed (including issues in Qt).

Task-number: QTCREATORBUG-5771
Change-Id: I38b869832159598d46cde00058308c218ca31f1a
Reviewed-on: http://codereview.qt.nokia.com/2908
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
Reviewed-by: Matthias Ettrich
12 years agoUpdated Russian translation
Sergey Belyashov [Fri, 12 Aug 2011 17:28:31 +0000 (19:28 +0200)]
Updated Russian translation

Merge-request: 359
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: Iea721437f2615acb8fec5dabca34b0922bf551ee

12 years agoUpdate chinese translation for 2.3
Beaver Xu [Fri, 12 Aug 2011 17:17:24 +0000 (19:17 +0200)]
Update chinese translation for 2.3

Merge-request: 360
Reviewed-by: ossi
Change-Id: Ia6e6303dabcda2bf3b7abc44fdfde2d359bb61a7

12 years agoUpdate japanese translations for 2.3.
axasia [Fri, 12 Aug 2011 15:27:11 +0000 (17:27 +0200)]
Update japanese translations for 2.3.

Merge-request: 361
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Change-Id: I384b845fd586a90a7209fc22c8a1f7d2170feac5

12 years agoQmlDebugging: Fix on-device debugging for people with a default proxy
Kai Koehne [Thu, 11 Aug 2011 07:57:44 +0000 (09:57 +0200)]
QmlDebugging: Fix on-device debugging for people with a default proxy

Qt Creator by default honors the proxy settings of the environment.
This is the wrong choice when connecting to your device, leading to
'Cannot connect to in-process debugger' errors.

Change-Id: Ie0b822dec601463ba3a620efe1a1e35bb24b6c5a
Reviewed-on: http://codereview.qt.nokia.com/2846
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoQmlDebugger: Fix QML Script Console for mixed debugging
Kai Koehne [Wed, 10 Aug 2011 15:03:33 +0000 (17:03 +0200)]
QmlDebugger: Fix QML Script Console for mixed debugging

Both the Debugger View and the QML Script Console use
executeDebuggerCommand(...). Forward this to QmlEngine if
the QmlEngine is stopped (because only then teh QML Script Console
is enabled), to C++ otherwise.

Change-Id: I4ba72b56a6205db5346e167b85e9353d05adae41
Reviewed-on: http://codereview.qt.nokia.com/2829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoRevert "fakevim: also set foreground color for search matches"
hjk [Fri, 5 Aug 2011 14:00:40 +0000 (16:00 +0200)]
Revert "fakevim: also set foreground color for search matches"

This reverts commit c1f225fd8f3020957c3326782b02ae41e4ad2aed.

This does not cover the case where the cursor is in the marked
text, which then blinks black-on-black.

Change-Id: Ic94ebbbb3d850624a8fbbc0e1d9d49ba70992ad1
Reviewed-on: http://codereview.qt.nokia.com/2698
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoFix running applications in Windows SDK 7.1.
Friedemann Kleint [Wed, 10 Aug 2011 10:10:35 +0000 (12:10 +0200)]
Fix running applications in Windows SDK 7.1.

Fix start of applications with varying Qt-versions when Qt Creator
is launched from an Windows SDK command prompt (prevent
PATH from being reset by setenv.cmd).

Change-Id: I74f75f3663be4836c368a4b9d8c7f8fc5ec351d7
Reviewed-on: http://codereview.qt.nokia.com/2818
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoC++: Fix crash when typing illegal class names
Leandro Melo [Tue, 9 Aug 2011 11:46:28 +0000 (13:46 +0200)]
C++: Fix crash when typing illegal class names

Such as class ~A {} or class operator+ {}.

Done by Roberto Raggi

Change-Id: I4fdad6d27aaa997e651f2d08de36fe675fc78814
Reviewed-on: http://codereview.qt.nokia.com/2778
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
12 years agoRemove unnecessary import, removes a warning
Eike Ziller [Tue, 9 Aug 2011 11:51:37 +0000 (13:51 +0200)]
Remove unnecessary import, removes a warning

Change-Id: If89bec794fe3fe5315b69ad283d35c2ba0abced3
Reviewed-on: http://codereview.qt.nokia.com/2779
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
12 years agoQmlDebugger: Hit breakpoints for simple bindings also for .qmlproject
Kai Koehne [Mon, 8 Aug 2011 14:26:12 +0000 (16:26 +0200)]
QmlDebugger: Hit breakpoints for simple bindings also for .qmlproject

Make sure QML_DISABLE_OPTIMIZER is set also when debugging with
qmlobserver

Change-Id: I33aa4cd50ae184e339e3783488ba236eecdf7b33
Reviewed-on: http://codereview.qt.nokia.com/2753
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
12 years agoMeeGo: Adapt package name to changed OVI store requirements.
Christian Kandeler [Fri, 5 Aug 2011 13:58:18 +0000 (15:58 +0200)]
MeeGo: Adapt package name to changed OVI store requirements.

Fremantle needed the application version as x_y_z, for Harmattan it must
be x.y.z, otherwise the package will not be accepted by the store.
Obviously.

Task-Number: https://projects.maemo.org/bugzilla/show_bug.cgi?id=276021

Change-Id: I93b8fd7f1c95b9ef26df97f817e3b8b610c4e932
Reviewed-on: http://codereview.qt.nokia.com/2697
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>