Commit Graph

37148 Commits

Author SHA1 Message Date
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
Thomas Hartmann
13987a92ab QmlDesigner.PropertyEditor: Fix layout in RadioButtonSpecifics
The LineEdit should take the whole width.

Change-Id: Ic64798f17452b19d87872383041144192238813a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:45:14 +02:00
Thomas Hartmann
6cd67dffef QmlDesigner.PropertyEditor: Fix Layout in Url template
An Url is not translatable.

Change-Id: Id68e03ff8c05e7e7f7c1c419d482ce40aaef4e8b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:45:08 +02:00
Thomas Hartmann
9e710d23e8 QmlDesigner.DocumentManager: Do not scatter items in layouts
Items in layouts do not need to be positioned.

Change-Id: I2bf0c83be48bd9aad11aab74e56e8a27f962214a
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:45:01 +02:00
Thomas Hartmann
bfdffd2a7d QmlDesigner.NodeInstances: Check expressions
I do not see any reason to set an expression that contains a
code block.

Change-Id: I74960a6bac741db46d86e33299e8b1669e781e65
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-11 13:44:53 +02:00
Orgad Shaneh
29fa5d4a3f TextEditor: Fix rendering of find&replace scope
Broken in 739795ce8c

This is a revert of the non-trivial parts of this commit.

Task-number: QTCREATORBUG-12661
Change-Id: Iad58750e03464605e6fcc6eff8262f3d7473b07e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-11 13:41:43 +02:00
Christian Stenger
30ab57293e Templates: Fix sample wizard
Change-Id: I9c388478b2a5491f42bc653d5925b6b01ab83831
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-08-11 12:06:44 +02:00
Leena Miettinen
bb8744c672 Doc: new diff editor buttons
For reloading changed files and viewing changes in a
unified view.

Change-Id: Ic6cedb6c534c34e6aed3973add2087e96fb6aa57
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-08-11 10:45:20 +02:00
BogDan Vatra
d7760f19a2 Android: Use the new gdbserver name for Qt 5.4+
Starting with Qt 5.4 we are packaging the gdbserver tool as gdbserver.so,
otherwise gradle will refuse to add it to the package. Gdbserver is renamed
also for ant.

Change-Id: I6da3ad54de591c124fe56d5464e74099dfd901a1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-08-08 17:37:28 +02:00
Viktor Ostashevskyi
e0abca4be7 Ukrainian translation update for 3.2
Change-Id: Ieea87dd1f04aa6e23350636220ca872686745f5d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-08-08 16:37:17 +02:00
Christian Kandeler
c4e22ddaf1 QbsProjectManager: Use the right linker command.
Task-number: QTCREATORBUG-12808
Change-Id: I28e7544d80779e5f2a8b6fa3156af8292a9d1201
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-08 16:26:58 +02:00
Christian Kandeler
1c46066de5 QbsProjectManager: Add qbsconstants.h to qbs project file.
Change-Id: Ia63f27bf6963583d3abd1d37fa7784b05e552aed
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-08 16:26:43 +02:00
Christian Kandeler
144db429a5 Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I3798834031485d88d21371e42343862ed1ffe86e
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-08 14:51:49 +02:00
Christian Kandeler
433426847f Fix RPATH for qbs application.
The current random number of backslashes results in an RPATH of
'\RIGIN' in the binary. Use a different random number of backslashes
instead.

Change-Id: Ife0f1a9c7f65d9e83dc39e90cb150421755ebb2c
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-08 14:40:19 +02:00
Thomas Hartmann
ba1dd7416d QmlDesigner.PropertyEditor: Fixing TextAreaSpecifics
Change-Id: Id3d5c2879989ebaf23cf767673fd9991be8b96dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-08 13:57:57 +02:00
Oswald Buddenhagen
3e08d94436 don't add qbs-related flags to CONFIG over and over again
Change-Id: I0ca49213d45ab7ab193266bbbc7f201cecdc6eac
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-08 13:17:40 +02:00
Thomas Hartmann
7468ccc360 QmlDesigner.Model: Make removeProperty const
Change-Id: I717a9d2cafc0636f4dcfbae074f30e214a089b8f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-08 12:07:30 +02:00
Thomas Hartmann
8dfea82582 QmlDesigner.Property: Fix Layout in ButtonSpecifics
The LineEdits should take all the width available.

Change-Id: I3c530e0145e78aaa2f842ae9e0aceb0007bedad3
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-08 11:08:06 +02:00
Thomas Hartmann
56d8aabe55 QmlDesigner.MetaInfo: Add SplitView to isLayoutable()
Change-Id: I01ec7f1562663d356bd4f91e1448d8473ce2fe98
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-08 11:07:41 +02:00
Thomas Hartmann
447f56b0d1 QmlDesigner.Navigator: Do not position items in layouts
Change-Id: I5125db79885c8a7fcec686170240d699d0d8ed5b
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:45:52 +02:00
Thomas Hartmann
03ac986413 QmlDesigner.NodeInstances: Adding more objects to the ignore list
There is no real reason to ever instantiate those.

Change-Id: I1bb86b5f5794f10bf2cad124499df6ee8add6909
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:45:33 +02:00
Thomas Hartmann
f112076227 QmlDesigner.ComboBox: Minor fix
If we cannot read the index we set the index to 0.

Change-Id: Id990ca1640f9314931af9249c798c8b51ea5c0bb
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:45:13 +02:00
Thomas Hartmann
7d5d5fa311 QmlDesigner.DebugView: Add output for selection changes
Change-Id: Ice4a3bbeedd48712429e2fdfdcb325fa25b68727
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-08 09:44:52 +02:00
Joerg Bornemann
bdce4fdeb3 WinRt: remove superfluous static_casts
QtVersionManager::instance() returns QtVersionManager* these days.

Change-Id: I15f25140ae3ff6b85dd0d96857ed0c2968e7126a
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-08-07 18:10:43 +02:00
Thomas Hartmann
3a551b7b9c QmlDesigner.QmlItemNode: Items in layouts are not movable
Change-Id: Ib7d25e4dd9f912b1829d58e51ee46e966f5cd186
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-07 17:02:46 +02:00
Thomas Hartmann
3e83e437c8 QmlDesigner.MetaInfo: Do not convert Enumeration
This is a designer specific type that is never converted.

Change-Id: Ibfe73bdb441cbd17ec728025b9c8bf77d3df2587
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-08-07 16:01:51 +02:00
Christian Kandeler
985d2828d3 Utils: Add algorithm.h to qbs project file.
Change-Id: I7a2d73cbc8cecef20cd2c593514f3f012e260428
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-07 15:58:01 +02:00
Christian Kandeler
03b6e23d90 QbsProjectManager: Make sure run configs are available before a build.
This already works for Desktop run configurations, because they get
special treatment for historical reasons. But it does not currently work
for targets such as RemoteLinux.

Change-Id: Iba5191538314146909567bc7b5993dcc0b9d21cd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-07 15:57:47 +02:00
Thomas Hartmann
4d8966ab87 QmlDesigner.ItemLibrary: Remove TabView
The TabView support is not complete enough.

Change-Id: I24553341a5eae68f309a1fb24a61a72a3c634a17
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-07 12:37:43 +02:00
Thomas Hartmann
cae8c2a8e2 QmlDesigner.PropertyEditor: Checked is only valid if checkable is true
If checkable is false we disable the checked property CheckBox.

Change-Id: I128d78e15d0d711f33b4af191a4c24869ca37127
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-07 12:37:38 +02:00
Thomas Hartmann
0b0666909c QmlDesigner.PropertyEditor: Indicating if a CheckBox is disabled
Change-Id: Ica4016cc45c66720c189f95ed69df84a0558c1fc
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-07 12:37:33 +02:00
Orgad Shaneh
bd418af17c QmlDesigner: Fix compiler warnings
* Unused static function
* Unused argument
* Wrong enum comparison

Change-Id: I8a06f4383cbc57cdfbc6869e6f25bb88ffaeeecf
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-08-07 09:48:10 +02:00
Jake Petroules
d4bf07a974 Let Qbs handle Info.plist embedding.
For command-line applications, Qbs embeds the Info.plist by default if
one is specified with the infoPlistFile or through other means.

Task-number: QTCREATORBUG-11492
Change-Id: I5e40cb9c1461d6ba4c178c045930017449327af3
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-08-06 18:42:07 +02:00