qt-creator:mer-qt-creator.git
5 years agounbreak default spec resolution under macx
Oswald Buddenhagen [Mon, 5 Nov 2012 18:02:04 +0000 (19:02 +0100)]
unbreak default spec resolution under macx

when the spec is not xcode-based, we need to treat it as a regular unix,
i.e., resolve the symlink.

Change-Id: I155f4337dc0007261fc316876c4d6999e10f8ea6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agofold m_qmakespecFull back into m_qmakespec
Oswald Buddenhagen [Tue, 18 Sep 2012 08:54:52 +0000 (10:54 +0200)]
fold m_qmakespecFull back into m_qmakespec

the original value is not used any more after the final resolution.

Change-Id: Icadc219f045a1bbfd20506c4c72c53d1fb352969
(cherry picked from qttools/74d548c89dae83b392953f505876d8d383a72ce5,
plus creator-specific amend)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agofetch all properties from qmake
Oswald Buddenhagen [Wed, 31 Oct 2012 10:13:44 +0000 (11:13 +0100)]
fetch all properties from qmake

don't filter out ^QMAKE_.*:
- QMAKE_MKSPECS is not printed any more, so needs no filtering
- QMAKE_VERSION can be simply used now, as we are now rather close to the
  real qmake
- QMAKE_SPEC and QMAKE_XSPEC need to be fetched
  - this fixes the default spec resolution

Change-Id: Ifcfa8b5b9e2bbf5d995940e1bb7f55e7d67aed3e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qttools/0037bef09ca77c5ae4d20bd09294ba1d57537e09)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoSquish: Removed pointless explicit timeouts
Robert Loehning [Fri, 2 Nov 2012 18:34:38 +0000 (19:34 +0100)]
Squish: Removed pointless explicit timeouts

Change-Id: I21e41fc8d1c26186afe0d18613c764abd065227e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoQt5: Correct usage of testlib.
Nikolai Kosjar [Tue, 30 Oct 2012 10:38:06 +0000 (11:38 +0100)]
Qt5: Correct usage of testlib.

This corrects commit 112f80. $$QTESTLIB is not needed since both Qt4 and
Qt5 support "QT += testlib".

Change-Id: I776b44825295c86d2d85e9b8dc6a422da6f36ab6
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Added test case for deleting files outside of editor
Robert Loehning [Fri, 2 Nov 2012 18:15:09 +0000 (19:15 +0100)]
Squish: Added test case for deleting files outside of editor

Change-Id: Ib9724e0794dab7e4b2de39e72d671c8bf8f27b08
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoQt5: Fix crash in generate-ast.
Nikolai Kosjar [Wed, 24 Oct 2012 14:17:00 +0000 (16:17 +0200)]
Qt5: Fix crash in generate-ast.

Change-Id: Ib3a6662e8ba374f46a1d9bf7056bf44a704879b6
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoQt5: Compile fix for generate-ast.
Nikolai Kosjar [Wed, 24 Oct 2012 14:09:23 +0000 (16:09 +0200)]
Qt5: Compile fix for generate-ast.

1. Earlier refactoring did not adapt usages here.
2. Compile with Qt5.

Change-Id: Ic461f2acb03d51e9ad903c4aa65b7d9e6d80fe86
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoVersion bump.
Eike Ziller [Mon, 5 Nov 2012 08:16:22 +0000 (09:16 +0100)]
Version bump.

Change-Id: I978a6d435c53276a0f7a024e534278aa5f794ebb

5 years agofakevim: Fix crash when adding text to last line
Lukas Holecek [Thu, 1 Nov 2012 19:43:20 +0000 (20:43 +0100)]
fakevim: Fix crash when adding text to last line

Workaround for crash when in edit block and adding text to the last
empty line.

Change-Id: I46b84074bd6f6fbcae698671716e151ebab98f5b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoCDB: Quote executable in debugger launch.
Friedemann Kleint [Thu, 1 Nov 2012 16:24:40 +0000 (17:24 +0100)]
CDB: Quote executable in debugger launch.

Task-number: QTCREATORBUG-8125
Change-Id: Iaed1a7a4d68c50f8f06dc6be4b9a73933e835988
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoSquish: Test for reverting unsaved changes
Christian Stenger [Thu, 25 Oct 2012 09:36:31 +0000 (11:36 +0200)]
Squish: Test for reverting unsaved changes

Change-Id: I54398b5b576b9b715e473861e287546afdb4f32a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoSquish: Test handling of read only files
Christian Stenger [Fri, 19 Oct 2012 15:36:14 +0000 (17:36 +0200)]
Squish: Test handling of read only files

Change-Id: I459fdaed7338f5343b760da47e9652baf78986f0
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoSquish: Update README file
Christian Stenger [Wed, 31 Oct 2012 15:24:11 +0000 (16:24 +0100)]
Squish: Update README file

Change-Id: I12761ec48af3a05d83dcaffe66b7e413d2fd4937
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoDoc: replace shortcut to File Naming options with menu path
Leena Miettinen [Wed, 31 Oct 2012 15:00:49 +0000 (16:00 +0100)]
Doc: replace shortcut to File Naming options with menu path

The shortcut seems to have been removed.

Change-Id: I1322feb44fb4b62d30c256e53ab056b5210a4ad0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoFix crashes while parsing template parameters in C++ code
Przemyslaw Gorszkowski [Sun, 28 Oct 2012 23:02:40 +0000 (00:02 +0100)]
Fix crashes while parsing template parameters in C++ code

AlreadyConsideredClassContainer has to be cleared when there is no base class

Task-number: QTCREATORBUG-8128

Change-Id: Iad82f2efc361aeb38c88a751c86aa572d373557a
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: David Schulz <david.schulz@digia.com>
5 years agoUpdate Polish translations
Przemyslaw Gorszkowski [Sat, 27 Oct 2012 11:03:36 +0000 (13:03 +0200)]
Update Polish translations

Change-Id: Ia8fcaf526c2f57f86074299cfadf5a3c4c0f00c1
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
5 years agoThe QtDeclarative QML viewer is found in QtDeclarative's bindir
Thiago Macieira [Wed, 17 Oct 2012 18:37:41 +0000 (11:37 -0700)]
The QtDeclarative QML viewer is found in QtDeclarative's bindir

Change-Id: I1de94013c0354fbd6c03bed56e91f79925923a64
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoSquish: Updated function pickVersion474runVerify()
Robert Loehning [Mon, 29 Oct 2012 18:31:17 +0000 (19:31 +0100)]
Squish: Updated function pickVersion474runVerify()

Change-Id: I02733645a6367429ce97007cfa4b882534786d78
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Updated iterateBuildConfigs() to handle multiple kits
Robert Loehning [Mon, 29 Oct 2012 18:22:43 +0000 (19:22 +0100)]
Squish: Updated iterateBuildConfigs() to handle multiple kits

Change-Id: I724e45bf510015dbdae6cb4c6cb55285167dafbc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Removed unused functions
Robert Loehning [Fri, 26 Oct 2012 18:29:37 +0000 (20:29 +0200)]
Squish: Removed unused functions

Change-Id: Idf66788a8f693d836fafe26f3355a96395066c37
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoTry to watch local variable in watchwindow-DND, too.
Friedemann Kleint [Mon, 29 Oct 2012 11:59:53 +0000 (12:59 +0100)]
Try to watch local variable in watchwindow-DND, too.

Fix codepath overlooked in
6886e485de59bc1fe1fe84ca6c1fb1263b18420b by introducing
a WatchHandler::watchVariable().

Task-number: QTCREATORBUG-8120
Change-Id: Ibab2619754e0006f3c81810a6bfdf758261c169e
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoSquish: Closing file after reading
Robert Loehning [Fri, 26 Oct 2012 16:50:51 +0000 (18:50 +0200)]
Squish: Closing file after reading

Change-Id: I69f53c7626bbdb14874d0e5d459fa0ac346d40a0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoApplication templates: remove Symbian remnants from deployment.pri
Topi Reinio [Fri, 26 Oct 2012 08:53:01 +0000 (10:53 +0200)]
Application templates: remove Symbian remnants from deployment.pri

Removes TARGET.EPOCHEAPSIZE and TARGET.CAPABILITY definitions (both are
specific to Symbian platform and now obsolete).

Change-Id: I5d1f00717c5284945551cc2472af67e0d80b736a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoQt5: QUrl doesn't accept paths without leading slash anymore
Eike Ziller [Fri, 26 Oct 2012 10:58:06 +0000 (12:58 +0200)]
Qt5: QUrl doesn't accept paths without leading slash anymore

Fixes e.g. opening help from the Locator help index filter

Change-Id: I3f7dae08aa83c36119a31d97232b9cdba0ba89fc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
5 years agoQmlApplicationViewer: properly resolve install paths
Topi Reinio [Tue, 23 Oct 2012 10:42:14 +0000 (12:42 +0200)]
QmlApplicationViewer: properly resolve install paths

This change makes QmlApplicationViewer applications find their qml
resources also in non-installed builds, regardless of the current
working directory.

On non-unix platforms applicationDirPath() is not used at all, and on
unix, it's used only for searching applicationDirPath/../path, which
is valid only after install. In-source or shadow-built apps find
their qml resources only if working directory == application
(executable) directory.

Path may refer to subdirectory in application directory. On windows,
non-installed application binary can also reside in /Release or
/Debug, so its resources need to be searched under parent directory
as well.

Change-Id: I81f602406787c20830c656fd5dffd11aa9b4afba
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoFix loading of .user files from Qt Creator 2.4
Tobias Hunger [Tue, 23 Oct 2012 10:33:24 +0000 (12:33 +0200)]
Fix loading of .user files from Qt Creator 2.4

We do not support loading of files more than 1 minor version old,
but since the current Qt SDK still is based on Creator 2.4 we are
having an exception here.

Fix debugger setup while at it.

Change-Id: I8f974ecd749b46868443de1a6b1e334f33734609
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoSquish: Added helper functions for views and models
Robert Loehning [Thu, 25 Oct 2012 10:59:03 +0000 (12:59 +0200)]
Squish: Added helper functions for views and models

Change-Id: Ic5dc4a5fe11ec5f693ef9f5ddf3abbefd689fd99
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoQnx: Qt logs should now use default slog2 buffer
mfekari [Thu, 25 Oct 2012 11:44:27 +0000 (07:44 -0400)]
Qnx: Qt logs should now use default slog2 buffer

Change-Id: Iae46101b45ee366f2d6c382d1d34f9af4a16809d
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agos/RemoteLinux/ProjectExplorer in comments
Orgad Shaneh [Tue, 23 Oct 2012 19:14:39 +0000 (21:14 +0200)]
s/RemoteLinux/ProjectExplorer in comments

Change-Id: Ic17525603cd100fa2014d92ed8203e91ea11713d
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoEditor: Fix crash on navigate back
David Schulz [Tue, 23 Oct 2012 11:07:57 +0000 (13:07 +0200)]
Editor: Fix crash on navigate back

Task-number: QTCREATORBUG-8080

Change-Id: I782fbdda6b2ec46b7b8f4f3e84855b99d1847e7d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoAndroid: Prevent deadlock
Orgad Shaneh [Wed, 24 Oct 2012 08:03:11 +0000 (10:03 +0200)]
Android: Prevent deadlock

when emulator is closed before deployment is done

Change-Id: I706f4c903dc229cffe2caef94f9e8cf89610ba4a
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoqtcreator.qbp renamed to qtcreator.qbs
Joerg Bornemann [Wed, 24 Oct 2012 12:31:25 +0000 (14:31 +0200)]
qtcreator.qbp renamed to qtcreator.qbs

The .qbp file extension is deprecated.

Change-Id: I8729b7a4a35ffe0359d9eb81354dbe8b7fcfce6d
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoQt5: Fix warning "qtestlib is deprecated".
Nikolai Kosjar [Tue, 23 Oct 2012 09:44:35 +0000 (11:44 +0200)]
Qt5: Fix warning "qtestlib is deprecated".

"Project WARNING: CONFIG+=qtestlib is deprecated. Use QT+=testlib
instead."

Change-Id: Ia6dcce078736cac0f0b05e0f621a25f97c9dac87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoFix crashes when cyclic inheritance
Przemyslaw Gorszkowski [Tue, 23 Oct 2012 21:08:19 +0000 (23:08 +0200)]
Fix crashes when cyclic inheritance

More complex situation.
Base class is a template and derived class is a template.

Task-number: QTCREATORBUG-8072
Task-number: QTCREATORBUG-7962
Change-Id: I7e8aa727fccd2bd4a779e6fe781553cd12196682
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
5 years agoAttach to Process: Fix crash
Orgad Shaneh [Tue, 23 Oct 2012 19:15:06 +0000 (21:15 +0200)]
Attach to Process: Fix crash

When a non-desktop kit has no device

Change-Id: I108f3f65d151183be1d40d659dc331e9bc57c48e
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoIgnoring Python byte code
Robert Loehning [Tue, 23 Oct 2012 17:32:49 +0000 (19:32 +0200)]
Ignoring Python byte code

Change-Id: Ifa2c7481f1bf2863cf237ec905f4186f0b6bb0dd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoRussian translation update
Sergey Belyashov [Thu, 13 Sep 2012 17:25:56 +0000 (21:25 +0400)]
Russian translation update

Change-Id: Id68bcd0c83842cb72503f2d8335df1b3a76b068c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
5 years agoSquish: Added tool to convert objects.map into tsv
Robert Loehning [Tue, 23 Oct 2012 13:15:45 +0000 (15:15 +0200)]
Squish: Added tool to convert objects.map into tsv

Change-Id: Icd86b82d55f0c994c80be04fc0006d577d11d2de
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoAppwizard test: Fix compilation and warnings
Alessandro Portale [Tue, 23 Oct 2012 11:26:00 +0000 (13:26 +0200)]
Appwizard test: Fix compilation and warnings

Change-Id: I6ec16d21c2c8554637361a48deddc71ebb52e7ce
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoC++: Fix crashes in tests with Qt5.
Nikolai Kosjar [Tue, 23 Oct 2012 10:10:08 +0000 (12:10 +0200)]
C++: Fix crashes in tests with Qt5.

tst_Semantic and tst_CodeFormatter crash with QTEST_APPLESS_MAIN since
they need to access some font settings via QTextDocument /
Q*Application. Use QTEST_MAIN instead.

Change-Id: Id85228acb6006cfaee41c634c6a32b6c23a70105
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
5 years agocompile fix
Thomas Hartmann [Tue, 23 Oct 2012 11:08:40 +0000 (13:08 +0200)]
compile fix

Change-Id: Ic854161a3104349656fbb3035daeb4adb4e79ba9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoDoc: Making the header consistent with Qt reference documentation.
Jerome Pasion [Mon, 22 Oct 2012 12:53:30 +0000 (14:53 +0200)]
Doc: Making the header consistent with Qt reference documentation.

Change-Id: I2272f577b707ffd2f308924ba01b768c81decaa8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoStyle: Fix sunken style for menu
Orgad Shaneh [Tue, 23 Oct 2012 07:40:21 +0000 (09:40 +0200)]
Style: Fix sunken style for menu

Change-Id: I08aa20b6569cac814c479766842ff9422d1eb157
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoRemove dependencies on Plastique and Cleanlooks
Thomas Hartmann [Tue, 23 Oct 2012 08:43:01 +0000 (10:43 +0200)]
Remove dependencies on Plastique and Cleanlooks

We want to move these styles out of the library so
we should not depend on them in creator.

This patch reverts 63cacc4534eff5ee52fdf626b2c4e4ab60ad204f,
since it does not rely on ifdefs.

See also 5d0f7d2304e4b9e1d28f874f3a459b3880c7f7a3 in master.

Change-Id: I8a3762f9bc31c679067ebb0a6b5540bc18e8b836
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoQmlDesigner: Compile with Qt 5 after removal of old styles.
Friedemann Kleint [Tue, 23 Oct 2012 07:23:55 +0000 (09:23 +0200)]
QmlDesigner: Compile with Qt 5 after removal of old styles.

Change-Id: I869da5a9af76fce01f411e608f95ecbd7ddda71a
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoSquish: Fix typeLines()
Christian Stenger [Mon, 22 Oct 2012 15:19:33 +0000 (17:19 +0200)]
Squish: Fix typeLines()

Change-Id: I13abcceebc3f61b508da658d5e9d4650fddff6ea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agodebugger: allow using a local core file with a remote kit
hjk [Mon, 22 Oct 2012 09:14:18 +0000 (11:14 +0200)]
debugger: allow using a local core file with a remote kit

This is a common use case when examining core files from devices without
ssh access or "externally" created core files and used to work with 2.5.

Change-Id: Ie8ee5e2e0216c1e8c3265cf01e59f2c92d8730ef
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
5 years agoUpdate Polish translations
jkobus [Mon, 22 Oct 2012 16:11:58 +0000 (18:11 +0200)]
Update Polish translations

Change-Id: I88ce5cc11761ec44305f569a61d4aea8c91f1c5e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
5 years agoRevert "Disable theming of menu bar."
Jens Bache-Wiig [Fri, 19 Oct 2012 11:13:57 +0000 (13:13 +0200)]
Revert "Disable theming of menu bar."

This reverts commit 7b8cd4272938b7ca9f585ddcec83b92fe6ede692.

This basically makes creator looks uglier on most platforms
while not really fixing anything on Ubuntu. The menubar is
on ubuntu (and mac) not shown in natively compiled versions
so it effectively fixes nothing, but makes the appearance
inconsistent on other platforms.

Change-Id: I4576b4dcc722dca59a7480eba41ce8efa970533b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoUpdate share.qbs
Orgad Shaneh [Thu, 18 Oct 2012 18:22:39 +0000 (20:22 +0200)]
Update share.qbs

Change-Id: I14972581bdc449719104cb981af7cce6b7c5a1aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoDoc: where appropriate, refer to Qt 4 SDK
Leena Miettinen [Mon, 22 Oct 2012 13:03:38 +0000 (15:03 +0200)]
Doc: where appropriate, refer to Qt 4 SDK

The contents of the Qt 5 installation program will differ from those
of the previous Qt SDK (no tool chains for Nokia mobile devices, for
example). To make this clear, refer to the Qt 4 SDK, where appropriate.

Change-Id: Ia6c3ab5fc3edd150fbe5362f85353243860afdb7
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoAlso allow Qt5 to provide example manifests.
Eike Ziller [Mon, 22 Oct 2012 12:32:29 +0000 (14:32 +0200)]
Also allow Qt5 to provide example manifests.

Change-Id: I71630c7ea8d413949f57797b90672cc3d9b8778f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoProjectExplorer: keep cursor position stable while renaming kits
hjk [Sun, 21 Oct 2012 10:31:11 +0000 (12:31 +0200)]
ProjectExplorer: keep cursor position stable while renaming kits

Change-Id: Ice81bb94326dfc179b12067a9419b817343eb788
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoPrevent endless loop if a project with dependencies couldn't be loaded.
Marcel Krems [Sun, 21 Oct 2012 10:38:39 +0000 (12:38 +0200)]
Prevent endless loop if a project with dependencies couldn't be loaded.

Task-number: QTCREATORBUG-8085

Change-Id: I6e09c871cba02360eb93c11b5650683eba652ed0
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoUpdate contributor list
Eike Ziller [Mon, 22 Oct 2012 09:12:26 +0000 (11:12 +0200)]
Update contributor list

Change-Id: Ib49ead780e1e5e19bb692cf7ece3e91c271531e9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoadjust deployqt to deploy also a qt5
tjenssen [Fri, 19 Oct 2012 11:17:40 +0000 (13:17 +0200)]
adjust deployqt to deploy also a qt5

Change-Id: I4f0864a78d8fc861a716bd8e8734ab0fd4181cc1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoFix use of QtWebKit in QtCreator's Help plugin
Simon Hausmann [Fri, 19 Oct 2012 14:36:13 +0000 (16:36 +0200)]
Fix use of QtWebKit in QtCreator's Help plugin

The help plugin uses the widgets API of QtWebKit and therefore needs
QtWebKitWidgets

Change-Id: I49b8530e3f44b42c48979c33d0b6b1fdb20c374b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoAdd Traditional Chinese translation
Franklin Weng [Mon, 22 Oct 2012 06:11:54 +0000 (14:11 +0800)]
Add Traditional Chinese translation

It's a clean version without all obsolete items.

Done-with: Juei-ray Tseng <e222et@gmail.com>

Change-Id: I609f8d6df15f75fa2728c90dab8b8f6d6c7db154
Reviewed-by: Liang Qi <liang.qi@digia.com>
5 years agoCredits
Orgad Shaneh [Sun, 21 Oct 2012 07:00:24 +0000 (09:00 +0200)]
Credits

* Add Knut Petter Svendsen
* Fix Peter Kümmel's name

Change-Id: I43f2cb35b6b0ac51d8f2a0e91539910382167f62
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoVCS: Avoid potential crash
Orgad Shaneh [Sun, 21 Oct 2012 17:58:59 +0000 (19:58 +0200)]
VCS: Avoid potential crash

Change-Id: Iedae7965eca0c32e0868795ea7541a5064c6c4a6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoMac: Don't link to 10.7+ api even when compiling there.
Eike Ziller [Fri, 19 Oct 2012 10:16:01 +0000 (12:16 +0200)]
Mac: Don't link to 10.7+ api even when compiling there.

The 'fullscreen' feature uses constants that are only available
on 10.7 or later, but when compiling on 10.6 we just defined the
constants ourselves.
With this patch we define the constants ourselves even on 10.7 and
later, to avoid linking to 10.7-only symbols when compiling on 10.7
or later, making it possible to run a Qt Creator compiled against
a 10.7 SDK also on 10.6.

Change-Id: I65236a85bdda3473fab0e424270b96880943d685
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agoC++: Fix typedef resolving when templates are involved.
Erik Verbruggen [Thu, 18 Oct 2012 13:06:13 +0000 (15:06 +0200)]
C++: Fix typedef resolving when templates are involved.

Task-number: QTCREATORBUG-7978
Change-Id: I27e6ebe56e410d509580a1e00f8986642cacc5ba
Reviewed-by: David Schulz <david.schulz@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Moved editor tests to editors suite
Robert Loehning [Fri, 19 Oct 2012 11:03:32 +0000 (13:03 +0200)]
Squish: Moved editor tests to editors suite

Change-Id: I82bd92db762f7f997460ece4c2f77d0381dca6b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Raised snooze in waitForCleanShutdown()
Robert Loehning [Fri, 19 Oct 2012 10:48:12 +0000 (12:48 +0200)]
Squish: Raised snooze in waitForCleanShutdown()

Change-Id: Iae110755f979a78c5cb3e4199cfc851f1feccb0c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Add test for renaming macros
Christian Stenger [Tue, 9 Oct 2012 13:00:17 +0000 (15:00 +0200)]
Squish: Add test for renaming macros

Change-Id: I9c9bc9556234ec321c6e3723f5276a0b66f6c90a
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoCreator should not try to open links ot non-html documents internally.
kh1 [Fri, 19 Oct 2012 10:38:33 +0000 (12:38 +0200)]
Creator should not try to open links ot non-html documents internally.

Task-number: QTCREATORBUG-4059

Change-Id: Id91997a0ca2ba404d71620b476c61e28275c4458
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoKit: emit kitUpdated signals on changes to devices/toolchains/qt
Daniel Teske [Wed, 17 Oct 2012 15:27:17 +0000 (17:27 +0200)]
Kit: emit kitUpdated signals on changes to devices/toolchains/qt

That is even if the id did not change, but the actual objects
for those ids changed.

Change-Id: Ib176f18cf66b11436d046bf08a81db27fce458f9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoCMake: Use correct environment for new kits
Daniel Teske [Thu, 18 Oct 2012 10:53:45 +0000 (12:53 +0200)]
CMake: Use correct environment for new kits

Task-number: QTCREATORBUG-8073

Change-Id: I9c262fd553fa1af0e8de4900f465fe45aa8bbf78
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoMac: use the deployed Qt for sdktool
Eike Ziller [Thu, 18 Oct 2012 17:31:57 +0000 (19:31 +0200)]
Mac: use the deployed Qt for sdktool

Task-number: QTCREATORBUG-7926

Change-Id: I546dc1e899b6efbce3742046f1b5cc83a9c69612
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agoQnx: Update the wizard templates for Qt5 applications on BlackBerry
mfekari [Thu, 18 Oct 2012 15:22:09 +0000 (11:22 -0400)]
Qnx: Update the wizard templates for Qt5 applications on BlackBerry

Change-Id: I4b17c59b1e25fd453d2fe09fb865832291ffc87c
Reviewed-by: Fabian Bumberger <fbumberger@rim.com>
Reviewed-by: Vladimir Minenko <vminenko@rim.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoSquish: Cleaned path maintenance in tst_build_speedcrunch
Robert Loehning [Wed, 17 Oct 2012 19:11:57 +0000 (21:11 +0200)]
Squish: Cleaned path maintenance in tst_build_speedcrunch

Change-Id: Ic3cb8571c79ab2880975a439d893ba794c153d7e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoDoc: Let 'make docs' also work without window manager
Kai Koehne [Thu, 18 Oct 2012 14:19:39 +0000 (16:19 +0200)]
Doc: Let 'make docs' also work without window manager

qhelpgenerator uses QtGuiWindow, but e.g. for build farms there's
no window manager available.

Change-Id: Id33af086ff86b0ee4778693a14da61832e360e7d
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Niels Weber <niels.weber@digia.com>
5 years agoSquish: Fixed validateSearchResult()
Robert Loehning [Wed, 17 Oct 2012 15:23:07 +0000 (17:23 +0200)]
Squish: Fixed validateSearchResult()

Fixes fails in tst_CSUP04 introduced by 6b5bccd08e7f37bd4be322c0284d60e30ccece90

Change-Id: I7ad33b745e7a55b078952ca88c9ee5123ffc639b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Hack for fixing waitForCleanShutdown()
Robert Loehning [Wed, 17 Oct 2012 19:39:54 +0000 (21:39 +0200)]
Squish: Hack for fixing waitForCleanShutdown()

Change-Id: I925a59fdd96f161a324375ebee4b4588dfd035fb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Copying project to tempDir in tst_basic_cpp_support
Robert Loehning [Thu, 18 Oct 2012 10:47:06 +0000 (12:47 +0200)]
Squish: Copying project to tempDir in tst_basic_cpp_support

Change-Id: I1788ff642486204beb22bf0a02400c50fbb7f3bf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Removed outdated cleanups
Robert Loehning [Wed, 17 Oct 2012 19:48:46 +0000 (21:48 +0200)]
Squish: Removed outdated cleanups

__removeTmpSettingsDir__() does it all.

Change-Id: Ic1eb2ef02665c5d863956a1587f4f46344743f8e
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoDoc: Update FAQ
hjk [Thu, 18 Oct 2012 12:53:55 +0000 (14:53 +0200)]
Doc: Update FAQ

Change-Id: I0e39f0199652d17dcf483485074b62092fe16d03
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoQnx: Connect to the device before launching the application
mfekari [Wed, 17 Oct 2012 12:06:07 +0000 (08:06 -0400)]
Qnx: Connect to the device before launching the application

Change-Id: Ic3bac7f5abaf363a2334d5c7c2273ae53c3234e6
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoInstaller: Suppress error if newer version of vcredist is already installed
Eike Ziller [Thu, 18 Oct 2012 09:28:49 +0000 (11:28 +0200)]
Installer: Suppress error if newer version of vcredist is already installed

Task-number: QTCREATORBUG-8076

Change-Id: Ia39491569fe696ec27c8375251ce6a0d5923dc1e
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agoAdapt .pro, .qbs files and wizard templates to QtQuick1-renaming.
Friedemann Kleint [Thu, 18 Oct 2012 07:41:05 +0000 (09:41 +0200)]
Adapt .pro, .qbs files and wizard templates to QtQuick1-renaming.

QtQuick1 is now (again) called QtDeclarative.

Change-Id: Ic75f1a47e972cac470730b53e102e9ab71548c47
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
5 years agoVersion bump
Eike Ziller [Thu, 18 Oct 2012 07:41:49 +0000 (09:41 +0200)]
Version bump

Change-Id: Id0b100ae13cdd5edd82614c10bdf0cdeb45e6615

5 years agoVCS: Make 'Patch command' searchable
Orgad Shaneh [Wed, 17 Oct 2012 19:52:42 +0000 (21:52 +0200)]
VCS: Make 'Patch command' searchable

Change-Id: I7b2f813e090a443c3cd4fb771a05c79c8e84e972
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoUpdate the changelog.
Nicolas Arnaud-Cormos [Wed, 17 Oct 2012 15:49:08 +0000 (17:49 +0200)]
Update the changelog.

The QNX plugin is not experimental anymore.

Change-Id: I10dc94135c7b54ab615612c4a2a6345ad0531d5d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agodebugger: Fixed automatic run of self test
Robert Loehning [Fri, 12 Oct 2012 12:30:41 +0000 (14:30 +0200)]
debugger: Fixed automatic run of self test

Change-Id: Icf2c100db571a37bc9e20e0e9cab47a627cfec23
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoDoc: update links on the Technical Support page
Leena Miettinen [Wed, 17 Oct 2012 15:03:25 +0000 (17:03 +0200)]
Doc: update links on the Technical Support page

Change-Id: Idca0e0ebdb846bf3613f1368b16611f09f583a64
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
5 years agoKits: Ensure that kitUpdated is send on apply
Daniel Teske [Wed, 17 Oct 2012 14:32:08 +0000 (16:32 +0200)]
Kits: Ensure that kitUpdated is send on apply

Change-Id: If2afb0d0c9e83c3815e838c6e31d2e2f815e3ac2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoQmlProfiler: prevent details pop-ups to leave screen
Christiaan Janssen [Wed, 17 Oct 2012 13:51:28 +0000 (15:51 +0200)]
QmlProfiler: prevent details pop-ups to leave screen

Task-number: QTCREATORBUG-8058

Change-Id: Id20e9d0573ee52bd0965a4e56c51df2aee6d2fa2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Removed workaround
Robert Loehning [Thu, 11 Oct 2012 12:09:22 +0000 (14:09 +0200)]
Squish: Removed workaround

Bug is fixed in Qt 4.8.3

Task-number: QTCREATORBUG-7215
Change-Id: Idccfa11bf23ef4ed1962a8f84cf039b3de2bb8ea
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoQmlProfiler: Detect interrupted execution
Christiaan Janssen [Tue, 16 Oct 2012 12:52:35 +0000 (14:52 +0200)]
QmlProfiler: Detect interrupted execution

Task-number: QTCREATORBUG-8022

The profiler would switch to state "AppKilled" if the connection was
cut before all the profiling data could be read.  With Qt4.8, however,
the application dies before any data is sent at all, and such state
would never be reached.  This patch fixes the flow of states and
properly detects when an application started profiling successfully
but dies before delivering the data.  If the application doesn't run
at all (for example, launching a QtQuick1.1 app from Qt5), the
profiler fails gracefully without showing the error dialog.

Change-Id: I6fc53127b5dfe41de112e140b77895d430d3f79c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoQmlProject: Enable runconfiguratons after restore
Daniel Teske [Tue, 16 Oct 2012 16:49:46 +0000 (18:49 +0200)]
QmlProject: Enable runconfiguratons after restore

Task-number: QTCREATORBUG-7980

Change-Id: I180bfc999421a13f25f41487d7498f652432b1c5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoQtcPlugin.qbs: use the right name binding in Group
Joerg Bornemann [Wed, 17 Oct 2012 08:14:51 +0000 (10:14 +0200)]
QtcPlugin.qbs: use the right name binding in Group

We're going to add the property Group.name in qbs.
Consequently, Groups must use product.name when accessing the name of
the product.

Change-Id: Id2527300a8a7c26bb742d4111f9d47ded6c492b1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoFix qbs build v2.6.0-rc
Orgad Shaneh [Tue, 16 Oct 2012 19:17:11 +0000 (21:17 +0200)]
Fix qbs build

Change-Id: I73bed3284d491338359c730375c2b81d947dd5a4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoRemove experimental flag from QNX plugin.
Eike Ziller [Wed, 17 Oct 2012 08:38:22 +0000 (10:38 +0200)]
Remove experimental flag from QNX plugin.

Change-Id: I3a3beced9001580ce15a74431ed73c52f432de44
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoSSH: Link Botan objects into libQtcSsh.
Christian Kandeler [Tue, 16 Oct 2012 13:07:16 +0000 (15:07 +0200)]
SSH: Link Botan objects into libQtcSsh.

Using Botan as a shared library is dangerous due to the use of
dynamic_cast and exceptions, which both reproducibly fail to work on
MacOs. Since there are no other users of Botan, we just add its objects
to the SSH library.

Change-Id: Ic79f081d2e1231a52feef02ef5b68761692f1110
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoCMake: Reparse .cbp files on swtiching targets
Daniel Teske [Tue, 16 Oct 2012 15:19:59 +0000 (17:19 +0200)]
CMake: Reparse .cbp files on swtiching targets

Also fix the code to not reparse the wrong file if the bc for a non
active target would be changed.

Task-number: QTCREATORBUG-8063
Change-Id: I40be4bbb1a5ef6ccc78515f153534a7304cae0e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoQNX: Fix environment file parser for newer BB NDK
Tobias Nätterlund [Tue, 16 Oct 2012 11:09:37 +0000 (13:09 +0200)]
QNX: Fix environment file parser for newer BB NDK

The newer NDK specifies the QNX_HOST_VERSION and QNX_TARGET_VERSION
separately, extend the parser to support assignments such as
QNX_HOST_VERSION=${QNX_HOST_VERSION:=10_0_9_52} and the Windows equivalent

Change-Id: I728fa0f6a4f0bd3b435d408794da1a6c8a93bd37
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
5 years agodebugger: ignore new cmd-param-changed notification
hjk [Mon, 15 Oct 2012 14:16:51 +0000 (16:16 +0200)]
debugger: ignore new cmd-param-changed notification

Might be useful in the future. Not now.

Change-Id: I7255df2d56b477aaf30ebf4b9823f12e8713931c
Reviewed-by: hjk <qthjk@ovi.com>
5 years agodebugger: don't restrict kit selection for attaching
hjk [Tue, 16 Oct 2012 13:37:42 +0000 (15:37 +0200)]
debugger: don't restrict kit selection for attaching

Change-Id: I5bf9f57cb551c5fc3d02485c2e25a2ef914d5b53
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoDoc: fix a link to the doc server in the CSS
Leena Miettinen [Tue, 16 Oct 2012 13:42:14 +0000 (15:42 +0200)]
Doc: fix a link to the doc server in the CSS

Change-Id: If41f459cdf474f6a6e63fa85f151f730091c59b6
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>