qt-creator:qt-creator.git
3 years agoios: simulator support for Xcode 5.1 3.0
Fawzi Mohamed [Thu, 13 Mar 2014 23:07:35 +0000 (00:07 +0100)]
ios: simulator support for Xcode 5.1

update iossim to be based on version 1.9.0, so that we can support
the new Xcode 5.1. Keep the old version around and use it
with older Xcode.
All the logic has been moved into iossim which does an exec of the
older binary if needed (so that creator itself remains untouched)

Task-number: QTCREATORBUG-11714
Change-Id: I4ad9f922f22367c8371b3be68eae5b6dfdf4df5c
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoQNX: Fix QML analyzer on pure QNX targets
Tobias Nätterlund [Tue, 11 Feb 2014 09:55:24 +0000 (10:55 +0100)]
QNX: Fix QML analyzer on pure QNX targets

Change-Id: Ib67b696b7938eb4de1b67b211b7f529651cdb99a
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
3 years agofix raw data leak in $$sprintf()
Oswald Buddenhagen [Wed, 5 Feb 2014 20:26:37 +0000 (21:26 +0100)]
fix raw data leak in $$sprintf()

it could be only triggered by abusing the function (no expansion
actually done), and nobody is using this to start with, but still ...

Change-Id: I3d4a23ae4d1eea07955572d8213094e0dc218f6d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
3 years agomicro-optimization: use ProStringList::join(QChar) overload
Oswald Buddenhagen [Wed, 5 Feb 2014 18:54:01 +0000 (19:54 +0100)]
micro-optimization: use ProStringList::join(QChar) overload

Change-Id: I25c6205df78da7fbee0ad1b04476f528f376b7a6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
3 years agoWelcomeScreen: Changing the "Getting Started Now" button url
Alessandro Portale [Wed, 5 Feb 2014 10:40:25 +0000 (11:40 +0100)]
WelcomeScreen: Changing the "Getting Started Now" button url

We want to reduce the needed number of clicks to the Android setup
info from 4 to 2 clicks. Therefore the main index.html is better.
Also that page does not open in split help, anymore.

Change-Id: Idfd08c78728cb2face6cf9769ca332ac8805eef5
Reviewed-by: Sami Makkonen <sami.makkonen@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoAdd changes file for 3.0.1
Eike Ziller [Wed, 5 Feb 2014 08:38:28 +0000 (09:38 +0100)]
Add changes file for 3.0.1

Change-Id: I2be8c105fcde044b73f3f24be6db560f71524fe5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Do not rely on default installation path
Christian Stenger [Tue, 4 Feb 2014 08:26:29 +0000 (09:26 +0100)]
Squish: Do not rely on default installation path

Change-Id: Iac5d45b3cbdb5ecb18d971b37189b27164abbaf3
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQmlDesigner.StatesEditor: fix warnings
Thomas Hartmann [Mon, 27 Jan 2014 10:12:46 +0000 (11:12 +0100)]
QmlDesigner.StatesEditor: fix warnings

Task-number: QTCREATORBUG-10955
Change-Id: I6a382ed7935463c71103ca51a0a5b4822ab8cfc0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoSquish: Fix running hooked subprocess on Mac
Christian Stenger [Thu, 30 Jan 2014 09:40:59 +0000 (10:40 +0100)]
Squish: Fix running hooked subprocess on Mac

Change-Id: Ib7879aab6227758373023d0164edfc6f10f0e23c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Enter dummy values if committer info is missing
Christian Stenger [Fri, 24 Jan 2014 16:20:06 +0000 (17:20 +0100)]
Squish: Enter dummy values if committer info is missing

Change-Id: Ic97de439b994a359cb0eae977cd0ec3cb780b081
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Unify hack for invoking context menu items on Mac
Christian Stenger [Tue, 28 Jan 2014 13:21:32 +0000 (14:21 +0100)]
Squish: Unify hack for invoking context menu items on Mac

Change-Id: I7e4d1cb00ea75e1aa33fa20b30744ffd56f002de
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Stabilize tst_git_clone
Christian Stenger [Tue, 28 Jan 2014 15:33:23 +0000 (16:33 +0100)]
Squish: Stabilize tst_git_clone

Change-Id: I1aa794669aa5ced25cc983d85a4c14f9b17dd743
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Avoid soft links in path for tst_git_local
Christian Stenger [Tue, 28 Jan 2014 16:05:49 +0000 (17:05 +0100)]
Squish: Avoid soft links in path for tst_git_local

Change-Id: I3217ef41e9539b671cd9398cc268f2adf622ea6f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoVersion bump v3.0.1
Eike Ziller [Wed, 29 Jan 2014 09:37:28 +0000 (10:37 +0100)]
Version bump

Change-Id: Ie852069d4c3f01eb021837644865fdea41a34c54
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Fix hack for tst_designer_autocomplete
Christian Stenger [Fri, 24 Jan 2014 08:51:26 +0000 (09:51 +0100)]
Squish: Fix hack for tst_designer_autocomplete

Change-Id: I17cfa041f42efb71358e11afcaf987e177603175
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoFix unfinished messages in Russian translation
Sergey Belyashov [Tue, 28 Jan 2014 10:48:35 +0000 (14:48 +0400)]
Fix unfinished messages in Russian translation

Change-Id: I263ec0131a5d4546405078dd5d08fe7cd4964803
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoSquish: Do not invoke Exit on AUT inside helper functions
Christian Stenger [Thu, 23 Jan 2014 15:29:05 +0000 (16:29 +0100)]
Squish: Do not invoke Exit on AUT inside helper functions

Quitting the AUT should always be reserved for the main function
of a test case.

Change-Id: I1a90e7c1e327cde37280e9d3130b30216798382c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoUpdate Russian translation
Sergey Belyashov [Mon, 27 Jan 2014 08:52:50 +0000 (12:52 +0400)]
Update Russian translation

Change-Id: Ib95694db02effc1d5cb15c711287b84fe29f9e08
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoUpdate qbs submodule.
Christian Kandeler [Mon, 27 Jan 2014 13:52:05 +0000 (14:52 +0100)]
Update qbs submodule.

To the head of the 1.1 branch.

Change-Id: I83af4c448c1f57f505849a6cd6a79c08f5d9b8a0
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoAllow + for file names in file wizard
Eike Ziller [Mon, 27 Jan 2014 10:13:13 +0000 (11:13 +0100)]
Allow + for file names in file wizard

Since some people want to use e.g. c++ as extension.

Task-number: QTCREATORBUG-11266
Change-Id: I88686d814f49fcbc794c8c3427ee7251b24fa563
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
3 years agoQmlDesigner.PropertyEditor: template LineEdit should fill layout
Thomas Hartmann [Mon, 27 Jan 2014 10:11:36 +0000 (11:11 +0100)]
QmlDesigner.PropertyEditor: template LineEdit should fill layout

Change-Id: I6c537b4a2ee7feace7b0bd63430b7fc442cf81b8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoUse QTC_PLUGIN_DIRS also for generating the dependencies files
Kai Koehne [Fri, 24 Jan 2014 13:38:54 +0000 (14:38 +0100)]
Use QTC_PLUGIN_DIRS also for generating the dependencies files

Use the same logic as in 27563451cb6286 to resolve out-of-source plugin
dependencies when generating the .pluginspec files.

Change-Id: I3a62527ff381aed0e83a7c37a50da403f0a6cece
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Fix hook-into issue on Windows
Christian Stenger [Fri, 24 Jan 2014 09:57:56 +0000 (10:57 +0100)]
Squish: Fix hook-into issue on Windows

Change-Id: I45ec21c6a7a0c5e34e72226fbb442f0ab681fa4d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoPut "Technical Support", "Report Bug..." in a separate menu group
Kai Koehne [Fri, 24 Jan 2014 08:51:52 +0000 (09:51 +0100)]
Put "Technical Support", "Report Bug..." in a separate menu group

This allows other plugins to add actions here.

Change-Id: Id5b751bf719533842ba426ecdb4f98c43a73755b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Unify invoking add custom executable
Christian Stenger [Thu, 23 Jan 2014 08:25:28 +0000 (09:25 +0100)]
Squish: Unify invoking add custom executable

Change-Id: If090ca16a9cc358ff38de5564d2e8ef2a2cf8200
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQNX: Fixed password not being saved when using devize wizard
Tobias Naetterlund [Fri, 24 Jan 2014 05:23:32 +0000 (06:23 +0100)]
QNX: Fixed password not being saved when using devize wizard

Task-number: QTCREATORBUG-11092

Change-Id: I150218ec3dabde35e5d3e0ba95916d47743786c2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
3 years agoQmlDesigner.PropertyEditor: Use URlChooser for BorderImage
Thomas Hartmann [Thu, 23 Jan 2014 09:51:21 +0000 (10:51 +0100)]
QmlDesigner.PropertyEditor: Use URlChooser for BorderImage

Task-number: QTCREATORBUG-11331
Change-Id: I1cd09079ea3441639aa91f29d504e7bb8771d080
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Stabilize tst_git_local
Robert Loehning [Thu, 23 Jan 2014 12:01:24 +0000 (13:01 +0100)]
Squish: Stabilize tst_git_local

Change-Id: Icc0f3ae2f4702398bbbc46b309b23ffe69daf778
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoPick up QTC_PLUGIN_DIRS from environment
Kai Koehne [Wed, 22 Jan 2014 15:34:58 +0000 (16:34 +0100)]
Pick up QTC_PLUGIN_DIRS from environment

Setting QTC_PLUGIN_DIRS as an environment variable is easier
to manage than passing it every time explicitly to e.g. the qmake
call. It also is in line with other environment variables used in
Qt Creator, like WITH_LLDB, QT_BREAKPAD_ROOT_PATH etc.

Change-Id: Ief94aaf7c2a16ee62dcbf27c9f217496b1f74ad5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoProjectNameValidatingLineEdit: Fix WS
Tobias Hunger [Thu, 23 Jan 2014 10:33:55 +0000 (11:33 +0100)]
ProjectNameValidatingLineEdit: Fix WS

Change-Id: I41b5fdee5d4f143ca68cc1c6d07cd0860fe9d810
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoSquish: Avoid crash in tst_designer_goto_slot on Mac
Christian Stenger [Thu, 23 Jan 2014 09:56:50 +0000 (10:56 +0100)]
Squish: Avoid crash in tst_designer_goto_slot on Mac

Again this is related to Squish 5 having problems handling menus
on Qt5.2 built applications.

Change-Id: Ie256b2d93259baaf86beaa1a5d9fbed2248ac2ef
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Avoid crash in tst_designer_autocomplete on Mac
Christian Stenger [Thu, 23 Jan 2014 09:39:50 +0000 (10:39 +0100)]
Squish: Avoid crash in tst_designer_autocomplete on Mac

Again this is related to Squish 5 having problems handling menus
on Qt5.2 built applications.

Change-Id: Ia017b48db5b6ab816a50504abc05c086fdf65799
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Update qt_squish_mapping.tsv
Christian Stenger [Wed, 22 Jan 2014 11:30:29 +0000 (12:30 +0100)]
Squish: Update qt_squish_mapping.tsv

Packages for Squish5/Qt5.0 are now provided as well.

Change-Id: I7bcd660bca33deaa09f4b62a583e1118ed5e3d06
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Update Qt Quick hooking stuff...
Christian Stenger [Wed, 22 Jan 2014 08:39:04 +0000 (09:39 +0100)]
Squish: Update Qt Quick hooking stuff...

...to differentiate between Qt Quick 1 and Qt Quick 2 when using
no additional function on the subprocess.

Change-Id: Ia345a1503128be0c5b81a010c438009bf41d93b5
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoWelcomePage: Use TextField instead of TextInput
Thomas Hartmann [Wed, 22 Jan 2014 13:29:47 +0000 (14:29 +0100)]
WelcomePage: Use TextField instead of TextInput

Task-number: QTCREATORBUG-11325
Change-Id: I542d592db0d1414a5c0cc93b5bd3bb1c1f1f7702
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Stabilize tst_simple_debug on Mac
Christian Stenger [Wed, 22 Jan 2014 14:50:59 +0000 (15:50 +0100)]
Squish: Stabilize tst_simple_debug on Mac

Change-Id: Ibcf179a1d10c0e735fe408a7f738309834d8abc4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQmlDesigner.PropertyEditor: Using :ICore::mainWindow() for dialogs
Thomas Hartmann [Wed, 22 Jan 2014 13:00:38 +0000 (14:00 +0100)]
QmlDesigner.PropertyEditor: Using :ICore::mainWindow() for dialogs

Since the current focus is on (native) QtQuickView window we have to
specify the Qt Creator main window.

Task-number: QTCREATORBUG-11322
Change-Id: I0e05efaa88b6177004730cd8c43010568cf64eac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQmlDesigner.QmlPuppet: Adding CONFIG += console
Thomas Hartmann [Wed, 22 Jan 2014 12:43:28 +0000 (13:43 +0100)]
QmlDesigner.QmlPuppet: Adding CONFIG += console

This is required for the version check,

Change-Id: I9845260b029e8e01eb71e92c78d40f2a842a5f46
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoRemoteLinux: Unbreak stopping processes
Daniel Teske [Wed, 22 Jan 2014 08:25:51 +0000 (09:25 +0100)]
RemoteLinux: Unbreak stopping processes

Broke in 22599094b0d72e271ba4d8bad2c1587f9ce75c69

Change-Id: Iadd96a8fb078447db66e0392585da57b9d06200e
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoios: fix iosrunconfiguration m_arguments persistency
Fawzi Mohamed [Thu, 16 Jan 2014 17:35:36 +0000 (18:35 +0100)]
ios: fix iosrunconfiguration m_arguments persistency

Change-Id: I11b719725ed788cbdd97b0e64d69880949634905
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoSquish: Replaced lot of signal code by one simple function
Robert Loehning [Tue, 21 Jan 2014 16:29:35 +0000 (17:29 +0100)]
Squish: Replaced lot of signal code by one simple function

Change-Id: Idb6b663a8b2be217d8769fab5e2f6f9290f37990
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Fix condition in project.py
Christian Stenger [Tue, 21 Jan 2014 15:59:09 +0000 (16:59 +0100)]
Squish: Fix condition in project.py

This error was introduced in 0f04c2b3b0aff319733c4123d2b4511ed7743f74.

Change-Id: Ifdaa18d4267daff1e59c5ced3cfc188beb4c52c9
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Clear analyzer results after verification
Christian Stenger [Tue, 21 Jan 2014 12:51:47 +0000 (13:51 +0100)]
Squish: Clear analyzer results after verification

Change-Id: Ic475704773770d7d17361c96947734681e959fea
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoCppTools: Fix completion for nested enums
Orgad Shaneh [Sun, 15 Dec 2013 14:35:43 +0000 (16:35 +0200)]
CppTools: Fix completion for nested enums

Task-number: QTCREATORBUG-5456

Change-Id: I0bb4756e3cdf3c87a4c2b0fbfe6953faaa5e1c52
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
3 years agoios: fix handling of command characters in run
Fawzi Mohamed [Thu, 9 Jan 2014 14:47:05 +0000 (15:47 +0100)]
ios: fix handling of command characters in run

Xml does not support control characters (even if encoded), thus
QXmlStreamWriter does not encode them, and QXmlStreamReader gives an
error with them.
Thus outputting a control char would stop the application.
Now we send them with a special tag and decode them.
Note that the Output pane does some emulation of terminal behavior
when receiving them.
Sending app output as block because otherwise the stange logic
within the OutputPane inserts spurious newlines (a string not
containing a newline always gets a newline prepended) .

Task-number: QTCREATORBUG-11219
Change-Id: I3557ffbb23ca2ea4eec9a97335a95580c9c4482b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoSquish: Fix issue with menu invocation on Mac
Christian Stenger [Mon, 20 Jan 2014 10:30:02 +0000 (11:30 +0100)]
Squish: Fix issue with menu invocation on Mac

Squish 5 has problems to handle menus on Mac for Qt5.2 builds.

Change-Id: I533f8fcd2c8a2786ae354cd92e92efad0fb1dd57
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Wait for parsing in __configureCustomExecutable__()
Robert Loehning [Mon, 20 Jan 2014 17:35:19 +0000 (18:35 +0100)]
Squish: Wait for parsing in __configureCustomExecutable__()

Change-Id: I798a29aa9a4676edd1493f4973d29f8725e117e5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Extend tst_git_local
Christian Stenger [Wed, 15 Jan 2014 16:45:38 +0000 (17:45 +0100)]
Squish: Extend tst_git_local

Change-Id: I4160e3f8e7f43f9711b3436693aeb3b333208faf
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Let tst_debug_empty_main continue on error
Christian Stenger [Mon, 20 Jan 2014 09:37:12 +0000 (10:37 +0100)]
Squish: Let tst_debug_empty_main continue on error

Change-Id: Ic0772f96c3d99af1d2001ca599820bc61192281c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Eliminate another signal handler
Robert Loehning [Mon, 20 Jan 2014 11:48:35 +0000 (12:48 +0100)]
Squish: Eliminate another signal handler

Change-Id: I6f89d908366257ab2dbd5d0a48f77f41e131ae12
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoDoc: make the Android setup instructions more prominent
Leena Miettinen [Fri, 17 Jan 2014 09:19:58 +0000 (10:19 +0100)]
Doc: make the Android setup instructions more prominent

Feedback from users indicates that they cannot find the
instructions for setting up the Android development environment.
Added links to the instructions in several high level topics.
Also, moved the Qt 5 instructions above the Qt 4 instructions
in "Connecting Android Devices".

Change-Id: Ie31bc27b959ac5a7146f00a576a900b932c07a98
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Nico Vertriest <nico.vertriest@digia.com>
3 years agoValgrind: Initialize shortenTemplates-setting.
Friedemann Kleint [Fri, 17 Jan 2014 13:53:27 +0000 (14:53 +0100)]
Valgrind: Initialize shortenTemplates-setting.

Purify reports "Uninitialized Memory Read" for shortenTemplates.

Change-Id: Ieab51cd78bf9fc7bbc539ef3158e0f57a12579d7
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Fix tst_rename_file on Mac
Christian Stenger [Thu, 16 Jan 2014 14:33:02 +0000 (15:33 +0100)]
Squish: Fix tst_rename_file on Mac

Change-Id: Idca881989a673d3f220379d3a233c851ee75e248
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Add workaround to avoid AUT crash on Mac
Christian Stenger [Thu, 16 Jan 2014 16:37:08 +0000 (17:37 +0100)]
Squish: Add workaround to avoid AUT crash on Mac

The crash was actually only in tst_SCOM05 as WELP suite is
completely disabled.

Change-Id: I32d9bef43dc50eb8d3c71a5b1d6e7894c7d74276
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Add expected error message for newer Xcode
Christian Stenger [Thu, 16 Jan 2014 15:14:07 +0000 (16:14 +0100)]
Squish: Add expected error message for newer Xcode

Change-Id: Ib6af4b61d4ca7bd32b3e3e9dcb837a91692a1dfe
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Fix tst_default_settings for Mac
Christian Stenger [Thu, 16 Jan 2014 13:05:20 +0000 (14:05 +0100)]
Squish: Fix tst_default_settings for Mac

lldb from Xcode is recognized as well.

Change-Id: I4c79b5362ced38461aa4f823d4e303093f81fcac
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQmakeParser: Do not leak temporaries into cache of files
Tobias Hunger [Tue, 14 Jan 2014 13:21:10 +0000 (14:21 +0100)]
QmakeParser: Do not leak temporaries into cache of files

This prevents an access to free'd memory when opening qtcreator.pro.

Looks like qml2puppet.pro gets added to that cache in QMakeVfs::writeFile
with part of the including pro-file's filename in it. That part gets
cleaned when that containing ProFile goes out of scope, leaving a key in
QMakeVfs::m_files free'd but accessible.

Change-Id: I80b43d2fbb66c214647497ea97e6e3a587e274d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoAndroidDebugSupport: Set more accurate so-libsearch path
Daniel Teske [Thu, 16 Jan 2014 14:55:12 +0000 (15:55 +0100)]
AndroidDebugSupport: Set more accurate so-libsearch path

Task-number: QTCREATORBUG-10382

Change-Id: I6c38fda8a4bf70ae93f6ec7dd671878589056124
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
(cherry picked from commit eb5b9596398c401d043d20f81fd8b68b02ec5168)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoQmlDesigner.ContextMenu: Crash fix
Thomas Hartmann [Fri, 17 Jan 2014 09:09:23 +0000 (10:09 +0100)]
QmlDesigner.ContextMenu: Crash fix

The root item cannot be "filled".
Adding a try catch block just in case.

Task-number: QTCREATORBUG-10476
Change-Id: Ic5c5efddd78194275d7d6e393eb945d6c9d89ed0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoQmlDesigner.PropertyEditor: Adding label to origin control
Thomas Hartmann [Tue, 14 Jan 2014 14:34:48 +0000 (15:34 +0100)]
QmlDesigner.PropertyEditor: Adding label to origin control

Task-number: QTCREATORBUG-11229
Change-Id: Ie884565f1cc75fc9554466b8fdea413f385c9200
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoqml: avoid dumping or reading type info multiple times
Fawzi Mohamed [Thu, 16 Jan 2014 10:43:59 +0000 (11:43 +0100)]
qml: avoid dumping or reading type info multiple times

Change-Id: Id0c52f6a96a5c36893f64cbc96cc7eee300e6afa
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoqml: accept qmltypeinfo with larger minor version
Fawzi Mohamed [Thu, 16 Jan 2014 10:41:25 +0000 (11:41 +0100)]
qml: accept qmltypeinfo with larger minor version

Change-Id: I56559f6d9bd128069e2c270e033c958a6a239c3a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoGit: Fixed bug with branches missing from a list
Petar Perisin [Wed, 15 Jan 2014 19:38:44 +0000 (20:38 +0100)]
Git: Fixed bug with branches missing from a list

Change-Id: Id4fa9f6c4f874c9b1ac5112efceaf0c22ed84d00
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
3 years agodo not look for mkspecs/ directories in project trees
Oswald Buddenhagen [Mon, 16 Dec 2013 13:25:55 +0000 (14:25 +0100)]
do not look for mkspecs/ directories in project trees

this pretty surprising behavior would interfere with building the
examples from an installed qt tree with qmakes from other qt builds.

.qmake.conf (and .qmake.cache) files provide a possibility to explicitly
"anchor" project roots, so there is no point in having a second, even
more magic way to do it.

Task-number: QTBUG-35485
Change-Id: I8fd4fda67cabafdf55e7a98282dcdfaffb4a405e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
(cherry picked from qtbase/65a676372c533e8b35117081ec0aa1a94e1500e5)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
3 years agoSquish: Fix tst_git_clone
Christian Stenger [Wed, 15 Jan 2014 09:40:24 +0000 (10:40 +0100)]
Squish: Fix tst_git_clone

Change-Id: I9ee7bfb01d2618f426450182552cec0263af02ec
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQmlDesigner.PropertyEditor: fixing layout issues
Thomas Hartmann [Wed, 15 Jan 2014 11:12:23 +0000 (12:12 +0100)]
QmlDesigner.PropertyEditor: fixing layout issues

There were serious layout issues in the property editor.
While not 100% reliable reproducible they were quite annoying (TASK).

The reason for the issues were the existence of several QtQuickViews and
changing visibility of items.
The pane for Item and the empty pane for no selection use different
QtQuickViews in a StackWidget. Somehow visibility of items is not always
updated properly when changing the QtQuickView in the stack.

Solution: Do not use visibility but stack order instead.
For the layout margins/targets all controls are now always visible, but
unused margins/targets get disabled.

Task-number: QTBUG-36141
Change-Id: Iec62b81796301aaf483606d9aca5a4ad3572e98b
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
3 years agoMac: Prevent switching to discrete GPU on startup
Morten Johan Sørvig [Mon, 13 Jan 2014 21:11:12 +0000 (22:11 +0100)]
Mac: Prevent switching to discrete GPU on startup

By default, OpenGL-based apps will switch multi-GPU
Macs over to discrete graphics hardware.

It is possible to prevent this, and it makes sense
to do so for Qt Creator since its users will typically
be more concerned with power usage than raw OpenGL
performance.

Commit 8166a34f makes the necessary change to QtBase
and this commit enables the non-switching behavior
by adding the NSSupportsAutomaticGraphicsSwitching
key to the Info.plist

Change-Id: Iea6ef4b4922645f792cfb9b8b0b8860f5b2c0674
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
3 years agoQmlDesigner.PropertyEditor: Crash fix
Thomas Hartmann [Tue, 14 Jan 2014 16:20:17 +0000 (17:20 +0100)]
QmlDesigner.PropertyEditor: Crash fix

There is no guarantee that the selection is still valid, when
changeExpression() is called. The signal might be triggered by an
EditingFinished() signal that was emitted after the selection was changed.

Just ignoring the change is not the ideal solution, but there is not much
more we can do.

Task-number: QTCREATORBUG-11249
Change-Id: I770dade680b0b8a052efd910b636829d1037e3ad
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoSquish: Fix logged output of tst_git_clone
Christian Stenger [Tue, 14 Jan 2014 15:31:09 +0000 (16:31 +0100)]
Squish: Fix logged output of tst_git_clone

The clone log contains escape as a character (unicode 0x1b) which
makes the creation of the results.xml fail. This patch removes these
for unquoted text logs.

Change-Id: Ia5312c4cf41dbf9c40732e48ebe4694f79f39bb2
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoQmlDesigner.MetaInfo: Adding convincience function for testing
Thomas Hartmann [Tue, 14 Jan 2014 13:13:40 +0000 (14:13 +0100)]
QmlDesigner.MetaInfo: Adding convincience function for testing

Change-Id: Ic9faddd21fdf80357b1360951a1cc054546866e9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoQmlDesigner.PropertyEditor: Ading missing QtQuick 2 only properties
Thomas Hartmann [Tue, 14 Jan 2014 14:08:51 +0000 (15:08 +0100)]
QmlDesigner.PropertyEditor: Ading missing QtQuick 2 only properties

Those properties are QtQuick 2 only and were missing in the
property editor.

Change-Id: Ie58a4eac86b945bdde24d32fc373396268bb593e
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
3 years agoQmlDesigner.MetaInfo: Properly resolve prototypes from different plugins
Thomas Hartmann [Tue, 14 Jan 2014 13:12:55 +0000 (14:12 +0100)]
QmlDesigner.MetaInfo: Properly resolve prototypes from different plugins

If there is a non <cpp> export for the CppComponentValue
we use it.

Task-number: QTCREATORBUG-11205
Change-Id: Ia82c8fc5f567245f5d04b0fd91819bf443312e17
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoQmlDesigner.FormEditor: crash fix
Thomas Hartmann [Tue, 14 Jan 2014 11:28:25 +0000 (12:28 +0100)]
QmlDesigner.FormEditor: crash fix

Anchors and/or anchor targets might be invalid.
e.g.: anchors.left: parent

We have to check this.

Task-number: QTCREATORBUG-11255
Change-Id: Ib939292d0f89cc1d22119972627c03f1e85043db
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoQmlProfiler: Hide timline and show loading indicators when profiling
Ulf Hermann [Thu, 9 Jan 2014 16:23:41 +0000 (17:23 +0100)]
QmlProfiler: Hide timline and show loading indicators when profiling

This is a temporary fix to work around the fact that the profiler's
loading indicator won't show on top of the timeline view. It's not
particularly beautiful but at least the UI doesn't just "hang" anymore.
A final solution has to be provided in qtdeclarative by allowing widgets
to be placed on top of QML scenes. In principle it's also possible to
change the loading indicators to be actual windows and by doing that have
them stay on top, but the result would be very messy.

Change-Id: Ic774b0792786d7d278da5ba0beda4531f0dba77d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoUpdate Russian translation
Sergey Belyashov [Fri, 10 Jan 2014 07:42:33 +0000 (11:42 +0400)]
Update Russian translation

Change-Id: I7a103dd3b416999be9a67fee7b839e42d596ec2f
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoDebugger: Ensure maximum number of elements in QMap display
hjk [Mon, 13 Jan 2014 11:18:51 +0000 (12:18 +0100)]
Debugger: Ensure maximum number of elements in QMap display

Change-Id: I7de69c49245daf03ffd3e257cbd08f25b7bedd1d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
3 years agoMainWindow: Delay restoreWindowState
Orgad Shaneh [Sun, 12 Jan 2014 07:08:18 +0000 (09:08 +0200)]
MainWindow: Delay restoreWindowState

QLayout calls setMinimumSize, which breaks maximized state on Windows.

Task-number: QTCREATORBUG-9586
Change-Id: Ibd9ceb8bccbdf26c6369e86ad4918835d645ca1e
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoUpdater: Only try to fetch updates once (even if it fails)
Kai Koehne [Wed, 11 Dec 2013 13:33:04 +0000 (14:33 +0100)]
Updater: Only try to fetch updates once (even if it fails)

Do not repeatedly try to fetch updates, but only once.

Change-Id: Id177b6677077e97132c7b40af3de35015a9c7658
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoDebugger: More robust way to dereference lldb.SBValue
hjk [Fri, 10 Jan 2014 11:42:12 +0000 (12:42 +0100)]
Debugger: More robust way to dereference lldb.SBValue

Change-Id: Id8f2ad9e46c88302d523b879558f65b4a86b0e2c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoDoc: using modifiers for snippet variable values
Leena Miettinen [Fri, 10 Jan 2014 15:15:15 +0000 (16:15 +0100)]
Doc: using modifiers for snippet variable values

You can use the :c, :l, and :u modifiers to convert the
case of variable values.

Change-Id: I4abffcf1b4545eafdef0d243e68813076e8fc1ce
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoQnx: Add missing placeholders to labels
El Mehdi Fekari [Mon, 11 Nov 2013 15:08:12 +0000 (16:08 +0100)]
Qnx: Add missing placeholders to labels

Change-Id: I472cacaea48495bb039b18426bbb2010673d1a65
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoFix change-of-sign warning found by ICC
Thiago Macieira [Fri, 6 Dec 2013 07:29:37 +0000 (23:29 -0800)]
Fix change-of-sign warning found by ICC

-1 is not a valid unsigned value.

registerhandler.cpp(354): warning #68: integer conversion resulted in a change of sign
          return createIndex(row, col, TopLevelId);
                                       ^

Change-Id: I41935255704f19724d6cec16ea470e2f8f8a16a1
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoWelcomPage: Fix intitial filtering by Qt version
Thomas Hartmann [Thu, 2 Jan 2014 17:46:42 +0000 (18:46 +0100)]
WelcomPage: Fix intitial filtering by Qt version

When having multiple Qt versions with examples registered in Creator,
the welcome mode showed all of them initially.

The reason was that m_uniqueQtId was initialized with noQtVersionsId
instead of uniqueQtVersionIdSetting().

The function uniqueQtVersionIdSetting() gets the correct Qt version from
the settings as shown in the combobox.

Task-number: QTCREATORBUG-10790

Change-Id: I9f435f6372f8b0c0495daf6c6efcf4bcc5e70455
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoWindows: Fix stepping through Qt sources.
Eike Ziller [Thu, 9 Jan 2014 08:33:50 +0000 (09:33 +0100)]
Windows: Fix stepping through Qt sources.

Build paths of Qt 5.2 changed.

Task-number: QTCREATORBUG-11233
Change-Id: I9e3b2d53cb10f09bc1b9d780669ebb72c595ad4f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoSquish: Add workaround for native file dialogs on Win
Christian Stenger [Wed, 8 Jan 2014 14:25:14 +0000 (15:25 +0100)]
Squish: Add workaround for native file dialogs on Win

Current Squish fails to hook into native file dialogs for
Qt5 builds. The workaround forces Qt Creator to use QFileDialog.

Change-Id: I3a28314bab54178d93cda85c0a36e9202f037c9c
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoFix compilation
Orgad Shaneh [Wed, 8 Jan 2014 18:21:44 +0000 (20:21 +0200)]
Fix compilation

Unused variable

Change-Id: I190d8adf6efba8273ded2288c7232a1e77ef62f9
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agotemplates: fix controls template for ios
Fawzi Mohamed [Wed, 8 Jan 2014 13:59:28 +0000 (14:59 +0100)]
templates: fix controls template for ios

Task-number: QTCREATORBUG-10873
Change-Id: Idb20aece719bedbf4b505e6500ec62a7be916c11
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
3 years agoFix compilation when declarative private headers are absent
Orgad Shaneh [Wed, 8 Jan 2014 13:47:47 +0000 (15:47 +0200)]
Fix compilation when declarative private headers are absent

Change-Id: I1a58d9bce7c0c6409b0473e81913d7d207b88444
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
3 years agoios: speed up device debugging
Fawzi Mohamed [Tue, 10 Dec 2013 11:53:20 +0000 (12:53 +0100)]
ios: speed up device debugging

Correctly use the device specific cached symbols to avoid downloading
them from the device (big slowdown).

Task-number: QTCREATORBUG-10884
Change-Id: Ic82482e4b1dadf55f695a67fd420ac1b095a3ca1
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoMake good for missing year update
Robert Loehning [Wed, 8 Jan 2014 11:01:47 +0000 (12:01 +0100)]
Make good for missing year update

Change-Id: I4d100538e05e2669908df5b0a0cc2156da181863
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoMore change log
Eike Ziller [Mon, 9 Dec 2013 14:33:28 +0000 (15:33 +0100)]
More change log

Change-Id: I608811fa480a94e0e3d65fbfb24d2425e7b4049d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
3 years agoSquish: Give subprocess some seconds to quit
Robert Loehning [Wed, 8 Jan 2014 09:48:00 +0000 (10:48 +0100)]
Squish: Give subprocess some seconds to quit

Change-Id: I83ca568b88537fca189425de1795b82eaca66105
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoIncremented year in copyright info
Robert Loehning [Tue, 7 Jan 2014 12:27:11 +0000 (13:27 +0100)]
Incremented year in copyright info

Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
3 years agoDebugger: Change default to use c++11 in manual tests
hjk [Tue, 7 Jan 2014 14:42:26 +0000 (15:42 +0100)]
Debugger: Change default to use c++11 in manual tests

Change-Id: Id995ee20b231dc4179eed0b03b139fdcb9ffb60a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
3 years agoDebugger: Fix importing plain dumpers with newer gdbs
hjk [Tue, 7 Jan 2014 14:19:09 +0000 (15:19 +0100)]
Debugger: Fix importing plain dumpers with newer gdbs

Change-Id: Id0441ed8bb4ca1a116157e033bd711ece0e2b2ed
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoSquish: Make some variables local
Robert Loehning [Tue, 7 Jan 2014 13:30:39 +0000 (14:30 +0100)]
Squish: Make some variables local

Change-Id: I1687ae59c6327616ee18f6120dca9d0d0ce40bcf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoCppTools: Fix test_modelmanager_defines_per_project
Nikolai Kosjar [Tue, 7 Jan 2014 10:54:45 +0000 (11:54 +0100)]
CppTools: Fix test_modelmanager_defines_per_project

The example project parts had no project file set and thus the "right"
project part could not be determined in cppeditor.cpp:718.

Change-Id: I088571e9d3c3c8790670bbdd8e68190835a85ad5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
3 years agoDebugger: Use more direct breakpoint setting in dumper auto test
David Schulz [Mon, 25 Nov 2013 07:33:33 +0000 (08:33 +0100)]
Debugger: Use more direct breakpoint setting in dumper auto test

Change-Id: Ibb24ded55ba02b908b63d71f1f872c73ee7b011b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agomake sure Xlib is in our dependencies
Oswald Buddenhagen [Mon, 16 Dec 2013 15:27:26 +0000 (16:27 +0100)]
make sure Xlib is in our dependencies

Task-number: QTCREATORBUG-11107
Change-Id: I5d0bc2cb34a1c02e2c310df4bd40fa9df198292d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoDebugger: Fix std::{shared,unique}_ptr display
hjk [Mon, 6 Jan 2014 17:08:01 +0000 (18:08 +0100)]
Debugger: Fix std::{shared,unique}_ptr display

Regression in 3.0.

Change-Id: I8772176dc6ed75fb0f9c976632defacebe9d3589
Reviewed-by: Christian Stenger <christian.stenger@digia.com>