Commit Graph

31523 Commits

Author SHA1 Message Date
Marco Bubke
df695c6a4f QmlDesigner: Activate move tool only if selected item has no xy binding
Change-Id: I680bf47ad962f0a62d3507132970a3c0c02f2ef8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:41 +02:00
Marco Bubke
9a3495cba1 QmlDesigner: Movable items should be have no xy binding
Change-Id: I621472e4d51ceb786684ed0d69598724e853e4df
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:34 +02:00
Marco Bubke
8fb5661f66 QmlDesigner: Don't show resize handles for a non movable item
Change-Id: Ie3e01a2b5f3e8296afaa8c87a307fb1ec07092d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:28 +02:00
Marco Bubke
17a10c6432 QmlDesigner: Don't show resize handles for a non resizable item
Change-Id: I02be8d0641b03206a6739c3f8820b2862745df06
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:22 +02:00
Marco Bubke
86375a8726 QmlDesigner: Add modelIsMovable to QmlItemNode
Change-Id: I211ce2bbea4dc12e4738cf8af96b3781d300005c
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:13:03 +02:00
Marco Bubke
3afc362b13 QmlDesigner: Add modelIsResizable to QmlItem
Change-Id: I11020a8216b09d965e2cfd3cbc7ee804068d7370
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:12:45 +02:00
Marco Bubke
32ddd2b308 QmlDesigner: Add BindingIndicator
Change-Id: I46a763f87e19114e223b9eb897cbb89cf1f4c3d5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:12:22 +02:00
Marco Bubke
dd742afd71 QmlDesigner: Update AnchorIndicatorGraphicsItem after updating anchorlines
Change-Id: Ibdde4d8a32abac8bc7b1572507c7a8094d28f604
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 15:12:13 +02:00
hjk
98917598d3 ProjectManager: Use Core::Id for progress types
Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-04 14:59:06 +02:00
Tobias Hunger
1f340d44f7 Fakevim: Add missing Q_OBJECT macro
Change-Id: I886861448ef704bde559bc847816da4c53f0fbde
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 14:47:09 +02:00
Tobias Hunger
f20a276182 Find: Remove some Find namespace usages
Change-Id: I3caf03474c7e080766b85c6a3042f6a29f13cd40
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-04 14:46:55 +02:00
Marco Bubke
a810c0847c QmlDesigner: Only top items without xy bindings are movable
Change-Id: Ic90faca4ffe71fbc52e3c7110a3a524ca9cbba27
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 14:31:56 +02:00
Tim Jenssen
ff775f6d55 adding python to *.py package calls
- under windows we had the problem that *.py needs to be registered and
    even if we had it: a call with modified PATH variable resulted in
    strange two PATH variables in the environment (not sure that this was
    a problem of nmake or something else)
  - added -u to get the output unbuffered

Change-Id: I9326a31fc39a95b61d92bb00549f536db04af985
Reviewed-by: Matti Paaso <matti.paaso@digia.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
2013-09-04 11:39:00 +02:00
Daniel Teske
b14a0e58e6 Android: Make sign package orthogonal to the debug vs release
This enables signing debug packages and creating unsigned release
packages.

Task-number: QTCREATORBUG-10060
Change-Id: I57d094972b451538e8e9e5104e803e50a4ba2336
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2013-09-04 11:21:54 +02:00
Friedemann Kleint
f869b587de Fix warnings about unused variables and */* in QML-Designer.
Change-Id: I5724ae5faad6a125b7da17436f0c6b83492d4ebb
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-04 10:47:05 +02:00
Nikolai Kosjar
f3ca72f989 Plugin tests: Run in separate settings path
...if no settings path is specified by the user.

The default settins path for tests will be set to the system's temporary
directory + "/qtc-${IDE_VERSION_LONG}-test-settings".

Change-Id: Ibeaf8883c80169b4d6a3a97020a16f910292d67a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-04 09:56:12 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 09:19:10 +02:00
Friedemann Kleint
435ec2ba51 Compile on Windows.
Breakage introduced by fa05b23a23 .

Change-Id: I45cf7f03d8d4d2a13300090d86f83cc3a15598f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 08:23:50 +02:00
Christian Kandeler
5b21ee5925 QbsProjectManager: Fix potential crashes when resolving a project.
First case: Re-parsing is requested while a project is being resolved.
The respective function can be entered more than once due to signal
callbacks, resulting in double deletion of the job object.
Second case: Closing Creator while a project is being resolved lets the
resolve job run unattended, resulting in a crash on exit.

Change-Id: I99e034a211ebe730dd02096ce76d601fbc848f5c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 16:24:31 +02:00
Christian Kandeler
f27b738f65 QbsProjectManager: Add support for remote targets.
After parsing, we tell the target about deployable files
and executables, so it can make use of that information
for deployment and remote execution, respectively.
In addition, the current default deploy configuration (consisting of
just an install step) is now set up only for the desktop device,
since other targets will likely provide specialized deployment
solutions.
The most noticeable effect of this patch is that the RemoteLinux
target and its descendants now work out of the box with qbs projects.

Change-Id: I512d4e215f2fa540efd4de5f5c1e53abaa0596d1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 16:23:32 +02:00
Christian Kandeler
cf1b600967 Update qbs submodule.
Change-Id: I470df8aa8f8966a37a8be38e8917b48061ede24b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 16:23:08 +02:00
Tobias Hunger
bf09017c1a ClearCase: Remove some ClearCase namespace usages
Change-Id: Ic1f08795af7cc8589f9a4493a654beb2b358cf55
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-03 16:19:20 +02:00
Tobias Hunger
a82654a485 Android: Remove some Android namespace usages
Change-Id: I74df950ff9de6ddc639a4b32bec55c269b5fb0e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-03 16:18:26 +02:00
Tobias Hunger
eb4d64a860 Cvs: Remove some Cvs namespace usages
Change-Id: I73250f29ef9324d100202c855d78336935be7397
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 16:10:37 +02:00
hjk
fa05b23a23 ProjectExplorer: Remove some explicit namespacing.
Change-Id: Ie70586d709e8dee8eeb85af1b77ba740eb2ed9d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 15:46:25 +02:00
hjk
2424909035 Locator: Fix broken connection after df361843
Change-Id: I51333ce8717ba0f393987c91521fdbd63ea63929
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-09-03 15:35:06 +02:00
Alexey Semenko
da4c4b80f3 Completions: move continuations upper in proposals list.
Since fuzzy completions are allowed, the lexicographically first proposal
is not necessarily most relevant. The patch modifies sorting of proposals
so that the exact match and continuations go first, and fuzzy completions
follow.

Moreover, being a continuation seem to be a more important characteristic
of a proposal, than being it a function argument or keyword etc. That's why
the check for continuation is placed before the check for order.

Task-number: QTCREATORBUG-8737
Task-number: QTCREATORBUG-9236
Change-Id: I89aae9d2ce6bfa59af7c2f75e6f3af00212008ca
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Alexey Zhondin <lexxmark.dev@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-03 14:44:41 +02:00
Orgad Shaneh
adee8336bb C++: Custom directory list for Switch Header/Source
Some projects use separate directories for sources and headers.

An example tree:
*
|-- src
     |-- foo.cpp
|-- include
     |-- foo.h

Allow the user to specify directories for finding out-of-project related
header/source files, in addition to current directory

Task-number: QTCREATORBUG-8883
Change-Id: I57215c8f2feffcc246d0d161798290861bcfcdd4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-09-03 14:25:05 +02:00
Tobias Hunger
d0385537b2 Macro: Add missing Q_OBJECT macro
Change-Id: I26089e5a9c982e517df89cf48699bea4589939fb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 13:32:57 +02:00
Friedemann Kleint
09dc9bfa7a Debugger: Recognize "unsigned int" as int type.
Enabling the hex tooltip in the watchhandler.

Change-Id: I8fdca8a7e741e47ae9cff19161746051b14581d0
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 13:14:18 +02:00
Daniel Teske
2a172c7584 BuildManager: Move clearing of compile output to before BS::init()
So that we preserve the output of the init() functions.

Change-Id: I3528424b1a94fcf615a35dda002f2480cc1e7d32
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:19:31 +02:00
Daniel Teske
f214011d33 Kit: makeSticky() -> setSticky(), allows for unsetting sticky bit
Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:18:29 +02:00
Tobias Hunger
acd5e135f1 Mainwindow: Remove accessors for mimedatabase and vcsmanager
Fix fallout of those changes.

Change-Id: Ie90a8d3a9eb0a171ea5b4036f99298badf0302fc
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 12:12:36 +02:00
Tobias Hunger
451637a697 Mainwindow: Remove code commented out since 2008
Change-Id: Idab2836dc2a0c41c9feffd52a6c0d66846c1be2f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 12:09:03 +02:00
hjk
267e441af4 Apply 'static' pattern to VcsManager
Adapt user and surrounding code.

Change-Id: Id2648f82a9cbbd0ad0bfb91f6958b8cee7ea29cc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 12:01:24 +02:00
Tobias Hunger
d18b61b85d Core::Id: Remove some explicit casts to Core::Id
Change-Id: Ibe505c8331f7d1280fdb8784a00321742f5d94cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:57:23 +02:00
Marco Bubke
480d014b44 QmlDesigner: Add AnchorIndicator
Change-Id: I0cd4b3c9dc0178936ffd96d8acb443ce1a228d1f
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-03 11:47:05 +02:00
Marco Bubke
036ab272b8 QmlDesigner: Change resize handle to rectangle
Change-Id: Iffc08dda9dcb9260f72b07a492e93c40dfe59586
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-03 11:46:57 +02:00
Marco Bubke
27ffd0a3a4 QmlDesigner: Add model anchor functions to QmlAnchors
Change-Id: I50084cb28232ced2de8136b0e44efc4a14a28cc2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-09-03 11:46:48 +02:00
hjk
a37589d431 Apply 'static' pattern to MimeDatabase
Also adjust and streamline using and surrounding code.

Change-Id: I6a8b05126bdcbb74ff611b21c7cb3c5902a2d5ca
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-03 11:41:45 +02:00
Friedemann Kleint
1226400af3 Introduce an enumeration for toolchain autodetection.
Replace boolean "autodetect" by an enumeration with a value
AutoDetectionFromSettings indicating whether the Autodetection
originates from a settings file. Enable the "Remove" button for
those cases.

Currently, there is no way to remove toolchains that were once
autodetected and are no longer present. This happens for example
when working in different MinGW environments, which then
clutter up the toolchain options page and dramatically slow
down the options page opening since gcc is launched to query
the flags, etc.

Change-Id: I731168d8694fe56f60d909f9779f83cffa55fd44
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:32:33 +02:00
Friedemann Kleint
f1d18ba38b Output warning when g++ - invocation fails in GccToolchain.
Change-Id: I5ed05307531f0d3a7850fb251cfa5cbd2a75e09f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 10:56:41 +02:00
Friedemann Kleint
6d8b723a53 Always add command path to environment in GccToolchain.
Fixes: SOFT ASSERT: "predefinedMacros.startsWith("#define ")" in
file .\gcctoolchain.cpp for MinGW since the g++ - invocation
to determine the macros causes g++ to launch a subprocess
which then fails.

Change-Id: If4e7b302ac57f7cbed4982a468bcb1cb3b39f028
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-03 10:56:31 +02:00
Robert Loehning
fd08c7e6e8 Squish: Fix failure message
Change-Id: I77f46ccc87fe0ae64fcab17c35af93c6064dc9f4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-09-03 10:45:51 +02:00
Andre Hartmann
54c856d3bc OutputWindow: Fix spelling of private member.
Change-Id: I94e4cc355f3fd4575f560d4c65c7dc24df1a4cc7
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-09-02 21:14:06 +02:00
Christian Kandeler
72d173829c Remove superfluous include paths from project files.
A lot of our build system files specify unneeded include
paths. These roughly fall into the following categories:
    a) Paths that are already set in more general files
       such as qtcreator.pri.
    b) Paths that serve no purpose at all, possibly
       left over from earlier versions of the project.
    c) Paths that act as workarounds for wrong include
       statements of the form '#include "xyz.h"', where
       xyz.h is not in the same directory as the including
      file.
This patch removes such path specifications and fixes the offending
include statements from case c).
Tested on Linux, Windows and OSX with qmake and qbs.

Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2013-09-02 17:28:17 +02:00
Tobias Hunger
7c4d0d3bf3 Custom toolchain: Fix typo
Change-Id: I340aa24000da4a788e9a1da43f797be7dfe5809c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-09-02 17:11:22 +02:00
Friedemann Kleint
489639fadb Fix warning about unused variable in AndroidToolchain.
Change-Id: I7759fc9b069015d5559b014a84ed01e50471746e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-02 16:09:15 +02:00
hjk
5c62a0f944 Debugger: Don't make engine type appear editable
It is determined by the chosen debugger, no need for a combo box.

Change-Id: I1e278469bcd861a05eb102e94accee4dfc222b62
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-02 15:38:47 +02:00
hjk
7f3a156778 Debugger: Use correct path separators in display on Windows
Change-Id: Idef95d15bb78c7fbda8afac4f264e23011d63393
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-02 15:38:40 +02:00