3 years agoAdd changes file for 3.2.2 v3.2.2
Eike Ziller [Fri, 10 Oct 2014 07:20:17 +0000 (09:20 +0200)]
Add changes file for 3.2.2

Change-Id: Ibb20ea1a28681bb1037e941c1dd2c2d5575b9513
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
3 years agoSquish: Revert unintended change in expected files
Robert Loehning [Thu, 9 Oct 2014 14:06:58 +0000 (16:06 +0200)]
Squish: Revert unintended change in expected files

This table refers to the contents of v3.2.0.

Reverting change in 8295b503be90c60a8a7e9b722357352917406078

Change-Id: Ic3cd6fcf6a318745c83e871b4d9b6ae109b05813
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Stabilize tst_CSUP03
Robert Loehning [Thu, 9 Oct 2014 12:12:34 +0000 (14:12 +0200)]
Squish: Stabilize tst_CSUP03

Change-Id: Id90b102d926c90e53c3a8a610ac464cb6876dc5d
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Fix expected tree
Christian Stenger [Mon, 6 Oct 2014 10:57:02 +0000 (12:57 +0200)]
Squish: Fix expected tree

On Windows valgrind autotests are disabled.

Change-Id: I86323eba3d08e7ef245e1bcfbd799fce8ad29b9e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoLicense update
Eike Ziller [Wed, 1 Oct 2014 11:21:18 +0000 (13:21 +0200)]
License update

Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
3 years agoCMakeProjectManager: Fix crash on selecting make target
Daniel Teske [Mon, 6 Oct 2014 10:02:36 +0000 (12:02 +0200)]
CMakeProjectManager: Fix crash on selecting make target

Task-number: QTCREATORBUG-13129
Change-Id: Ie964e547809ee7626c526a6a3f5741f19b8a2f0f
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoUpdate qbs submodule.
Christian Kandeler [Tue, 7 Oct 2014 11:24:44 +0000 (13:24 +0200)]
Update qbs submodule.

And do the required adaptation in QbsProjectManager.

Change-Id: Ib383ebf99ceb638a545158d426769bf963086a1a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoAndroid: Be more careful in androidVirtualDevices()
Daniel Teske [Wed, 24 Sep 2014 10:22:14 +0000 (12:22 +0200)]
Android: Be more careful in androidVirtualDevices()

The backtrace in QTCREATORBUG-13081 suggest that something with
dev.serialNumber is wrong. The input (attached to the bug report) does
not indicate why we would misparse it. So add checking code
to all places where we index into line.

Change-Id: Ic8e4afb763dc1c899e9a1d0503d6494e2aea1223
Reviewed-by: BogDan Vatra <bogdan@kde.org>
3 years agoSquish: Refactor and improve tst_CSUP01
Robert Loehning [Thu, 2 Oct 2014 10:57:18 +0000 (12:57 +0200)]
Squish: Refactor and improve tst_CSUP01

Change-Id: I154ebcc01a870b0bf3912a69b37184fd2f37092a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Remove further unstable lines from project tree
Robert Loehning [Tue, 30 Sep 2014 11:01:00 +0000 (13:01 +0200)]
Squish: Remove further unstable lines from project tree

Change-Id: I985fcce7297fe6508514c0476a16553905063c11
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoUpdate qbs submodule.
Christian Kandeler [Tue, 30 Sep 2014 10:18:29 +0000 (12:18 +0200)]
Update qbs submodule.

To HEAD of 1.3 branch.

Change-Id: I8594101d87130eab8e5abdbf288ffe119bdec1d2
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoCore: Revert function signature change
Orgad Shaneh [Tue, 30 Sep 2014 08:04:08 +0000 (11:04 +0300)]
Core: Revert function signature change

Breaks BC with MSVC2010.

This partially reverts commit fe8ed7f5a666629ae43f8fc0888484a8bfa3b210.

Change-Id: I36f995f992f3d12f16900c6dbe1dc94123c188bd
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoSquish: Remove unstable lines from expected project tree
Robert Loehning [Mon, 29 Sep 2014 17:06:21 +0000 (19:06 +0200)]
Squish: Remove unstable lines from expected project tree

Change-Id: I76bed181ec12257cf264c13660867b151d844747
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoRe-add Label for action JumpToFileUnderCursorInNextSplit.
marcel [Mon, 29 Sep 2014 12:12:14 +0000 (14:12 +0200)]
Re-add Label for action JumpToFileUnderCursorInNextSplit.

The label got lost in f1eb9c4827670a56a5f772575d7f4a1d1f9cd26f

Change-Id: Idedbc471a2ea6104e900d626ff7b424d51092624
Reviewed-by: David Schulz <david.schulz@digia.com>
3 years agoGeneric Project: Fix adding wrong include directories
Andre Hartmann [Sat, 27 Sep 2014 06:01:54 +0000 (08:01 +0200)]
Generic Project: Fix adding wrong include directories

Task-number: QTCREATORBUG-12727
Task-number: QTCREATORBUG-12873
Change-Id: I1dffad5af9ac254fa17f89291db7baf640ed1851
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoMerge remote-tracking branch 'origin/3.1' into 3.2
Eike Ziller [Mon, 29 Sep 2014 08:30:20 +0000 (10:30 +0200)]
Merge remote-tracking branch 'origin/3.1' into 3.2

Change-Id: I5d9b1d71eea5ffaed36477d73915f4a4fb4ab90c

3 years agoPerforce: Disable actions when outside a repository.
David Schulz [Fri, 26 Sep 2014 11:42:22 +0000 (13:42 +0200)]
Perforce: Disable actions when outside a repository.

Task-number: QTCREATORBUG-13092
Change-Id: I3d059af748f0160ebfc97bebbd43de9210f17250
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Do not crash tst_simple_debug if debugger can't stop
Robert Loehning [Thu, 25 Sep 2014 15:54:52 +0000 (17:54 +0200)]
Squish: Do not crash tst_simple_debug if debugger can't stop

Change-Id: Iedf0335088739ed60f321b6479711298067f9038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSession: Fix compilation
Robert Loehning [Fri, 26 Sep 2014 12:46:59 +0000 (14:46 +0200)]
Session: Fix compilation

This was broken in fe8ed7f5a666629ae43f8fc0888484a8bfa3b210

Change-Id: Iff4dffa6ba6cfdeeb3664c026ce642b80e4deeeb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
3 years agoSession: Fix saving session data on shutdown from project mode
Daniel Teske [Fri, 26 Sep 2014 10:45:42 +0000 (12:45 +0200)]
Session: Fix saving session data on shutdown from project mode

This was broken in d52ee686d1ae63090e066faf4e2b66b90620b774.

Task-number: QTCREATORBUG-13098
Change-Id: Ia075e13fdd00e561b78058a3cab0cb02d2eb5fe6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoDebugger: Fix QHash display of "compact" keys
hjk [Fri, 12 Sep 2014 11:31:12 +0000 (13:31 +0200)]
Debugger: Fix QHash display of "compact" keys

Add make std::string usable as "compact" key.

Change-Id: Idbfcf9d299e2dde392025166a20c3d0ab60239a6
(cherry picked from commit 2776536a7efd6758de1d6720b2c05a9fe0bc65a5)
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Run tst_memberoperator with Clang code model, too
Robert Loehning [Wed, 24 Sep 2014 16:01:22 +0000 (18:01 +0200)]
Squish: Run tst_memberoperator with Clang code model, too

Change-Id: I3b4b2ed3523e94d5a6dee6957b5b16d4092122fd
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Run tst_CSUP05 with Clang code model, too
Robert Loehning [Thu, 25 Sep 2014 10:16:37 +0000 (12:16 +0200)]
Squish: Run tst_CSUP05 with Clang code model, too

Change-Id: Ief81ba27d8cbd43de5ef9c71b586da8cc372a8bb
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Run tst_CSUP04 with Clang code model, too
Robert Loehning [Thu, 25 Sep 2014 10:13:23 +0000 (12:13 +0200)]
Squish: Run tst_CSUP04 with Clang code model, too

Change-Id: I3a2f029e0f1c85ecbd3c161b097f4e975014f714
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Run tst_CSUP03 with Clang code model, too
Robert Loehning [Wed, 24 Sep 2014 14:31:18 +0000 (16:31 +0200)]
Squish: Run tst_CSUP03 with Clang code model, too

Change-Id: I5b240b2fbd7999b2228871ddf8faa72509c49465
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Add shared file for clang-related code
Robert Loehning [Thu, 25 Sep 2014 11:52:20 +0000 (13:52 +0200)]
Squish: Add shared file for clang-related code

Change-Id: I2eaa39afbfeb0031f191ce9adead80c0d0960542
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoTextEditor: Only disable block selection when we have one.
David Schulz [Wed, 24 Sep 2014 13:04:09 +0000 (15:04 +0200)]
TextEditor: Only disable block selection when we have one.

This reduces unnecessary calls to ensureCursorVisible.

Task-number: QTCREATORBUG-12860
Change-Id: Iaf59642f3cee645f75d5319d3f6adc236b3f2ee2
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoiossim: correct bring to front for Xcode 6
Fawzi Mohamed [Thu, 18 Sep 2014 12:27:43 +0000 (14:27 +0200)]
iossim: correct bring to front for Xcode 6

Change-Id: I7e161a20a4b24635df4f6f373966c7e52cfb593b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoDebugger: Wiggle LLDB startup
hjk [Mon, 22 Sep 2014 15:55:20 +0000 (17:55 +0200)]
Debugger: Wiggle LLDB startup

LLDB 320.* from XCode 601 was unhappy. This is an trial-and-error
to get it start up again.

Change-Id: I5dda0eef785d70abbb5798c3884ace89a8426969
(cherry picked from commit 1af0f77ea9c4cc6407dc193f53023c103e827168)
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoMake compile with Qt 5.4
Kevin Funk [Mon, 22 Sep 2014 12:02:25 +0000 (14:02 +0200)]
Make compile with Qt 5.4

Partial backport of 5da75dba065df3a16d2c58fcd89027750b34f12f

Change-Id: I5d0964818934a2a0fc57c97b229469fd5a6c8131
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoLocator: Fix the fix of the deadlock
Eike Ziller [Mon, 22 Sep 2014 08:37:08 +0000 (10:37 +0200)]
Locator: Fix the fix of the deadlock

The all/current project searches use metacalls on the UI thread to work
around thread-unsafety of the Project::allFiles method, so we cannot jus
t block the UI thread to wait for the old search to cancel.
On the other hand, many of the ILocatorFilter::matchesFor implementation
s do not work when they are run in multiple threads simultaneously (most
implementations access unguarded member variables, help index filter tend
s to crash), so we _do_ have to wait for the search to cancel before sta
rting a new thread.
Broke with 05c267673f43ecbb0ae4c44adc7d02a690435f8b and 6fc39f0c41c248be

Change-Id: I93c607c879e8ba6ef60f94719812edb3df43a154
Task-number: QTCREATORBUG-12875
Task-number: QTCREATORBUG-12592
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoCppEditor: Fix isValidAsciiIdentifierChar.
David Schulz [Mon, 22 Sep 2014 08:30:39 +0000 (10:30 +0200)]
CppEditor: Fix isValidAsciiIdentifierChar.

Task-number: QTCREATORBUG-13012
Change-Id: I70d45dcdc72408d46bea0b78746ab28c17f3b9e3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
3 years agoCppTools: Fix compilation with recent gcc 4.9.2
Orgad Shaneh [Fri, 5 Sep 2014 07:57:58 +0000 (10:57 +0300)]
CppTools: Fix compilation with recent gcc 4.9.2

See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=62224

.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppEditor::Internal::CppCodeModelInspectorDialog::refresh()':
cppcodemodelinspectordialog.cpp:(.text+0x79fc): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::definedMacros()':
cppcodemodelinspectordialog.cpp:+0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'
.obj/release-shared/cppcodemodelinspectordialog.o: In function `CppTools::Internal::CppModelManager::headerPaths()':
cppcodemodelinspectordialog.cpp: +0x26): undefined reference to `CppTools::Internal::CppModelManager::ensureUpdated()'

Change-Id: Ie0e01f7628668cbbe11b701a93caef98bb8e335f
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
(cherry picked from commit c023a1cac182b44baa8645e8955ef03ed0d31fd7)
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Avoid crash of tst_CSUP06
Robert Loehning [Thu, 18 Sep 2014 16:10:40 +0000 (18:10 +0200)]
Squish: Avoid crash of tst_CSUP06

Change-Id: I76318223443ec2e0cc8ddd887a8ac70a6993c0c4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoDoc: fix link to OS X deployment page in Qt docs
Leena Miettinen [Thu, 18 Sep 2014 13:02:18 +0000 (15:02 +0200)]
Doc: fix link to OS X deployment page in Qt docs

And replace some remaining "Mac" or "Mac OS X" strings
with "OS X".

Change-Id: I8ae1697a23e69fb840890c1d10887ddbe86a3c98
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
3 years agoios: simulator integration support for Xcode6
Fawzi Mohamed [Tue, 16 Sep 2014 14:16:02 +0000 (16:16 +0200)]
ios: simulator integration support for Xcode6

Change-Id: Ibe161281e7dcdbba2c19fb23fac0546f2e592ad2
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
3 years agoGerman translation for late strings
Robert Loehning [Fri, 12 Sep 2014 14:28:52 +0000 (16:28 +0200)]
German translation for late strings

Change-Id: I40ab7dc02492d9e71ebb8c209ab645a5bf095c94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoDoc: document QML emulation layer
Leena Miettinen [Thu, 11 Sep 2014 13:30:11 +0000 (15:30 +0200)]
Doc: document QML emulation layer

And the new option to have Qt Creator build the emulation
layer using the kit selected for the project.

Change-Id: I16b3d9e87f21caf7a4ecd1a527df51035494fb34
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoVersion bump
Eike Ziller [Tue, 16 Sep 2014 14:21:12 +0000 (16:21 +0200)]
Version bump

Change-Id: I4262a5ff65f72e11f2bff0f7edae802aba9b1082
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoUpdate Russian translation
Sergey Belyashov [Thu, 26 Jun 2014 13:04:45 +0000 (17:04 +0400)]
Update Russian translation

Change-Id: I22a16eaae505d43c31516db98290df3ec667b5e0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
3 years agoAdd changes file for 3.2.1
Eike Ziller [Fri, 12 Sep 2014 14:13:58 +0000 (16:13 +0200)]
Add changes file for 3.2.1

Change-Id: I43a7d8d5bfcef33ef7e2370cafec3c409fd9ce25
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
3 years agoClearCase: Fix unreserved checkout
Orgad Shaneh [Mon, 15 Sep 2014 09:57:25 +0000 (12:57 +0300)]
ClearCase: Fix unreserved checkout

Task-number: QTCREATORBUG-12847
Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoQbsProjectManager: Turn the timestamp check off by default.
Christian Kandeler [Fri, 12 Sep 2014 15:41:35 +0000 (17:41 +0200)]
QbsProjectManager: Turn the timestamp check off by default.

One line was overlooked in a recent patch that intended to do this.

Change-Id: I1c344c4e25d47b2c4cc89071c2a4e059b451c9fd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoQbsProjectManager: Fix crash when calling QbsProject::files().
Christian Kandeler [Fri, 12 Sep 2014 15:38:12 +0000 (17:38 +0200)]
QbsProjectManager: Fix crash when calling QbsProject::files().

We can't do that during parsing, as qbs::Project::buildSystemFiles()
might run into a race condition.

Change-Id: Iae3fd3000fdc71fec50c82d50fb3b4e3888351bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
3 years agoEditors: sync the layout with the contents before setting text cursor
Ulf Hermann [Thu, 11 Sep 2014 13:41:05 +0000 (15:41 +0200)]
Editors: sync the layout with the contents before setting text cursor

Not doing this makes the QPlainTextEdit interact with an invalid
layout, potentially causing crashes. Now the cursor setting itself is
not part of the undo stack anymore, but as undoing sets the cursor
itself, that shouldn't be a problem.

Change-Id: Ic6f8ee9781faed655ac20f058b562c098ced20ae
Task-number: QTCREATORBUG-12987
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoScripts: Fix deployment of qmlpuppets on OSX v3.2.1
Christian Stenger [Fri, 12 Sep 2014 12:14:18 +0000 (14:14 +0200)]
Scripts: Fix deployment of qmlpuppets on OSX

Change-Id: Ic312423ff7d79b652379d7512a75be043a33740b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoUpdate qbs submodule.
Christian Kandeler [Fri, 5 Sep 2014 09:53:32 +0000 (11:53 +0200)]
Update qbs submodule.

To HEAD of 1.3 branch.

Change-Id: I474a2cdfbc99a82cd075ee785d2530a8a5f012e4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoSSH: Fix tunnel test.
Christian Kandeler [Thu, 11 Sep 2014 11:18:39 +0000 (13:18 +0200)]
SSH: Fix tunnel test.

Since we're opening the port for IPv4, we must also use an IPv4 host

Change-Id: I73e009ebd6deb0bd6804cddc8c83299dbfc1b312
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoSSH: Adapt test to signal renaming.
Christian Kandeler [Thu, 11 Sep 2014 10:49:59 +0000 (12:49 +0200)]
SSH: Adapt test to signal renaming.

This was overlooked in the original patch.

Change-Id: I1709e28552ed9dd83bd3e810ba51ef5ec95d8580
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoSSH: Do not always emit an error if an SFTP channel exits.
Christian Kandeler [Thu, 11 Sep 2014 10:49:27 +0000 (12:49 +0200)]
SSH: Do not always emit an error if an SFTP channel exits.

Channel exit is completely normal if we closed the channel, so this must
not cause an error message.

Change-Id: I57f5165b339a52a25118ad5e357f41334dadebc4
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoSSH: Fix maximum packet size check.
Christian Kandeler [Thu, 11 Sep 2014 10:33:45 +0000 (12:33 +0200)]
SSH: Fix maximum packet size check.

The statement in the RFC was misunderstood.

Task-number: QTCREATORBUG-12884
Change-Id: Icd533362ebf95d963cacc8d11da03360e742f070
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
3 years agoQmlDesigner.PropertyEditor: Fix regression in SliderSpecifics
Thomas Hartmann [Thu, 11 Sep 2014 09:42:10 +0000 (11:42 +0200)]
QmlDesigner.PropertyEditor: Fix regression in SliderSpecifics

Change-Id: Id71d3ec192a030ead81bb7746681b18cb9d79e27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoQmlDesigner: Allow negative spacings for positioners
Thomas Hartmann [Thu, 11 Sep 2014 08:22:11 +0000 (10:22 +0200)]
QmlDesigner: Allow negative spacings for positioners

Change-Id: I610127421b071a4bf4ed0d21aeab2b2f0c089d28
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoQmlDesigner.Instances: Do not use Qt kit for fallback puppet
Thomas Hartmann [Thu, 11 Sep 2014 09:11:31 +0000 (11:11 +0200)]
QmlDesigner.Instances: Do not use Qt kit for fallback puppet

Change-Id: I825c7f2380a376b30cc647942aa7d252aa9d36df
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoDoc: update Qt Quick version numbers
Leena Miettinen [Wed, 10 Sep 2014 14:22:58 +0000 (16:22 +0200)]
Doc: update Qt Quick version numbers

Make references more generic, because the templates are
frequently updated to import latest Qt Quick and
Qt Quick Controls versions.

Change-Id: Ic3e6744c960fe8f953abf2aaddd2c7498bdb1f38
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
3 years agoDoc: fix labels and tooltips
Leena Miettinen [Wed, 10 Sep 2014 15:23:46 +0000 (17:23 +0200)]
Doc: fix labels and tooltips

Fix capitalization, punctuation and typos, and remove
unnecessary text.

Change-Id: Iee39e465125d5d9eec099323fb7d75756c8d81df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoQmlDesigner.PropertyEditor: Allow centering and anchoring at the same time
Thomas Hartmann [Tue, 9 Sep 2014 15:13:44 +0000 (17:13 +0200)]
QmlDesigner.PropertyEditor: Allow centering and anchoring at the same time

With this patch center anchor and right/left/top/right anchors can
be used at the same time.

Task-number: QTCREATORBUG-11455
Change-Id: I3114eb76bdfc4226e78fd711e04849d7d7d7cd38
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoClearCase: Initialize checkout dialog after sync has finished
Orgad Shaneh [Mon, 8 Sep 2014 08:07:09 +0000 (11:07 +0300)]
ClearCase: Initialize checkout dialog after sync has finished

If it is initialized too early, activities combo is empty.

Change-Id: I6ca34e7bcae5d9960b1f84cd3f95ce13ae45ccca
Reviewed-by: Knut Petter Svendsen <knutpett@pvv.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoOnly insert SideBarWidget for existing id
Thomas Hartmann [Tue, 9 Sep 2014 13:11:20 +0000 (15:11 +0200)]
Only insert SideBarWidget for existing id

Task-number: QTCREATORBUG-12974
Change-Id: I69cacab32de0454a78c5a67edcc7dcbbdcb12784
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoQmlJS: Add error message for invalid root item in the designer
Thomas Hartmann [Wed, 10 Sep 2014 07:49:51 +0000 (09:49 +0200)]
QmlJS: Add error message for invalid root item in the designer

Documents with those types do crash the qmlpuppet and confuse the users.
With this patch we give a clear error message and such files are not supported

Change-Id: Iba19def2751d4dc81d90684c0c63c0274fdf49cf
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoQmlDesigner: Adding UI option for fallback puppet.
Thomas Hartmann [Tue, 9 Sep 2014 08:37:48 +0000 (10:37 +0200)]
QmlDesigner: Adding UI option for fallback puppet.

This patch adds an option to configure the usage of qml(2)puppet.
By default the qml(2)puppet that comes together with Qt Creator is used.

Change-Id: Idada8457e81fa17d3290dc97ded303aab475a9f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoDoc: Clear a number of documentation warnings
Topi Reinio [Tue, 26 Aug 2014 07:57:09 +0000 (09:57 +0200)]
Doc: Clear a number of documentation warnings

QDoc gets confused about the contents of doc_src_plugins.qdoc,
mistaking some of its code for QDoc commands.

To work around this problem, change the file to be a qdoc
include file, wrap the code blocks with \badcode, and
refer to them using \include.

Using \badcode will also turn off code highlighting and
autolinking, something that is not desired for these code

Change-Id: I6c3b65ef098ec6f6f06892d78a3abb38e0d28ca3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
3 years agoQmlDesigner: Adding a manual test for plugin integration
Thomas Hartmann [Tue, 9 Sep 2014 08:04:23 +0000 (10:04 +0200)]
QmlDesigner: Adding a manual test for plugin integration

Because we had a couple of regressions in this area, I add this project
for manual testing.
In this project we have a qmlproject with a plugin that contains a .metainfo
file and a custom property sheet.

We define two items in the item library: MyComponent and MyComponent2.
While MyComponent has a custom property sheet the property sheet for
MyComponent2 is auto generated.

Change-Id: I8d5ade43f648354175587c0a3e989bad87149298
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoQmlDesigner.TextToModelMerger: Fixing comparison of QVariant
Thomas Hartmann [Tue, 9 Sep 2014 12:39:37 +0000 (14:39 +0200)]
QmlDesigner.TextToModelMerger: Fixing comparison of QVariant

n the case of custom types, their equalness operators are not called.
Instead the values' addresses are compared.
This is not want we want. Instead we have to cast and compare
our custom types manually.
This fixed a couple of QTC_ASSERTS.

Change-Id: I3a82b84744f9b8860b7efaeb203475bb9dba5d11
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoQmlDesigner: add more specifics
Tim Jenssen [Tue, 9 Sep 2014 11:38:40 +0000 (13:38 +0200)]
QmlDesigner: add more specifics


Change-Id: I8d36bb4ccae05cdb28833317d74a06e7628540a1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
3 years agoQmlDesigner.Puppet: Adding size hints to Window mockup
Thomas Hartmann [Mon, 8 Sep 2014 16:50:36 +0000 (18:50 +0200)]
QmlDesigner.Puppet: Adding size hints to Window mockup

Without defining the properties, the properties do not work and
do not get notified properly. They are also missing defaults which
breaks "resetting".

Task-number: QTCREATORBUG-13004
Change-Id: Ib36f39770930be486225b45169d2ebdb53df8df4
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoQmlDesigner.Navigator: Fix reordering in case of invisble nodes
Thomas Hartmann [Mon, 8 Sep 2014 08:37:22 +0000 (10:37 +0200)]
QmlDesigner.Navigator: Fix reordering in case of invisble nodes

If the model contains nodes that are invisible in the navigator
(e.g. QtObject) updateItemRowOrder() does not work correctly.

To avoid complexity we update the subtree in this case.

Change-Id: Ia40ce061e9188ef9ad6ca54ce3444432b878ddf6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoQmlDesigner.Navigator: Crash fix
Thomas Hartmann [Mon, 8 Sep 2014 08:26:19 +0000 (10:26 +0200)]
QmlDesigner.Navigator: Crash fix

Objects which are not an Item are not visible in the tree view.
In this case model() is 0 and Qt Creator was crashing when detaching
the navigator view.

Change-Id: I144c940d76157defb27133673ed911d733d8b5ef
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoQmlDesigner.PropertyEditor: Change step size for reals
Thomas Hartmann [Mon, 8 Sep 2014 10:35:52 +0000 (12:35 +0200)]
QmlDesigner.PropertyEditor: Change step size for reals

the default step size of 1 does not make much sense for reals.

Task-number: QTCREATORBUG-12985
Change-Id: I28be2ca8de37f1032e8fbbe785913ae5a8f6be33
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoTemplates: Remove wrong version information
Christian Stenger [Fri, 5 Sep 2014 14:00:37 +0000 (16:00 +0200)]
Templates: Remove wrong version information

Change-Id: I7379f79d22335d6faf0db845cdde863c5888300b
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoQmlDesigner: Fix regression for import paths
Thomas Hartmann [Mon, 8 Sep 2014 10:08:00 +0000 (12:08 +0200)]
QmlDesigner: Fix regression for import paths

The imports paths used by the sub component manger and meta info system
were not correctly resolved. The main reason was that the textDocument in
the text modifiers are just plain text buffers and do not containt
any url for the document.

This patch removes importPaths() from the TextModifier.
The ViewerContext can be stored in the TextToModelMerger and
does not have to be recreated when needed.

Change-Id: I17281caee23ddd51f6e36d5346bc3bd7c53005e8
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoQmlDesigner.PropertyEditor: Change default editor for color
Thomas Hartmann [Thu, 28 Aug 2014 08:59:52 +0000 (10:59 +0200)]
QmlDesigner.PropertyEditor: Change default editor for color

This template breaks the layout and is currently unusable.
Therefore we replace it by a string editor.

Change-Id: I0818d006a4516f34954d5406ee4074664e909891
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoqmljs: highlight properties with inline qml components
Fawzi Mohamed [Wed, 3 Sep 2014 13:30:39 +0000 (15:30 +0200)]
qmljs: highlight properties with inline qml components

Task-number: QTCREATORBUG-10892
Change-Id: Ifbf5675ab53de54f6f38c07726f5ad400f6ee9d6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoqmljs: always add environment paths to the qml vContexts
Fawzi Mohamed [Thu, 4 Sep 2014 09:48:17 +0000 (11:48 +0200)]
qmljs: always add environment paths to the qml vContexts

Change-Id: Ib2c0650aa4dcf1b5365c8521e5145003faf216ac
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
3 years agoFixed font deployment for winphone 8.0
Oliver Wolff [Tue, 2 Sep 2014 09:33:46 +0000 (11:33 +0200)]
Fixed font deployment for winphone 8.0

Change-Id: I8d7a2debfec3bbd06780458a29f11031dd9b862c
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
3 years agoFixed creation of mapping files for winphone 8.1
Oliver Wolff [Tue, 2 Sep 2014 09:31:28 +0000 (11:31 +0200)]
Fixed creation of mapping files for winphone 8.1

Change-Id: I42f97f8f629b6ffbf48a01409605853f60a9c02b
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
3 years agoSdkTool: Fix warnings
Christian Stenger [Fri, 5 Sep 2014 11:03:10 +0000 (13:03 +0200)]
SdkTool: Fix warnings

Change-Id: I2a16bdff7b184e0988d9147f01075c87f8eb1309
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
3 years agoSquish: Stabilize tst_CSUP06
Robert Loehning [Fri, 5 Sep 2014 10:54:49 +0000 (12:54 +0200)]
Squish: Stabilize tst_CSUP06

Change-Id: I68071a5e8964c89a61a4dfe310fdbd7bb5fd1b8a
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Include new Qt Quick templates
Robert Loehning [Thu, 4 Sep 2014 10:50:03 +0000 (12:50 +0200)]
Squish: Include new Qt Quick templates

Change-Id: I92e359d95bc9cd62b5e1b8a059cb8aef3908bcb4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSdkTool: Fix "get" for complex types
Orgad Shaneh [Sun, 24 Aug 2014 10:58:22 +0000 (13:58 +0300)]
SdkTool: Fix "get" for complex types

Change-Id: I8dd8101e33da4a2bdb0bf36f4217f1c466583b47
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoFix keyboard selection shortcuts on Qml/JS Console
Kai Koehne [Thu, 4 Sep 2014 15:04:29 +0000 (17:04 +0200)]
Fix keyboard selection shortcuts on Qml/JS Console

Change-Id: I804df07c711de62c6c8e34810aa17a7ed86f2011
Task-number: QTCREATORBUG-12956
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
3 years agoEditor: Draw column wrap line after drawing ifdef blocks
Vicken Simonian [Mon, 1 Sep 2014 10:10:07 +0000 (03:10 -0700)]
Editor: Draw column wrap line after drawing ifdef blocks

Task-number: QTCREATORBUG-12940
Change-Id: I431176c1879236bc107a2c1db11890da5d75f750
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
3 years agoSquish: Provide test for ClangCodeModel plugin
Christian Stenger [Mon, 11 Aug 2014 13:55:13 +0000 (15:55 +0200)]
Squish: Provide test for ClangCodeModel plugin

Change-Id: I4bf45cf838baa89b558292ca9d08ec184e80c20d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
3 years agoDo not build UpdateInfo plugin
Eike Ziller [Wed, 3 Sep 2014 12:14:08 +0000 (14:14 +0200)]
Do not build UpdateInfo plugin

It is broken, and people should not even be able to manually enable it.

Change-Id: I990922b1a514e43ed7e4b951ee230306e031f942
Task-number: QTCREATORBUG-11262
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
3 years agoVariableManager: Hopefully fix crash with int variables
Eike Ziller [Tue, 2 Sep 2014 13:49:12 +0000 (15:49 +0200)]
VariableManager: Hopefully fix crash with int variables

Capturing const references in lambdas is potentially dangerous.

Change-Id: I4b4ddc8dcb1e839e4ed919caccdf0010ed8e6a34
Task-number: QTCREATORBUG-12948
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
3 years agoQmlJS: Use canonical paths for matching of import directories
Kai Koehne [Tue, 2 Sep 2014 12:42:51 +0000 (14:42 +0200)]
QmlJS: Use canonical paths for matching of import directories

We rely on string comparison for detection of QML import paths. Therefore
make sure that all paths are canonical.

Change-Id: I416bc31915644a888c416d726049668b0e71f29a
Task-number: QTCREATORBUG-12902
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoQmlJS: Remove undefined method
Kai Koehne [Tue, 2 Sep 2014 12:42:25 +0000 (14:42 +0200)]
QmlJS: Remove undefined method

Change-Id: I06439c81bf7b194a2e32d1301e71a2c26e163d03
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoQmlJS: Don't use QDir::separator() for internal paths
Kai Koehne [Tue, 2 Sep 2014 12:40:41 +0000 (14:40 +0200)]
QmlJS: Don't use QDir::separator() for internal paths

We use forward slashes in all internal paths, even on Windows.

Change-Id: Ie0b418c770dad96829dd357fe425616b6d3a5b82
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
3 years agoSettingsAccessor: Fix discarding user sticky settings on 3.1->3.2 upgrade
Orgad Shaneh [Tue, 2 Sep 2014 03:26:13 +0000 (06:26 +0300)]
SettingsAccessor: Fix discarding user sticky settings on 3.1->3.2 upgrade

... when both the shared and the user file are older than 3.2.

Change-Id: I9e16d67c2b566c43060cb9e05f02ea3a5343065f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoSquish: Continue testing other files after fatal error
Robert Loehning [Tue, 2 Sep 2014 11:13:07 +0000 (13:13 +0200)]
Squish: Continue testing other files after fatal error

Change-Id: I2e8709a84882dde5a6bc96b4bd213581175c6c8c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoRemoteLinux: Fix mixed debugging.
Christian Kandeler [Mon, 1 Sep 2014 14:06:29 +0000 (16:06 +0200)]
RemoteLinux: Fix mixed debugging.

The QML part was broken due to recent changes relating to gdbserver
"multi" mode.

Task-number: QTCREATORBUG-12928
Change-Id: Ia806f0cbfedd6961138f7cd89a0387bd851ff83e
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
3 years agoFix behavior of debugger run widget.
Christian Kandeler [Mon, 1 Sep 2014 14:25:20 +0000 (16:25 +0200)]
Fix behavior of debugger run widget.

The logic checking the other check box if the only checked one is being
unchecked was faulty, only updating the UI but not the actual state. As
a result, both C++ and QML were switched off, resulting in interesting
behavior when starting a debugging session.

Change-Id: Ifd61f7080ad70f816fa80b416f8594f057c299d4
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoQbsProjectManager: Fix crash when an install step is removed.
Christian Kandeler [Tue, 26 Aug 2014 15:20:42 +0000 (17:20 +0200)]
QbsProjectManager: Fix crash when an install step is removed.

The object has already been deleted when the stepRemoved() signal comes
in, so we call disconnect() on a dangling pointer.

Change-Id: Ife5192f9edbde3d42c96dbcae60d7eb03b051745
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
3 years agoGerman translation of 3.2 branch
Robert Loehning [Mon, 1 Sep 2014 11:09:11 +0000 (13:09 +0200)]
German translation of 3.2 branch

Change-Id: I634d31d3dd6421b5afdd32350513c61bf7ad683b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoSquish: Test opening of QBS project
Robert Loehning [Fri, 29 Aug 2014 14:32:24 +0000 (16:32 +0200)]
Squish: Test opening of QBS project

Change-Id: I980ad15147f419b2d42d86b2a62ebf2875a3c2d8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
3 years agoDebugger: Don't use document with AST from indexing snapshot
Nikolai Kosjar [Fri, 29 Aug 2014 09:47:48 +0000 (11:47 +0200)]
Debugger: Don't use document with AST from indexing snapshot

...since the AST will be released at some point from another thread.

Change-Id: I71d20228ebec71e98dca3474452677ec63ffe4c6
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
3 years agoC++: add env. var. to disable decl/def link tracking.
Erik Verbruggen [Wed, 27 Aug 2014 10:00:15 +0000 (12:00 +0200)]
C++: add env. var. to disable decl/def link tracking.

When the environment variable QTC_NO_FUNCTION_DECL_DEF_LINK_TRACKING is
set, no method declaration/definition tracking is performed. This is to
see if QTCREATORBUG-11262 is triggered due to the tracking.

Task-number: QTCREATORBUG-11262
Change-Id: Id4cb1fabf9304f8bf42393cb65c402adf8818e2a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
3 years agoC++: Fix possible use-after-free of AST.
Erik Verbruggen [Wed, 27 Aug 2014 11:41:25 +0000 (13:41 +0200)]
C++: Fix possible use-after-free of AST.

The CppRefactoringChanges::fileNoEditor takes a Document from the
snapshot it has. Although this snapshot is a safe copy, it might have
been gotten right after it was updated by indexing. Such a document will
still have its AST. If this AST is used by any refactoring action
without retaining it, the pointers will be dangling after a short while
(specifically: after the locator has extracted all the information).

The fileNoEditor method is called by the declDefLinkFinder to search
the target document. The snapshot is obtained before, and contains the
document for the semantic info. However, the target document will not
come from the semantic info, but from the indexer.

Change-Id: I212ff41dde6910e94e80552b2c3e5911fe9496ae
Task-number: QTCREATORBUG-11262
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
3 years agoC++: set the objectName of QTimers.
Erik Verbruggen [Wed, 27 Aug 2014 09:50:53 +0000 (11:50 +0200)]
C++: set the objectName of QTimers.

This will hopefully help a bit in resolving the crashes that happen in

Change-Id: Ib3aa8c1a1f50778bd89938d7c529d8399ccf91ea
Task-number: QTCREATORBUG-11262
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
3 years agoPainting fix when devicePixelRatio > 1
Paul Olav Tvete [Fri, 22 Aug 2014 13:13:28 +0000 (15:13 +0200)]
Painting fix when devicePixelRatio > 1

Qt draws lines on half-pixel boundaries. Because of
rounding, this is not visible with non-scaled aliased
painting. However, on a high-DPI screen with scaling
enabled, the line under the menu bar is drawn at a one
pixel offset, which causes it to overlap the menubar items.

This change draws the line at the mathematically correct position.

Task-number: QTBUG-38858
Change-Id: I0a2260507d346b52a36258d479cde87064d991ef
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>