Commit Graph

37180 Commits

Author SHA1 Message Date
Leena Miettinen
b1d8156742 Doc: column editing
Change-Id: I6d8f2269b616e91409de4218eebecf087a4a0215
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
v3.2.0
2014-08-18 09:52:02 +02:00
BogDan Vatra
05dffd3675 Android: Use the new gdbserver name for Qt 5.4+
Starting with Qt 5.4 we are packaging the gdbserver tool as libgdbserver.so,
otherwise gradle will refuse to add it to the package. Gdbserver is renamed
also for ant.

Change-Id: I4ef6408226ab05ea7b4e3d6f41dd368f5a602c7d
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2014-08-18 09:02:16 +02:00
Eike Ziller
6753bb2f61 version bump
Change-Id: Iaacd1793497a836ae7ddab7f7f6de34b89cf51d8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-17 22:53:46 +02:00
Robert Loehning
8c133689be Squish: Stabilize selectFromCombo
I keep losing the second mouseClick in tst_create_proj_wizard...

Change-Id: I45f37c848c7eccd9fd59c455e8d6c80c6de88c06
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-15 13:46:24 +02:00
Thomas Hartmann
312ee5fdf4 QmlDesigner.ImportManager: Fix comparison operator
The comparison operator was not consistent if comparing the same url.
This could trigger an assert for msvc debug builds.

Change-Id: Ia9febd7ffd7d0f4dbb64184931a526e61f020672
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-15 13:32:14 +02:00
Daniel Teske
1c6394b8cd New File Dialog: Tweak default node on Projct Page
The case from the bug report is:
/
 --> project.pro
 --> src
     --> foo.qrc
     --> folder
         --> file added here

Since the .qrc file is nearer then the .pro file, it was selected as the default node.
This patch makes the priority for the .qrc node -1 if it's a unmatched mime type.
That means a .qrc node will only be the default if it's either a image, a .qml or a .js
file.

Task-number: QTCREATORBUG-12793
Change-Id: I7328fd6359cc2e1959ab0bda831bd77de117baff
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-15 13:10:27 +02:00
Thomas Hartmann
f6dab5c0e3 QmlDesigner.FormeEditor: Crash fix
The model can already be detached when calling delayedReset.
In this case we just do nothing.

Change-Id: I889fcc4e267dac3403c2e35b8f77b1e4fb5b8050
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-15 12:18:42 +02:00
Christian Kandeler
f1ca76f6c2 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I93178253701239414ea83ec04ce54619020d2706
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-15 11:29:18 +02:00
jkobus
45dc2e2a73 Show the chunk context info in unified diff
Task-number: QTCREATORBUG-12394
Change-Id: I827fb894fd373b34cbae19f686b15acb697489c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-14 20:10:47 +02:00
Orgad Shaneh
e5b2c079ca PushToGerrit: Do not allow spaces in the reviewers edit
Task-number: QTCREATORBUG-11930
Change-Id: I0566fe2ef1d6e5ad9d99256d8a57a8e876a2e0c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-14 18:17:44 +02:00
Joerg Bornemann
b354d86014 fix usage of internal module names in qbs project files
Change-Id: I4afdddfe4d92e80ea831f130716c7713103b1f26
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-14 18:14:59 +02:00
Orgad Shaneh
7489007bdb DiffEditorDocument: Assign mimetype
It helps when savingAs vcs diffs for the first time.

Change-Id: I53b1c2c89641ee6b8106fb574c050ead60aa8da4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-14 16:01:49 +02:00
Topi Reinio
ceea1d9f5d Doc: Remove non-existent path from .qdocconf
Path 'snippets' does not exist.

Change-Id: I3cd5a426f4916e7cb5c7868f8bf437de8e59389c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-08-14 15:48:33 +02:00
Robert Loehning
75ec15e849 Squish: Fix tst_codepasting
Test crashed when there was unexpected output

Change-Id: I6fd56bf95d664cff5284e574db9b57f42b0e93cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-14 12:55:12 +02:00
jkobus
9109dd465b Add missing colon for win msvc scope
Bug in change 9795976a6b

Task-number: QTCREATORBUG-12770
Change-Id: I6034f7df9ef1159f0ce39d2784bda2755fefd829
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-14 11:51:52 +02:00
Robert Loehning
7e92419175 Squish: Fix hack for tests opening multiple files
Change-Id: I35ff3e1cf99a8e5f171f0728f05a3b828da78293
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-14 11:34:57 +02:00
Robert Loehning
4541173535 Squish: Remove pointless waiting
Change-Id: I1da64859bf5d6974ceacfe22d230be1983533d77
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-14 11:28:26 +02:00
Leena Miettinen
3ad3f7aa6b Doc: CONFIG += qtc_runnable
Task-number: QTCREATORBUG-10953
Change-Id: I3e4bdc129c76c83e6d45f20e0caddfb0dd88eef8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-14 09:32:30 +02:00
Robert Loehning
eb1ce50779 Compile fixes for Qt 4.8
Change-Id: Ie28d5901fe27fec4f928204296bf1013e10c556a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-13 17:32:36 +02:00
Daniel Teske
efcb802203 EditorConfiguration: Fix crash on unloading projects
Task-number: QTCREATORBUG-12814
Change-Id: I84d2ae60b8362b6fef45283c36aef1b8a20dbd95
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-13 17:08:07 +02:00
jkobus
ceedde8769 Try to show some meaningful diff when in merging state.
Instead of showing 3-way diff, show simple diff
of conflicted file compared to the head of current branch.

Task-number: QTCREATORBUG-10099
Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 16:53:24 +02:00
jkobus
0b1a49a66e Fix const correctness
Change-Id: I40728827423ef0832640de2ebd2ad6d637fb4a5c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 16:45:52 +02:00
jkobus
87b5db5562 Save / restore state in diff editor when reloading
Task-number: QTCREATORBUG-12650
Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-13 15:44:36 +02:00
Leena Miettinen
b97c9d731e Doc: resizing the locator window
There are now two ways to see long file paths.

Change-Id: I6d6b381b5bc4a2f39b78cecb2c0485d586c221fc
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-13 15:43:56 +02:00
Robert Loehning
5e318936d0 Squish: Stabilize tst_codepasting
Change-Id: I38f53d98159e15340b2f6cbc1912c6e15242dc5b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-13 15:32:01 +02:00
jkobus
908db4af5d Fix focus handling in diff editor
Task-number: QTCREATORBUG-12288
Change-Id: Ie5195fd3447bcedc4f7fd0515bedb524b5d96663
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 15:28:13 +02:00
jkobus
a9f00ac145 GitClient: use "git show" for show instead of "git diff"
Task-number: QTCREATORBUG-12755
Change-Id: Idc4427425a3ef3e70c8738f1062e20d50bab69ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-13 14:24:58 +02:00
Christian Kandeler
f7c739cbd4 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I36c24e180b72b49d392380e20bc98e83f7754684
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-13 13:59:13 +02:00
Oswald Buddenhagen
910abd6507 fix omission of QMAKE_INFO_PLIST from recognized file sources
Change-Id: I5c89b7d3806c68295a5304a6dbe7592a7e874d47
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-13 12:13:49 +02:00
Oswald Buddenhagen
f29d19a05f fix omission of DISTFILES from recognized file sources
Change-Id: I61bc0c9c9e5fc0811d776cb3a7bc8134f878d6a2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-13 12:13:46 +02:00
Takumi Asaki
d5800038e4 Update Japanese translation.
Change-Id: Iede96bf4c12579ee84524130aaa174ee40991cf2
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-13 11:26:18 +02:00
Rainer Keller
87280a11ff Remove templates from static list if plugin is unavailable
Removing those only from combobox is not sufficient because the
template list is accessed by current index of the combobox at several
places.

Change-Id: I1127159d010d87dff55c14b7ee1ce5497a1cc05c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-08-13 09:25:45 +02:00
Christian Kandeler
023e17009e QbsProjectManager: Fix linker name for MSVC.
As opposed to gcc, we can't just invoke the compiler binary for linking.

Task-number: QTCREATORBUG-12824
Change-Id: Icdf8b7217b14976a7a4249b5d0c5cc5f76ffdd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-12 17:49:20 +02:00
Ulf Hermann
7b6efde141 QmlProfiler: Use correct width for scaling timeline ranges
The width of the flickable element may be different from the width of
the timeline renderer because the flickable can have a scrollbar. This
is the same principle as in b3348daefd .

Change-Id: Ife0064c4226ecff0e99d3d6aaf7a104b3c46e751
Task-number: QTCREATORBUG-12822
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
2014-08-12 17:00:30 +02:00
Robert Loehning
646dcf0eea Squish: Hack when "Open File" dialog can't be found
Happens to me with binary packages for Linux.

Change-Id: I688103ba2df26056468e89271e815b5717effeee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-12 16:39:47 +02:00
Christian Stenger
2b02c0067f Squish: Use only Delete key that is documented
For consistency and to avoid unforeseen side effects.

Change-Id: Iebbf8179b604572e7ad24dbfbf757387788e2383
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-12 16:22:33 +02:00
jkobus
82a593579e Set general qml and qtquick features for wizards
Task-number: QTCREATORBUG-12469
Task-number: QTCREATORBUG-12760
Change-Id: I6c068fadc418d2973bda12f877121d30fbba449c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-12 15:59:17 +02:00
Christian Stenger
ee97aeb5b0 Squish: Revive WELP03 for Squish 5.1.1+
Change-Id: I8c92495f3441fc8ee68e34d15f48f4021ae90f90
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-12 15:43:31 +02:00
Daniel Teske
21b6d857fb Android: Fix link to fixed gdbs
Since the problem is close platform link to the parent directory.

Change-Id: I6e5128e9d00ed576ce048d1d48db61e6f758a979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-12 14:14:12 +02:00
Tim Jenssen
b4599aa250 QmlDesigner: fix binding loops while resizing
Change-Id: I897f7767f5539b4297cf9a0bbaf290adf82cb88b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 13:58:03 +02:00
Tim Jenssen
673b1c2cb4 QmlDesigner: do not call converToVariant on ListElements
Change-Id: I52c3e6ad8efe6e3907496993307da42c9e2482f4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 12:16:28 +02:00
Tim Jenssen
076bc1446b QmlDesigner: remove second setSource call
Change-Id: Ieee470f71b5bdd887986c12b214dc10702f48cc3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 12:16:20 +02:00
Tim Jenssen
395eacd5a4 QmlDesigner: remove second ComboBox entry
and sort it alphabetical

Change-Id: I944dea556e73181ab29cc167548a4e0f13485a99
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-12 12:16:12 +02:00
Eike Ziller
692845ae06 Android: Do not create temporary files in CWD
Change-Id: I52c575b43406c0a1a758c540e8d0947f51eca11b
Task-number: QTCREATORBUG-12813
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-12 11:33:27 +02:00
Thomas Hartmann
b1539cc873 QmlDesigner.PropertyEditor: Fix Layout for TextFieldSpecifics
Change-Id: I476849dca1b3d9785e78ed2d66a163698aee6f49
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-12 11:07:23 +02:00
jkobus
afea017c80 DiffEditor: Fix double click inside commit editor
The bug was that if you double-click a file
in the commit editor, then double-click another one,
the diff remains with the first one.

Change-Id: I1f49b549c9dfd3ebd4ec6950ed28dd8cbc7d0227
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-12 10:30:01 +02:00
Orgad Shaneh
d03927f373 DiffEditor: Fix no newline handling
Change-Id: I3278ae80d7ee010942122723b3e8bb8c729e7182
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-08-11 20:20:20 +02:00
Thomas Hartmann
121dfaec13 QmlDesigner.PropertyEditor: Fix layout in CheckBoxSpecifics
The LineEdit should take the whole width.

Change-Id: Ic2a1fc3803da376b412843da0da8e950e8db1141
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-11 16:33:05 +02:00
Fawzi Mohamed
4539aa0c2b Ios: Fix version comparison
after an hint of CppCheck performed by Tobias Hunger

Change-Id: I5b2239faa4acf936389e1b4d1d7eb2acc3e7f3b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-08-11 14:29:48 +02:00
Thomas Hartmann
75d9ce0f96 QmlDesigner.NodeInstances: improve mockup for Window
The window mockup now contains some support for the toolbar of
ApplicationWindow. The status bar is always invisble and just
a place holder.

I reduced the import for QtQuick 2 to support Qt 5.1.

Change-Id: Ic2241bf3fdd0d2967f988add06075a9e145a1cbc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:53:25 +02:00