Commit Graph

37013 Commits

Author SHA1 Message Date
Daniel Teske
e8f2bc1f60 Android: Fix wrong return values
Change-Id: Ia5917387c429278cac34a8d1f7a67631d491bff2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-30 11:26:16 +02:00
Thomas Hartmann
882eb4f335 QmlDesigner.PropertyEditor: Fixing usability issue for color editing
Task-number: QTCREATORBUG-12621
Task-number: QTCREATORBUG-12563

Change-Id: I6834633be92f2fcdf85995604490ceea14af9ef6
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-30 10:36:00 +02:00
Christian Stenger
50540c34d3 Core: remove deleted files from qbs file
These files have been removed with c3093cfff7.

Change-Id: I96b1c188bda8ff55a1cd4fba69c19f076be2efdb
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-30 10:25:02 +02:00
Friedemann Kleint
ca23a29178 Android: Fix compilation with Qt 4.
Change-Id: I2a25cbb19246526702c91b41e3e62f05f7833e87
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-30 09:42:46 +02:00
Leena Miettinen
ac039f9655 Debugger: fix typo in UI text
Change-Id: If5eb80f2d92632d61797f2b1f3bb7b7a604f3cac
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-30 09:38:58 +02:00
Leena Miettinen
6618edd080 Doc: fix typos in the WinRT topic
Change-Id: I7d6340a48a4ce910fdbc6d5adc4605ff5ea13637
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-30 09:24:23 +02:00
Orgad Shaneh
7a7690f0ec Git: Parse for-each-ref output as UTF-8
Adding a branch with non-ascii chars then refreshing the branch list on
Windows invalidates the branch name.

Change-Id: I59d3e092c66fdcc7cea38a8451de6b5e42cd5de0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2014-07-30 09:12:44 +02:00
Marco Bubke
ded24c3997 QmlDesigner: Fix d&d in navigator
Check if you want to remove the same node you like to reparent.

Task-number: QTCREATORBUG-12744
Change-Id: Ib098a5723faf1679217f508a73e56359850aa4bc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 19:30:59 +02:00
Marco Bubke
8f3bb6421b QmlDesigner: Fix enumerations properties
Task-number: QTCREATORBUG-12741
Change-Id: I1ef1909d585732a39bbf80b90512851a10f60600
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 19:29:08 +02:00
Robert Loehning
ed9261733b Squish: Replace Qt 5.0 by Qt 5.3
Change-Id: I2fb5ea259c523fce4e71f02ca087ed93fd9a0ae1
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-07-29 18:15:05 +02:00
Marco Bubke
3146340211 QmlDesigner: Get whole values for value types too.
Task-number: QTCREATORBUG-12130
Change-Id: Ic43826060d9ce38aded7fc3a68dff2ea6860bfc1
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 17:54:39 +02:00
Fawzi Mohamed
efbdd5297a ios: fix deploy script for iossim_1_8_2
iossim_1_8_2 (the tool used to deploy to the simulator with Xcode
<=5.0.x) wasen't being "qtdeployed", and had incorrect library paths.
This made deploy to simulator fail on older Xcode installations.

Task-number: QTCREATORBUG-12753
Change-Id: Iecae2938daa0f7180c1fa576c62dd519ac7846d5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-07-29 17:24:07 +02:00
Daniel Teske
677746cd82 Android: Warn about broken gdbs on every platform
Add more indicators for a broken gdb. This also fixes a bug where the
message was errounously shown on non-OS X platforms

Task-number: QTCREATORBUG-12747
Change-Id: I7936e5eea58896aec382616d6e7236b8276f998d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-29 16:25:35 +02:00
Thomas Hartmann
3f4e966664 QmlDesigner.PropertyEditor: Fix tooltip property
For Button the property is called tooltip and not toolTip
ComboBox has no tooltip property.

Task-number: QTCREATORBUG-12334
Change-Id: I19b01e171deccaa5a65ddf640c46820072048d88
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 16:23:41 +02:00
Thomas Hartmann
27afbe49ea QmlDesigner.PropertyEditor: Select new created gradient stop
Task-number: QTCREATORBUG-12507
Change-Id: I2d2bc4d478e53b5b5a0faeeda68cd95d7c85377e
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 15:40:05 +02:00
Leena Miettinen
77ba7eb8b8 Doc: including Android permissions needed by Qt
New check box in Android Manifest Editor.
Fix the description for adding permissions from
the list.
Update screenshot.

Change-Id: Ifc74a84be7a9df32a5cc0513e56f8fa4d504c9c5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-29 15:15:19 +02:00
Leena Miettinen
33c674615c Doc: fix change field name
"Android target SDK" was changed to "Android build SDK"
in the deploy settings.

Updated the screenshot.

Change-Id: Ic8c1ce4ad8610d76c0d23bc65762e5bb0aaddfdb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-29 14:33:56 +02:00
Christian Kandeler
6537d72b1f Update qbs submodule.
To HEAD of the 1.3 branch.

Change-Id: Ie95d869808128e83cc25851f2baf80a8788bbe87
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-29 14:02:03 +02:00
Thomas Hartmann
b46dd452d2 QmlDesigner.PropertyEditor: Use DesignerScrollViewStyle
I set corner to an empty item, because otherwise it looks weird if both
scrollbars are visible.

Change-Id: I149e2ff58f9e9f71b2bb9f435fd64388cbf5529c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-29 13:52:46 +02:00
Daniel Teske
72f1955b12 GenericProject: Don't show externally modified dialog for addFiles
Change-Id: I3321e5c51f18388b8a691193159ef7e434971835
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-29 11:23:41 +02:00
Daniel Teske
147ab7cc7c GenericProject: Also change .include on adding files
Task-number: QTCREATORBUG-12727
Change-Id: I3653f505739ace39cabbb63e227302fc0e71d055
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-29 11:23:38 +02:00
Daniel Teske
8eac129b0f GenericProject: Fix logic for refresh(Everything)
Change-Id: I0c80797ad1af8b01ffe8b12a211aed3b06fb1892
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-29 11:23:30 +02:00
hjk
eab8054535 Debugger: Weaken abi check for attaching to local process
Given that we don't detect all aspects of the tool chain under all
circumstances, an '==' is too strong.

Change-Id: I1c07d58d824e765f9d89fb7dd3007ca716997ee0
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-29 10:32:47 +02:00
Thomas Hartmann
2dd9a0cc21 QmlDesigner.PropertyEditor: Fix selection in gradient editing
Since property change signals can be emitted in any order we have to rely
on selection changed signals to guarantee a valid state.

I use the isInValidState which is only true after all properties have been
setup correctly after a selection change for this.

I added the signal selectionChanged for this.

Task-number: QTCREATORBUG-12642
Task-number: QTCREATORBUG-12506
Change-Id: Idf3bbe8236ece541ca267efb1bd68e0737c99716
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-28 18:29:40 +02:00
Thomas Hartmann
e4189136ac QmlDesigner.PropertyEditor: Fix bug in line edit
I gave writeValueManually a proper name and added a missing check.

Task-number: QTCREATORBUG-12642
Change-Id: I67b0d7754647c29ef378d6f12f023c8a4e728cd2
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-07-28 18:29:32 +02:00
Marco Bubke
b663fc9539 Fix debug to running application
If there was only one kit and no selection for the last kit saved you
got no process list.

Change-Id: Ie4b770cdb9b92860fb8154eed9a80e6d0d64335d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-28 17:49:29 +02:00
Tim Jenssen
51350ef69d QmlDesigner: remove unnecessary qrc file
Change-Id: I9bf7beacaa05e8f903c3b4315d25dd4c644b5598
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-07-28 16:56:54 +02:00
Tim Jenssen
5cc17e6e4b QmlDesigner: avoid comment in comment warning on MSVC2010
Change-Id: I10c65028b730d3cbc05dac3114c64b8ba785e5c0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-07-28 16:56:39 +02:00
Christian Stenger
9b89379745 Squish: Revive WELP01 for Squish 5.1.1+
Change-Id: I1d1bc9334fe6c0fc1187b9bcde27d0b4ed3081b4
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-07-28 14:50:41 +02:00
Orgad Shaneh
aadc380447 BareMetal: Unviolate string freeze
Use a similar message from Core

Change-Id: Iccdcad0308cb7ac1b674522bce57124e3f0e9086
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Tim Sander <tim@krieglstein.org>
2014-07-28 13:21:59 +02:00
Nikolai Kosjar
1fe1c6d0b4 C++: Tests: Remove plain-cplusplus
Change-Id: Ifdf4cd5ea478c87d585c9404caf8f4be6873f692
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-28 12:14:43 +02:00
Christian Kandeler
fb09f5cc01 QbsProjectManager: Re-retrieve project data after build.
This fixes the bug that the "run" action fails if the project has not
been built before (because the path to the executable is still unknown
after the build due to the missing project data update).

Change-Id: I953cbb85051a1de78fcb0490abf58ebc9fcec6e7
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-07-28 12:00:25 +02:00
Jarek Kobus
4c7f1c5ea9 DiffEditor: Fix newline handling for not the last chunk
Task-number: QTCREATORBUG-12665
Change-Id: I7a54fa5502d3e06c6e1ccd99dec800f80e217333
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-07-28 11:21:44 +02:00
Orgad Shaneh
7d3d80a6d5 DiffEditor: Add a failing test for regression
Task-number: QTCREATORBUG-12665
Change-Id: I02f4a9d3444e775049e1712a1dd985b95dc874f3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-07-28 11:21:01 +02:00
Orgad Shaneh
b117efc594 DiffEditor: Tests cleanup
Change-Id: Iddabf11692a192874096bb5f030d8575fc5cefd6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-07-28 11:20:41 +02:00
Orgad Shaneh
c8495bedaf BareMetal: Do not execute if executable not found
Change-Id: Iea9bd22117133ab55ee6743d0f359808bfaef2aa
Reviewed-by: Tim Sander <tim@krieglstein.org>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-28 10:41:00 +02:00
Orgad Shaneh
c6d285544f Fix Qt4 compilation
Change-Id: I1789ec51aba4a832a67bba1c549473d413c77543
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-28 08:14:05 +02:00
Thomas Otto
590ccce734 LoadCoreDialog: only try reading from existing corefile
- currently gdb is called on every change of the core file, i.e. on
  every keypress when typing a path. Changed to only do that when the
  file exists

Change-Id: I27f1c21b2561420d72f273244dc6a1bb5fb8bfe7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-26 12:23:16 +02:00
Leena Miettinen
de5f0a7613 Doc: change doc to reflect the UI
The doc was changed in bc3865b7, but the corresponding UI
change has been lost (maybe during merges), so changing this
back for 3.2.

*DO NOT MERGE THIS CHANGE TO MASTER*

Change-Id: I7512971b0b5e2e5d5ef909c601d72aa504fd71bf
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-25 16:28:04 +02:00
Alessandro Portale
0cb887e6ae ProjectExplorer: Fix the download Url for jom
Change-Id: Id0405609f319472fc0eac9064ed9d14781217906
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-07-25 15:43:30 +02:00
Leena Miettinen
bfcc7065d3 Doc: fix typo in "Window" menu name
Change-Id: Ic2175f72e9dee9a63c8eda86cf431c7479b4c08e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-07-25 15:26:50 +02:00
Thomas Otto
537b45008b KitChooser: added focus proxy
- focus proxy set to the combo box if it is populated with > 1
  element, otherwise to the manage button

Change-Id: I4e27b7bb3300d43bc146660221ab9f48386210b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-25 14:55:10 +02:00
Leena Miettinen
57e6dfc35a Doc: fix changed Valgrind function names
Change-Id: I15c96c976c2e921588ddf420180b3318866dff9a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-25 14:38:41 +02:00
Leena Miettinen
86fc0157dc Doc: add Qbs build options
With screenshots.

Change-Id: Iec3b44c668fb99761664abcb9a0f9d22afb64ed9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-25 12:57:43 +02:00
Christian Stenger
ebd8cc314b QbsProjectManager: Fix compile
Change-Id: I532412928e0c58da63783d79038939564342cea7
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
2014-07-25 08:34:54 +02:00
Jake Petroules
4d24a16059 Qbs: Set cpp.xcodeSdkName and cpp.xcodeSdkVersion.
Change-Id: I17ef8c60589208810e9427187249b7a56c46b623
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-24 21:05:52 +02:00
Christian Stenger
895421897e Dumper: Fix typo and exception handling
Change-Id: I4008d5427da7cedc0f57183a25519a1aef1fcb7a
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-24 16:55:12 +02:00
Eike Ziller
a2c18fc6ec Version bump
Change-Id: I9be7fde5b69b65e759100efb0595e7ca2ac5bfb9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-24 16:35:33 +02:00
Daniel Teske
b1f183d06a Android: Fix modified flag for changes to the application name
Task-number: QTCREATORBUG-12065
Change-Id: I2e86274b5b1155a952438e7ea9223f6260e7ea53
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-24 16:26:34 +02:00
Eike Ziller
8803339806 Help: Fix crash when closing external help window
We need to explicitly remove the context that we registered for the
viewer in it. Otherwise it might happen that the deleted context object
is temporarily made "active" when the context for the whole window is
removed.

Change-Id: I903ae0a774751651cc2ec1661c0af8b8f7b3df2d
Task-number: QTCREATORBUG-12722
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-24 15:27:36 +02:00