5 years agoCheckout correct branch of the binary-artifacts repository. 2.7
David Schulz [Wed, 26 Jun 2013 14:18:34 +0000 (16:18 +0200)]
Checkout correct branch of the binary-artifacts repository.

Change-Id: I66e27b54b59874f5f69958cf9e178a5ce1b2da97
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoAndroidPackageCreationStep: Ensure right thread for handleOutput() v2.7.2
Daniel Teske [Wed, 26 Jun 2013 16:18:25 +0000 (18:18 +0200)]
AndroidPackageCreationStep: Ensure right thread for handleOutput()

The ::run method is run in a separate thread, yet the owner of the
buildstep is the gui thread. As such we need to use a DirectConnection
to ensure that the slot is called in the right thread.

Task-number: QTCREATORBUG-9660
Change-Id: Ia206f3256a23f70f50d31c739359ff24b952fe46
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoQmlProfiler: Avoid idle engine cancelling other engine's process
Kai Koehne [Tue, 25 Jun 2013 15:13:51 +0000 (17:13 +0200)]
QmlProfiler: Avoid idle engine cancelling other engine's process

Task-number: QTCREATORBUG-9643

Change-Id: Ia0a2427a186fd9ad24e1cf620df48be13032a69b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoQnx: add a dependency to the debugger plugin
El Mehdi Fekari [Mon, 24 Jun 2013 09:35:21 +0000 (11:35 +0200)]
Qnx: add a dependency to the debugger plugin

This is already done in Master and 2.8 branches.

Task-number: QTCREATORBUG-9455

Change-Id: I8ae9e5a14ba561640d3389e08cb74a5ec856d335
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoQnx: Fix tag for splashscreens
El Mehdi Fekari [Tue, 25 Jun 2013 11:56:32 +0000 (13:56 +0200)]
Qnx: Fix tag for splashscreens

Task-number: QTCREATORBUG-9626
Task-number: QTCREATORBUG-9083

Cherry-picked: 4ff03aa71a7122d4573d4dc270a0847818842054

Change-Id: I69915d9da91cde39b1bc32f150c30a5e97cba157
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoprocess_stub_unix: fix race condition with reading of env file
Fawzi Mohamed [Mon, 24 Jun 2013 14:41:28 +0000 (16:41 +0200)]
process_stub_unix: fix race condition with reading of env file

The stub incorrectly send its pid before reading the environment file,
and qtcreator does interpret that as sign that it can delete the
environment file.

Task-number: QTCREATORBUG-9024
Change-Id: Id44777abdfdd94aa10815cb00ca27846b95a3ec7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoC++: Handle recursive using/typedef declarations
Nikolai Kosjar [Tue, 11 Jun 2013 08:22:10 +0000 (10:22 +0200)]
C++: Handle recursive using/typedef declarations

Remember using/typedef declarations we have already looked up and
stop if we try it again.

Change-Id: I91bf0aef4df18539a47d015f0113543aef1f692a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit 50a900e509be2e1f448f29be126ba3b7f8173901)

5 years agoC++: Handle recursive auto declarations
Nikolai Kosjar [Tue, 11 Jun 2013 07:22:18 +0000 (09:22 +0200)]
C++: Handle recursive auto declarations

Remember auto declarations we have already looked up and stop if we try
it again.

Task-number: QTCREATORBUG-9503

Change-Id: I989b11609c98bf197ce916d79c9d452294355053
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit 8f1b6656677344e9ca4b6798ddd900725c478b16)

5 years agoFix broken list requests in CodePaster.
Friedemann Kleint [Mon, 17 Jun 2013 10:00:17 +0000 (12:00 +0200)]
Fix broken list requests in CodePaster.

Pastebin.com-support: Remove header from list data.
KDE Paste: Add trailing slash to prevent redirection.

Task-number: QTCREATORBUG-9547
Change-Id: If47c4bc64767efb6f1a17db22ff9e0dbee3841bc
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoQmlDesigner: use correct icon for vertical slider
Thomas Hartmann [Tue, 18 Jun 2013 08:37:00 +0000 (10:37 +0200)]
QmlDesigner: use correct icon for vertical slider

Task-number: QTCREATORBUG-9558

Change-Id: Ib06006ea986eea307bfb6fc3289dce7468de0b48
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoAndroidRunner: Fix CheckPidTimer to not fire forever
Daniel Teske [Fri, 14 Jun 2013 13:49:38 +0000 (15:49 +0200)]
AndroidRunner: Fix CheckPidTimer to not fire forever

- Only start the timer after we are sure that the app is running.
- Stop the timer if we detect that the app was closed.

Task-number: QTCREATORBUG-9545
Change-Id: I7d08b759d3aa5baaa3f82ee09aefb17e7c5fb512
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoDoc: rename index.html as extending-index.html
Leena Miettinen [Fri, 14 Jun 2013 12:58:08 +0000 (14:58 +0200)]
Doc: rename index.html as extending-index.html

Remove the \contextpage commands, as they are only used
in some of the files.

Task-number: QTBUG-31106
Change-Id: Iacbf15a33ab6cb426c2fbfb6fbed03310095f2ba
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoAndroid: Autodetect a value for OpenJDK path
Daniel Teske [Mon, 10 Jun 2013 16:19:08 +0000 (18:19 +0200)]
Android: Autodetect a value for OpenJDK path

First look into the current PATH, secondly into the registry.

Change-Id: I3b1d1ebccb1a85c03979ac3d48740c3de5a6df40
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoAndroid: Set JAVA_HOME in environment and use that environment
Daniel Teske [Mon, 10 Jun 2013 16:18:38 +0000 (18:18 +0200)]
Android: Set JAVA_HOME in environment and use that environment

Change-Id: Ia0f3abad74b7ac423fab621ca22e0f698747c477
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
5 years agoAndroid: Show complete output of ant run
Daniel Teske [Thu, 6 Jun 2013 15:00:46 +0000 (17:00 +0200)]
Android: Show complete output of ant run

Change-Id: I4964e5bf22a715375a7fa080604d16692c956fc2
Reviewed-by: BogDan Vatra <bogdan@kde.org>
5 years agoAndroid: Use '/' in INSTALL_ROOT if sh.exe is in PATH
Daniel Teske [Tue, 4 Jun 2013 14:42:26 +0000 (16:42 +0200)]
Android: Use '/' in INSTALL_ROOT if sh.exe is in PATH

Task-number: QTBUG-31147

Change-Id: Ifdeef2fa96668fdb482fd613eb8766c1ff5e3afd
Reviewed-by: Yoann Lopes <yoann.lopes@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoRemove semi-colon at end of line in project file
Jonathan Liu [Thu, 6 Jun 2013 07:24:37 +0000 (17:24 +1000)]
Remove semi-colon at end of line in project file

Having a semi-colon at the end of line results in a parse error when
processed with qmake.

Change-Id: I9acfe5a7fc5a5db1c802cb70653789cc7edca5e3
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoQmlProfiler: fix potential crash
Christiaan Janssen [Wed, 5 Jun 2013 08:48:16 +0000 (10:48 +0200)]
QmlProfiler: fix potential crash

fixes Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238

Change-Id: Ib7a4e02391513984f1c81a43a5fab490b7f88923
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoFix translation file / build
Eike Ziller [Wed, 5 Jun 2013 10:01:20 +0000 (12:01 +0200)]
Fix translation file / build

Change-Id: I6b48de43028b75a1e477d90334fecb2e7bf30835
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix path error in Chinese translations
You-Ruei Tzeng [Tue, 4 Jun 2013 12:21:16 +0000 (14:21 +0200)]
Fix path error in Chinese translations

Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I5bfe56344497b950951bc5f038ce6868abb2f41a
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoRemove the locations in zh_TW translation file
Liang Qi [Tue, 4 Jun 2013 12:04:03 +0000 (14:04 +0200)]
Remove the locations in zh_TW translation file

Change-Id: Id1b330283a5f6e32300df3dbb2081fd287a2c752
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoAndroid: fixed updating Java files on Windows.
Yoann Lopes [Mon, 3 Jun 2013 17:58:30 +0000 (19:58 +0200)]
Android: fixed updating Java files on Windows.

When looking for lines in Java files that are not supported by the
selected API level, it didn't take into account that line endings are
"\r\n" on Windows. toInt() was failing, trying to convert for example
"10\r" to an integer.

Change-Id: I35478abd40d5ce4621d2320b3a5f5a3514cf9591
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoQmlConsole: Fix bug: Jump to location in editor
Aurindam Jana [Fri, 24 May 2013 14:31:01 +0000 (16:31 +0200)]
QmlConsole: Fix bug: Jump to location in editor

Since the file path starts with file:/// use QUrl to
get local file name.

Task-number: QTCREATORBUG-9337
Change-Id: Icf591fdcab8cb626cfbf844c451a2c87c07b853a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoQmlProfiler: fix dangling pointer in Engine
Christiaan Janssen [Mon, 3 Jun 2013 11:47:04 +0000 (13:47 +0200)]
QmlProfiler: fix dangling pointer in Engine

Task-number: QTCREATORBUG-9391

Change-Id: Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoAndroid: Save MakeExtraSearchDirectory in settings
Tobias Hunger [Tue, 4 Jun 2013 09:45:19 +0000 (11:45 +0200)]
Android: Save MakeExtraSearchDirectory in settings

This will keep the setting from vanishing after the first time
creator is run.

Change-Id: Ie3f99cfbe37fc5c242e5388a87edf3f0bdc08a30
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoProjectExplorerSettings: Keep environmentId.
Tobias Hunger [Mon, 3 Jun 2013 10:56:49 +0000 (12:56 +0200)]
ProjectExplorerSettings: Keep environmentId.

Make sure to not change the environmentId when editing something
in the settings page.

Task-number: QTCREATORBUG-9359
Change-Id: I7fc891cb3a69f08b1c2ea3f963a2deb01ddca9b2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoProjectExplorerSettingsPage: Do not have a const setter.
Tobias Hunger [Mon, 3 Jun 2013 10:56:08 +0000 (12:56 +0200)]
ProjectExplorerSettingsPage: Do not have a const setter.

Change-Id: Ic0a71ce49b9f65894860562b8414772cd839152c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoQnx: Fix slog2er parsing when logs contain \n
El Mehdi Fekari [Wed, 29 May 2013 14:52:14 +0000 (16:52 +0200)]
Qnx: Fix slog2er parsing when logs contain \n

If the logs contain a '\n' the message parts in the new lines are not displayed.
The new line messages are displayed with no buffer details and are ignored
when the parsing is processed.

Cherry-picked: a7fa0dd4b9c113dda6c94b9bd27990424a91c81c

Change-Id: I0e174dd5283a64c4e9b0434c06dd417f1be2c810
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoFix qbs build.
Christian Kandeler [Wed, 29 May 2013 10:11:34 +0000 (12:11 +0200)]
Fix qbs build.

Referring to non-existing files causes an error now.

Change-Id: I51aed8dfdcc92779158b284b849a34f259997e7c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQbs: Update to new way of Qbs announcing warnings
Tobias Hunger [Wed, 29 May 2013 11:08:17 +0000 (13:08 +0200)]
Qbs: Update to new way of Qbs announcing warnings

Change-Id: Ie707a24d5a081c058f838410c1223201ca4021b3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoFix getBundleInformation call.
BogDan Vatra [Wed, 29 May 2013 12:07:12 +0000 (15:07 +0300)]
Fix getBundleInformation call.

getBundleInformation must be called synchronously

Change-Id: Iebe00295e1ef0679fdd6f9b849672d72f5ea998a
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoRemove duplicate module dependencies from qbs files.
Christian Kandeler [Mon, 27 May 2013 08:06:36 +0000 (10:06 +0200)]
Remove duplicate module dependencies from qbs files.

These cause a warning now.

Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoAdd missing QtQuick.Controls/Dialogs/Layouts type descriptions
J-P Nurmi [Tue, 7 May 2013 12:59:39 +0000 (14:59 +0200)]
Add missing QtQuick.Controls/Dialogs/Layouts type descriptions

Task-number: QTBUG-31012
Change-Id: Ic19cc79faaa71a09724445cf961ec16cf16fcbb4
(cherry picked from commit 4dd4bff88601f8092562dfe2082ead360cad90e0)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
5 years agoUkrainian translation update
Victor Ostashevsky [Fri, 24 May 2013 10:11:24 +0000 (12:11 +0200)]
Ukrainian translation update

Change-Id: I8c9bb5bfaac4296fb9089fb3c1e87df2b55afa9e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoDebugger: Fix passing connection when starting from commandline
hjk [Mon, 27 May 2013 07:56:14 +0000 (09:56 +0200)]
Debugger: Fix passing connection when starting from commandline

This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoDebugger: Check start parameter languages for engine type
Aurindam Jana [Fri, 24 May 2013 14:10:14 +0000 (16:10 +0200)]
Debugger: Check start parameter languages for engine type

Change-Id: If5a05d12e7597516510d5726ca6d3418b3393251
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoAndroid: Disable QML Debugging
Aurindam Jana [Fri, 24 May 2013 14:09:37 +0000 (16:09 +0200)]
Android: Disable QML Debugging

Quick fix. Do not merge into 2.8 or master

Task-number: QTCREATORBUG-9342

Change-Id: Ic63d5d858321e381caf9ede7615075e4923a7b35
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoQmlDesigner.Rewriter: bug fix
Thomas Hartmann [Mon, 27 May 2013 08:14:13 +0000 (10:14 +0200)]
QmlDesigner.Rewriter: bug fix

Do not show warnings if recovering from an error.

Change-Id: I748a3f7ae63eb593ddeaa5de2ebf7264a456ac7d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agorename ProductModule into Export
Joerg Bornemann [Fri, 24 May 2013 13:58:33 +0000 (15:58 +0200)]
rename ProductModule into Export

This fixes a bunch of warning when building with the updated qbs

Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
5 years agoDebugger: Enable core dump when choosing executable after core file
Orgad Shaneh [Fri, 24 May 2013 14:17:08 +0000 (17:17 +0300)]
Debugger: Enable core dump when choosing executable after core file

Change-Id: I7385308c52babe8092304ffebc6c86f392c42962
Reviewed-by: hjk <hjk121@nokiamail.com>
5 years agoC++: fix crash during code completion with base template class
Przemyslaw Gorszkowski [Sun, 19 May 2013 05:23:57 +0000 (07:23 +0200)]
C++: fix crash during code completion with base template class

ResolveExpression has to have a reference of ContextLookup. If not there
will be a crash because of deleted instanitated base template class.

Task-number: QTCREATORBUG-9329
Change-Id: I7f8c83da0d81ac6311e76d15a897adbc70b08d75
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
5 years agoWizards: Adding a title to the Qt Quick Controls template
Thomas Hartmann [Tue, 21 May 2013 09:32:09 +0000 (11:32 +0200)]
Wizards: Adding a title to the Qt Quick Controls template

Task-number: QTCREATORBUG-9304
Change-Id: I9faa92bd9c1107066d7d312008a7e10613b414ff
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoUpdate qbs submodule.
Christian Kandeler [Thu, 23 May 2013 15:15:52 +0000 (17:15 +0200)]
Update qbs submodule.

Plus some minor adjustments in the qbs project manager to an API change.

Change-Id: I41ea8571fee7ec666344464ecc4f808bf92f13ce
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQmlDesigner.Instances: custom rendering for QQuickWindow
Thomas Hartmann [Wed, 22 May 2013 14:55:04 +0000 (16:55 +0200)]
QmlDesigner.Instances: custom rendering for QQuickWindow

Change-Id: Id2d9bd6b7f5cecefffddece30bb93a69699beeff
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
5 years agoDebugger: Issue "threadnames" command again
hjk [Thu, 23 May 2013 08:27:31 +0000 (10:27 +0200)]
Debugger: Issue "threadnames" command again

Was accidentally disabled in 066efcd6a60.

Change-Id: I64de0609a254aa2914142a4f75105b4140b6ae5b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoQmlDesigner.MetaInfo: Do not limit running the parent hierarchy
Thomas Hartmann [Thu, 23 May 2013 11:52:30 +0000 (13:52 +0200)]
QmlDesigner.MetaInfo: Do not limit running the parent hierarchy

Change-Id: I95ba118c8ddd7e01117f649f2ff974f2c6ee4444
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoAndroid: Detect conditional dependencies.
Christian Strømme [Thu, 16 May 2013 01:58:26 +0000 (03:58 +0200)]
Android: Detect conditional dependencies.

To solve the problem with libQt5MultimediaQuick_p we need a way to detect
if an application is using both QtMultimedia and QtQuick.
This change adds logic to parse the -dependencies.xml file and look for
lib elements that have the extra attribute "extends". Libs with the
extends attribute will only be added to the list of dependencies, if the
library it extends is available.

Task-number: QTCREATORBUG-9300
Change-Id: I6f3e0a6d9158a91824e1e113f6aab7ec1112dd56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoQmlDesigner: Check for QtQuick 2.1 in states editor
Thomas Hartmann [Tue, 21 May 2013 09:22:32 +0000 (11:22 +0200)]
QmlDesigner: Check for QtQuick 2.1 in states editor

Task-number: QTCREATORBUG-9298
Change-Id: I8660e7d9614e77d23e1ef6515904941505f410dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
5 years agoRussian translation update
Sergey Belyashov [Wed, 3 Apr 2013 18:08:23 +0000 (22:08 +0400)]
Russian translation update

Change-Id: I4ab239307f0c164f27fdb5e1234a9bb55c8ef7ca
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoQmlDesigner.PropertyEditor: also check for HasAnchor
Thomas Hartmann [Tue, 21 May 2013 14:15:33 +0000 (16:15 +0200)]
QmlDesigner.PropertyEditor: also check for HasAnchor

Fixes a bug in conjunction with ApplicationWindow.
Anchors did not update properly.

Change-Id: I95ba118c8dde7e01117f649f2ff974f2c6ee6244
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
5 years agoAndroid: Use mingw32-make if ma-make is not found
Daniel Teske [Mon, 13 May 2013 11:37:31 +0000 (13:37 +0200)]
Android: Use mingw32-make if ma-make is not found

Task-number: QTCREATORBUG-9297

Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoAndroid: Extra search directory to find make on windows
Daniel Teske [Thu, 16 May 2013 13:49:24 +0000 (15:49 +0200)]
Android: Extra search directory to find make on windows

The sdk should set that extra directory, via the sdktool.

E. g. something like
sdktool addKeys android MakeExtraSearchDirectory QString:%DIRECTORY%

where %DIRECTORY% is the bin directory of the bundled mingw.
That is Tools\MinGW\bin for the qt sdk.

Also see:
Task-number: QTCREATORBUG-9297

Change-Id: I487c67b7fb704dd00cf5c6f4f647c8c4fbe8cd3d
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agosdktool: Add operations: Fix adding to a empty map, check the right map
Daniel Teske [Thu, 16 May 2013 13:47:47 +0000 (15:47 +0200)]
sdktool: Add operations: Fix adding to a empty map, check the right map

Change-Id: Iddcf85d3a19bed28baa9bd4c5f964c370f8c9c42
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoDeploy also platforminputcontext plugins
Kai Koehne [Thu, 16 May 2013 10:18:32 +0000 (12:18 +0200)]
Deploy also platforminputcontext plugins

This is required at least with Qt 5.1 / Linux.

Task-number: QTCREATORBUG-8471
Change-Id: I7342193ef40fcc1a3e523d787c7521d6e810cd61
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
5 years agoRemove managed subdirectories in assets when deploying to Android
Eskil Abrahamsen Blomfeldt [Tue, 14 May 2013 13:22:06 +0000 (15:22 +0200)]
Remove managed subdirectories in assets when deploying to Android

We need to make sure there aren't left-over subdirectories in the
assets/ folder when you have used the bundling mechanism for

To make this easier, we fix a bug where a missing slash
would cause multiple libraryPrefix() directories with different
suffixes under assets/ instead of just a single one containing
everything managed by creator. When the slash is added we can
simply remove the whole "assets/" + libraryPrefix() directory

Task-number: QTCREATORBUG-9294
Change-Id: Ie24b55680d247df458bc70bbc15abdce51605627
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoMake it possible for a module to specify bundling single files
Eskil Abrahamsen Blomfeldt [Tue, 7 May 2013 12:25:13 +0000 (14:25 +0200)]
Make it possible for a module to specify bundling single files

To make sure libQt5QuickParticles.so is loaded for Qt Quick
applications, we need to be able to specify bundling
specific files, not just subdirectories.

Task-number: QTCREATORBUG-9299
Change-Id: I743ee5ea714355ba6398378f4f54b6ede64d4c85
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoSquish: Correct shebang locations
Christian Stenger [Wed, 15 May 2013 14:14:11 +0000 (16:14 +0200)]
Squish: Correct shebang locations

Change-Id: I5af2abaff10dc4095d6cf35350068ca08742b6ab
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoSquish: Added copyright headers
Robert Loehning [Wed, 15 May 2013 11:17:33 +0000 (13:17 +0200)]
Squish: Added copyright headers

Change-Id: Icdf2f31f73e8b6eed75954ad31d12d48e00109b5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoSquish: Prepare re-usage of batch editing...
Christian Stenger [Tue, 7 May 2013 09:08:40 +0000 (11:08 +0200)]
Squish: Prepare re-usage of batch editing...

...of the environment variables for the next run.

Change-Id: Iaf383dfa361971c75be0e180d72ab95c5df83ebe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agomake phony_target hack work on mac even with qt 5.1
Oswald Buddenhagen [Tue, 14 May 2013 17:04:03 +0000 (19:04 +0200)]
make phony_target hack work on mac even with qt 5.1

Change-Id: I4198b090840d287c0f8f1655447cdfaa98992c17
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoBump version
Kai Koehne [Tue, 14 May 2013 14:59:06 +0000 (16:59 +0200)]
Bump version

Change-Id: Ia0714b038bc1655bb3b5b44a98f9fd6093bcdf79
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoQmlDesigner.ItemLibrary: Allow non qrc source files
Thomas Hartmann [Tue, 14 May 2013 13:35:38 +0000 (15:35 +0200)]
QmlDesigner.ItemLibrary: Allow non qrc source files

Source files can also be local files relative to the
.metainfo file.

Change-Id: I8b5519a1bf42808a1bfa744b7520fc910eb2aeac
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
5 years agoBundle libgnustl_shared.so directly from Android NDK
Eskil Abrahamsen Blomfeldt [Mon, 13 May 2013 09:39:59 +0000 (11:39 +0200)]
Bundle libgnustl_shared.so directly from Android NDK

We need the logic from 78aa64e06b60bac232fddf87dea3509d1e08c1c0
in the bundle deployment as well. This will ignore
libgnustl_shared.so if the Qt installation contains it (for
compatibility mostly) and it will copy it from the NDK
into the bundle.

Task-number: QTCREATORBUG-9291
Change-Id: I5ab59602a3dc64d728a58dd1ee70153c09deac72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoQNX: Add support for listing processes for pure QNX devices
Tobias Nätterlund [Mon, 29 Apr 2013 13:45:00 +0000 (15:45 +0200)]
QNX: Add support for listing processes for pure QNX devices

Change-Id: Id2d9bd6b7f5ce56ff0d7ece30bb93a69969beecf
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoDoc: Qt Quick Controls in Qt Creator
Leena Miettinen [Wed, 8 May 2013 15:20:20 +0000 (17:20 +0200)]
Doc: Qt Quick Controls in Qt Creator

Describe the Qt Quick 2 UI with Controls wizard and
using controls in Qt Creator.

Change-Id: I95ba128c8dde7e0e117f649f2ff974f2c6ee624c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
5 years agoCMakeOpenProjectWizard: Explicitly add a "cancel" button. v2.7.1
Daniel Teske [Tue, 7 May 2013 16:55:05 +0000 (18:55 +0200)]
CMakeOpenProjectWizard: Explicitly add a "cancel" button.

Task-number: QTCREATORBUG-9264
Change-Id: I7c726177ff855da41d1971245655e8dc24740430
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoInform Qt 5 about the .qmake.cache that we're generating
Tor Arne Vestbø [Wed, 8 May 2013 10:31:34 +0000 (12:31 +0200)]
Inform Qt 5 about the .qmake.cache that we're generating

Change-Id: I2708b8382125302c07f4cce7ef8dcb8af989c78e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix Breakpoint storing in session
Daniel Teske [Tue, 7 May 2013 13:29:53 +0000 (15:29 +0200)]
Fix Breakpoint storing in session

Task-number: QTCREATORBUG-9253

Change-Id: Idf517286394796e516115009789e6ff7df527c91
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoSquish: Corrected verifyBuildAndRun()
Robert Loehning [Tue, 7 May 2013 14:06:16 +0000 (16:06 +0200)]
Squish: Corrected verifyBuildAndRun()

...to deal with the behavior described in QTCREATORBUG-9212

Change-Id: Ic69098be5a09fe6aa85c40218483c2d679584ab3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoQmlDebugging: Attach to QML application
Aurindam Jana [Fri, 26 Apr 2013 07:58:22 +0000 (09:58 +0200)]
QmlDebugging: Attach to QML application

Specify project source directory and sysroot.

Change-Id: Ie9287ef4da023159b131e67de51ffc218c4d2a70
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoQmlProject: Update code model when target changes
Kai Koehne [Thu, 2 May 2013 13:29:33 +0000 (15:29 +0200)]
QmlProject: Update code model when target changes

Change-Id: Ia8008748fb4d35507729c6ae684913e8bf72c985
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
5 years agoFix crash for long properties in outline model
Kai Koehne [Fri, 3 May 2013 14:50:12 +0000 (16:50 +0200)]
Fix crash for long properties in outline model

Make sure the outline model only shows the first line
of a long property value.

Change-Id: Iac8059e927b10c400afec285a6dc6485cbbf49b4
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
5 years agoDoc: edit text about deploying to Android
Leena Miettinen [Mon, 6 May 2013 13:19:04 +0000 (15:19 +0200)]
Doc: edit text about deploying to Android

The default options for Qt 4 and Qt 5 are different.

Add background information about Android packages and
move information about specifying package settings from
the run settings topic to here.

Change-Id: I8ee0fac124e19233e85d17e1e37f060183149675
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
5 years agoQmlDesigner: Fix recursive dirty test
Marco Bubke [Mon, 6 May 2013 12:13:01 +0000 (14:13 +0200)]
QmlDesigner: Fix recursive dirty test

Change-Id: I62cb968eb21bb8399cd1918d68e405c9abe5d6e0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoWizards: QtQuick 2.1 import for Controls
Thomas Hartmann [Mon, 6 May 2013 12:17:10 +0000 (14:17 +0200)]
Wizards: QtQuick 2.1 import for Controls

Since Controls depend on Qt 5.1 we can use
a QtQuick 2.1 import.

Task-number: QTBUG-31011

Change-Id: I7524c54c3b77ccce89cc57292825f02e163fd7aa
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
5 years agoQmlDesigner.PropertyEditor: also support .svg for Image
Thomas Hartmann [Mon, 6 May 2013 11:48:59 +0000 (13:48 +0200)]
QmlDesigner.PropertyEditor: also support .svg for Image

Change-Id: If43e4661881f99d6a6f692981f19a61ac2c0e500
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
5 years agoFakeVim: Focus current editor before handling command line command
hluk [Fri, 26 Apr 2013 16:07:04 +0000 (18:07 +0200)]
FakeVim: Focus current editor before handling command line command

Action like "Switch Header/Source" need to be performed in correct
context, in this case "CppEditor.C++Editor". But while command line is
focused the context is global.

Task-number: QTCREATORBUG-9217
Change-Id: I8680e7d9612e72d23e1ef6515904941505f410d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoQmlDesigner.ItemLibrary: load QML source on startup
Thomas Hartmann [Mon, 6 May 2013 09:21:24 +0000 (11:21 +0200)]
QmlDesigner.ItemLibrary: load QML source on startup

The QML source is now loaded while dragging, which creates

Change-Id: If43e4661881f94d6a6f692981f19a61ac2c0e508
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
5 years agoQmlDesigner.qml2puppet: Adding simple test
Thomas Hartmann [Mon, 6 May 2013 09:34:15 +0000 (11:34 +0200)]
QmlDesigner.qml2puppet: Adding simple test

This test will fail and give an error message, if
inbuild item are missing.

Change-Id: Ib7a33e7d1fbd22f76c8ac31e1dbc68912aa8edaa
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoSquish: Stabilize invoking context menu items on Mac
Christian Stenger [Fri, 3 May 2013 08:31:00 +0000 (10:31 +0200)]
Squish: Stabilize invoking context menu items on Mac

Change-Id: I64ed356b6120c38d51c646ae409bbbc3a4fe9e8e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoSquish: Added timeout for waitFor()
Christian Stenger [Fri, 3 May 2013 07:31:14 +0000 (09:31 +0200)]
Squish: Added timeout for waitFor()

Change-Id: I9d15d03c9b289f41830a57ed659264a324338cc6
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoSquish: Use readFile() if possible
Christian Stenger [Thu, 2 May 2013 14:38:42 +0000 (16:38 +0200)]
Squish: Use readFile() if possible

Change-Id: Ia850e624f24dd57589d7276af22aef1498c3c799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
5 years agoDoc: edit Android dev instructions for Qt 5.1
Leena Miettinen [Fri, 3 May 2013 14:57:37 +0000 (16:57 +0200)]
Doc: edit Android dev instructions for Qt 5.1

Separate the instructions for configuring Qt Creator
for Necessitas and Qt 5.1 to make the process clearer.
Add missing information.

Change-Id: Iac8fb1d9bcdec57783905fae2e9fea1b222d28bb
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoQNX: Fix shutdown of inferior and inserting breakpoints on Windows
Tobias Nätterlund [Fri, 3 May 2013 11:52:52 +0000 (13:52 +0200)]
QNX: Fix shutdown of inferior and inserting breakpoints on Windows

When debugging on a QNX device on Windows, neither
DebugBreakProcess(..) nor "-exec-interrupt" works for interrupting
the inferior process. Neither does sending it a SIGINT signal using
"kill" on the device.

This changes the local gdb process to run under the CtrlC stub on
Windows when debugging on QNX. This enables us to send a Ctrl+C
message to gdb, which interrupts the inferior, and allows us to
insert breakpoints during runtime on Windows.

Change-Id: I4b01fbe81138f3fe7a939a7e64267bac4eb8bf43
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
5 years agoFix deployqt for qt4
Eike Ziller [Fri, 3 May 2013 14:25:59 +0000 (16:25 +0200)]
Fix deployqt for qt4

Don't try to deploy qt quick 2 imports if they aren't there.

Change-Id: I1146ad8a81973af9e80c82caad515fea45b1530e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoDeploy qtquick2 imports for qml2puppet.
Eike Ziller [Fri, 3 May 2013 12:25:23 +0000 (14:25 +0200)]
Deploy qtquick2 imports for qml2puppet.

Task-number: QTCREATORBUG-9235

Change-Id: I9fae92bd9c1a07066d7d312008a7e10613b414f7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoEnable mechanism to bundle Qt in APK
Eskil Abrahamsen Blomfeldt [Fri, 19 Apr 2013 10:27:58 +0000 (12:27 +0200)]
Enable mechanism to bundle Qt in APK

If the Qt version built against is Qt 5, and the deployment
method is "Use libs on device" + "Use local Qt libs", Creator
will copy the required files into the app bundle and set
the necessary meta-data to make the Java code in the app
actually load them from the app bundle.

We also make this deployment method the default on Qt 5.

Change-Id: Ib7a33e7d1fbd22f76c85c31e1dbc68912a38eda8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoC++: Fix crash in code completion.
Erik Verbruggen [Wed, 20 Mar 2013 12:48:20 +0000 (13:48 +0100)]
C++: Fix crash in code completion.

Caused by a dangling pointer of a template instantiation which had been
cloned into the wrong control. The fix is to remove that control and
refer to the control of the bindings (which is the correct one).

Change-Id: I951a60f2e613aae1e4ac901ce99c820212018709
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
5 years agoRemove StatusDisplay.qml from qbs build system
Tobias Hunger [Fri, 12 Apr 2013 13:50:52 +0000 (15:50 +0200)]
Remove StatusDisplay.qml from qbs build system

It is already gone from qmake.

Change-Id: Iad2835d6b937fc7215da070a1c839139419026dd
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
5 years agoGit: Use consistent ordering for Merge Tool dialog
Orgad Shaneh [Thu, 2 May 2013 15:09:38 +0000 (18:09 +0300)]
Git: Use consistent ordering for Merge Tool dialog

On Windows it is "Ignore, Merge Tool, Skip, Abort", while on Linux it is
"Merge Tool, Ignore, Skip, Abort"

That makes Ignore default on Windows, which is confusing

Change-Id: Id7e9e8dd6fd5748d518de4d94db47ae075268627
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
5 years agoWizards: Adding simple wizard for QtQuick.Controls
Thomas Hartmann [Tue, 30 Apr 2013 13:36:33 +0000 (15:36 +0200)]
Wizards: Adding simple wizard for QtQuick.Controls

Change-Id: I80746a3e77f94040a407ce25cec9ad6fac8b6fce
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoUicCodeModelSupport: Make the code not so eager to run uic processes
Daniel Teske [Thu, 21 Mar 2013 18:24:34 +0000 (19:24 +0100)]
UicCodeModelSupport: Make the code not so eager to run uic processes

Instead mostly postpone it until the contents are needed.

Task-number: QTCREATORBUG-9149

Change-Id: I83167537e97fbd965531d990c8073409ff7b0b32
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
5 years agoWelcomePage: Show demos in the examples view
Thomas Hartmann [Thu, 2 May 2013 10:45:54 +0000 (12:45 +0200)]
WelcomePage: Show demos in the examples view

Change-Id: Idc466b7e058375c0e393eb9f9dd2cc8f58abb2af
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoIgnore dirty working directory for qbs submodule
Orgad Shaneh [Tue, 30 Apr 2013 16:50:12 +0000 (19:50 +0300)]
Ignore dirty working directory for qbs submodule

The submodule is mostly used for building against, not
for editing.

On most cases, its internal status is not interesting,
and git scans it for no reason.

Change-Id: Ic290bd78fdb6704a15264a022125c99cf006a0db
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoSquish: Using progressBarWait() instead of waitForSignal()
Robert Loehning [Thu, 25 Apr 2013 17:08:55 +0000 (19:08 +0200)]
Squish: Using progressBarWait() instead of waitForSignal()

Change-Id: Ia87569c080f3b54dd8f78b023408de76eb3c574c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
5 years agoFix crash
Orgad Shaneh [Tue, 30 Apr 2013 18:47:28 +0000 (21:47 +0300)]
Fix crash

Task-number: QTCREATORBUG-9230
Change-Id: I24a6277c9ca5f35c803e276da82ca2b9e9d79f57
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
5 years agoMake sure QtQuick2 plugin is installed into right directory
Kai Koehne [Tue, 30 Apr 2013 13:50:53 +0000 (15:50 +0200)]
Make sure QtQuick2 plugin is installed into right directory

Task-number: QTCREATORBUG-9229

Change-Id: I0ec3fef8cdc795f041c7ec39c1fd6b68a138046f
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Michael Brasser <michael.brasser@live.com>
5 years agoWelcomPage: fix video description
Thomas Hartmann [Tue, 30 Apr 2013 13:34:15 +0000 (15:34 +0200)]
WelcomPage: fix video description

Task-number: QTCREATORBUG-9087

Change-Id: I80866ace00f940000407cc25cecaad6fac8b6eee
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoQmlDesigner.PropertyEditor: allow translation of all strings
Thomas Hartmann [Tue, 30 Apr 2013 11:10:43 +0000 (13:10 +0200)]
QmlDesigner.PropertyEditor: allow translation of all strings

This patches adds the tr checkboxes to all string in the
generated property  sheets.

Task-number: QTCREATORBUG-9184

Change-Id: I4a3ff8120d7ccd5a6b9e11d212f955cd66ba01aa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
5 years agoQmlDesigner.SubComponentManager: We have to use importPaths
Thomas Hartmann [Mon, 29 Apr 2013 15:09:18 +0000 (17:09 +0200)]
QmlDesigner.SubComponentManager: We have to use importPaths

Otherwise we skip items derived from types only available via imports.

Change-Id: I102a4843652029dff777e12594efc4d5e5e50999
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>