Commit Graph

31174 Commits

Author SHA1 Message Date
Sergey Belyashov
b9ff6e65cf Russian translation update
Change-Id: I4ab239307f0c164f27fdb5e1234a9bb55c8ef7ca
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-05-22 09:55:32 +02:00
hjk
780c8283e9 Debugger: Adjust QList dumpers to LLDB needs
Change-Id: I01071510d422176b632bcaf93e009ad5056ea777
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 09:24:18 +02:00
hjk
a5e0ab136e Debugger: avoid using sys.maxsize, Mac doesn't like it
Change-Id: Ie58d19d24a80b71527bb5381bb3cc33475f1f8cb
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 09:23:52 +02:00
hjk
f863fa6044 Debugger: Show Qt version and dumper dir in failed autotests
Change-Id: I7520278266717e854dbb136a140381791f483c0c
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 09:23:37 +02:00
hjk
736d32ba8a Debugger: Add autoderef to LLDB
Change-Id: Ie0f5c10f1a8eb7af531a850051c773ab3993d52e
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 08:05:49 +02:00
hjk
9db98dc54e Debugger: Move some common code back to qttypes.py
Change-Id: I2306277ec39d6149c376bde584c51551a780877d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-22 08:05:20 +02:00
Thomas Hartmann
d1b940e415 QmlDesigner.PropertyEditor: also check for HasAnchor
Fixes a bug in conjunction with ApplicationWindow.
Anchors did not update properly.

Change-Id: I95ba118c8dde7e01117f649f2ff974f2c6ee6244
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-05-21 17:19:28 +02:00
Marco Bubke
4f28228293 QmlDesigner: Fix anchoring for application window
We don't tested that target anchor object are node instances. Now we
search for the parent object recursively.

Change-Id: I2e03e714f858a285309b02f5e88c757f0dcfe7e5
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 17:13:48 +02:00
El Mehdi Fekari
637ce777d3 Qnx: Set the correct target name in the application descriptor
In some cases, when deploying an exising project, the project name
is different from the target name set on the pro file.

Change-Id: I558a128467eb12a6d9d3731f563276bb54a14326
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-21 16:12:34 +02:00
Marco Bubke
51f9d137e5 QmlDesigner: Discriminate between painted and size bounding rectangle
Change-Id: Ic465e472c13570a1da0dee047c5810c50f7a4492
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 15:12:51 +02:00
Marco Bubke
7959867aac QmlDesigner: Change spacing of items
Change-Id: I1000019c720027c5fd9565582c78e7a7afa2fe25
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 15:12:42 +02:00
Eike Ziller
c31c5612ab Allow nested IContexts and use it to give extra editor windows a context
The extra editor windows need to have editor manager context, otherwise
shortcuts (like ctrl+tab) do not work in them if e.g. projects mode is
active. Doing this via add/removeAdditionalContexts would be non-trivial
and error prone, so adding a context to the extra window is more
convenient. Since editors themselves already define a context, we need
to allow nesting of contexts.

Change-Id: I244eca53ebd665fd4d8fe7531e8ff701ed0b40b2
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit deff0eb3c7)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-21 15:07:14 +02:00
Eike Ziller
2bfcb47d63 Add an action to show/hide the mode bar on the far left.
Change-Id: If7a74eed7fc77b1d0fd5e4045671b3767fe2d7a2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
(cherry picked from commit bde0627e59)
2013-05-21 15:07:03 +02:00
Eike Ziller
be62b79f93 Raise editor window after "go to line"
Change-Id: I3827716fa6233493224cd89d8417b95e7d34a711
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit f7612278b2)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-21 15:06:48 +02:00
Eike Ziller
838c0ad956 Make a few more shortcuts/actions raise the main window.
Also make registerShortcut set an application shortcut.
That is necessary when the user opened a separate editor window.

Change-Id: I366044b7acba51daca46a15a302a24b5b8e99cc1
Reviewed-by: David Schulz <david.schulz@digia.com>
(cherry picked from commit 5c8f46d25d)
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-21 15:06:38 +02:00
Eike Ziller
deff0eb3c7 Allow nested IContexts and use it to give extra editor windows a context
The extra editor windows need to have editor manager context, otherwise
shortcuts (like ctrl+tab) do not work in them if e.g. projects mode is
active. Doing this via add/removeAdditionalContexts would be non-trivial
and error prone, so adding a context to the extra window is more
convenient. Since editors themselves already define a context, we need
to allow nesting of contexts.

Change-Id: I244eca53ebd665fd4d8fe7531e8ff701ed0b40b2
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-21 14:55:34 +02:00
Eike Ziller
bde0627e59 Add an action to show/hide the mode bar on the far left.
Change-Id: If7a74eed7fc77b1d0fd5e4045671b3767fe2d7a2
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-21 14:53:35 +02:00
Eike Ziller
f7612278b2 Raise editor window after "go to line"
Change-Id: I3827716fa6233493224cd89d8417b95e7d34a711
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-21 14:48:55 +02:00
Eike Ziller
5c8f46d25d Make a few more shortcuts/actions raise the main window.
Also make registerShortcut set an application shortcut.
That is necessary when the user opened a separate editor window.

Change-Id: I366044b7acba51daca46a15a302a24b5b8e99cc1
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-21 14:48:30 +02:00
Marco Bubke
5847268778 QmlDesigner: Fix value change notification
The return value is always -1.

Change-Id: I19ede339e7557a794069b4dc991cb9f9a711caa9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 14:41:04 +02:00
Joerg Bornemann
f5ab5f3a46 fix build for namespaced Qt
Change-Id: Idd25bbea2c5adafbf893a10e107d4a8bfc2d221f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-21 14:26:00 +02:00
jkobus
23ddbce738 Align diff editor toolbar to the right
Change-Id: If1553b6472a1dc2e905f7a1d39c4c3038e878430
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-21 14:20:00 +02:00
Orgad Shaneh
5c25e3a616 Remove some redundant Environment copying
Change-Id: I70c74fdb4def2e29f3b850da9108e4ba5f572922
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-21 13:25:52 +02:00
Christian Kandeler
a78fa5fd9c Git: Fix include from ui file.
In the case of a shadow build, a relative local include will only
work by accident, if at all. Use a global one instead.

Change-Id: Idc2636d519ea19a3325c861cdcb1dcfb6e0a5920
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-05-21 13:18:25 +02:00
Marco Bubke
f68bd231c8 Revert "QmlDesigner: Remove NodeInstancesSignalSpy"
This is fixing some anchor movement bugs.

This reverts commit ae409f8bdf.

Change-Id: Ibe9b8b2601e2bcd1c249b5feda06fb3a29482f4b
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-05-21 13:08:10 +02:00
Christian Kandeler
d10fe8d2b6 Android: Fix qbs build.
Change-Id: I8183168e19a2ecf55f53f4699e02a86752dd076f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-21 12:22:28 +02:00
Christian Kandeler
399ebb84db RemoteLinux: Fix qbs build.
Change-Id: If4d51988df0b672dd44a19542209e1c85dd51cea
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2013-05-21 12:22:21 +02:00
Daniel Teske
270e0e8d84 Android: Use mingw32-make if ma-make is not found
Task-number: QTCREATORBUG-9297

Change-Id: I06345bd53fe5672ce7606745e6b19f89379a18db
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-05-21 11:41:05 +02:00
Daniel Teske
889740a90f Android: Extra search directory to find make on windows
The sdk should set that extra directory, via the sdktool.

E. g. something like
sdktool addKeys android MakeExtraSearchDirectory QString:%DIRECTORY%

where %DIRECTORY% is the bin directory of the bundled mingw.
That is Tools\MinGW\bin for the qt sdk.

Also see:
Task-number: QTCREATORBUG-9297

Change-Id: I487c67b7fb704dd00cf5c6f4f647c8c4fbe8cd3d
Reviewed-by: Ray Donnelly <mingw.android@gmail.com>
Reviewed-by: Iikka Eklund <iikka.eklund@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2013-05-21 11:40:36 +02:00
David Schulz
2989a1e571 Debugger: Remove set thread name exceptions from Issue Pane.
Task-number: QTCREATORBUG-9301

Change-Id: I0fed977ab0f0d55cece1dbaf9d6dc9c0c0e870be
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-21 09:47:00 +02:00
David Schulz
950a40e899 Cdbext: Remove unneeded enumeration.
Change-Id: I3fc66bad0177a1267e09b50b7631cbb89c18fb7c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-21 07:28:19 +02:00
Orgad Shaneh
782c8a2142 Git: Provide highlighter for interactive rebase
Inspired by Vim highlighting

Change-Id: I1c967d22d26f313b5b7d37634713071d621f6f46
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-17 17:59:26 +02:00
Orgad Shaneh
c60ab1ca3c Git: Fix object leaks
Change-Id: I0efb368782ffb66cf6b8d39650fe7840c5ef2501
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-17 17:59:10 +02:00
Robert Loehning
f7ac7fb241 Squish: Updated createNewQmlExtension()
Change-Id: I4739794a78fee1c347e2b63f46883f161140d360
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-17 16:35:45 +02:00
Robert Loehning
e5d6decccc Squish: Updated hook_utils
Change-Id: I7d2f43a9283f5b8a3edff4888a6b8c3eac076038
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-05-17 16:35:36 +02:00
Aurindam Jana
3f39943a37 CustomWizard: Add a placeholder field for QLineEdit
The XML file now has a placeholdertext attribute that sets
the place holder text for the corrsponding QLineEdit.

Change-Id: I537721a5e5be796f4f88054751e66e557e718948
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-17 16:16:38 +02:00
Aurindam Jana
7e0dd72252 CustomWizardPage: Connect user fields to completeChanged()
Change-Id: I0000c18ffebbcb25bb203dc16fd78b804de19042
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-17 16:16:30 +02:00
hjk
fcb419c510 Debugger: Make reference types visible with LLDB
Change-Id: I0caf56da8bc542f8829f21e703a6f4beb7d0b88d
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-17 16:08:11 +02:00
hjk
85957bc53e Debugger: Clean up std::{w,}string dumper
Change-Id: I224c0d02ebca40d394e2588465877f894ca9ded9
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-05-17 16:07:47 +02:00
Aurindam Jana
c57db61da3 CustomWizardPage: Register QTextEdit with correct signal.
Change-Id: I34bde66c157cdf48a3115a40cd61fc2e8e3a57bc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-05-17 15:53:11 +02:00
Orgad Shaneh
05b3903b6a Environment: Move isEmpty() test to beginning
No reason to initialize a QFileInfo for an empty string

Change-Id: I537fc98e1a5dd2283db9e5e60717eb8873c02b13
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:13:24 +02:00
Tobias Hunger
fc6ec40f2f Qbs: Properly report related runconfigurations for Qbs nodes
This fixes the run options in the context menu.

Change-Id: If4911f7357329fcb843206165e20d53bf6717258
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:08:48 +02:00
Tobias Hunger
ff778a6c88 Qbs: Add pointer to the project to QbsProjectNode
Change-Id: I81fe083ee4350efd89c3afb3f70deb46d0409ee2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:08:29 +02:00
Tobias Hunger
82a341da14 Qbs: Rename a couple of members to make them more obviously Qbs related
This is to avoid confusion between methods referring to Qt Creator classes
and Qbs classes of the same name.

Change-Id: I25b40c6fe1d2272a9d9b0f7fab2a4cafa079df8c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:08:00 +02:00
Tobias Hunger
728a06aa04 Qbs: Make name of some qbs-based member variables more explicit
This is to avoid confusion between methods referring to Qt Creator classes
and Qbs classes of the same name.

Change-Id: I3c9d66c593fb8004a0d47b115a0023aca0d41f28
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 15:07:54 +02:00
Robert Loehning
573be98843 Added note about apparent memory leak
Change-Id: I1772548f574144141c29540e1573ce60c657b9f6
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-05-17 14:56:31 +02:00
Marc Mutz
28d358b016 Use ProStringList::join(QChar) overload where applicable
Change-Id: I9c9964703dedfdab6e7bfac80be22bd5570e2e49
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/f4d47945ba17db276e94046473816014ed0342e9)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 14:53:09 +02:00
Marc Mutz
d3b425c99f qmake: add ProStringList::join(QChar)
Same reasoning as for 68e04c3ac148bcbe71f2deeb7288563f6cdbcab5 applies.

Adding the overload was easier than to teach a Perl script to distinguish
between QStringList and ProStringList instances...

Change-Id: I6de6ecf21fdad135ac213b5c794927a9bc120a92
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/cbf447069cfeb799ff5e09902be065d77f2e7707)
(cherry picked from qtbase/98a73e16012f75934ce4b6e4c85fb4d6a2ad0a28)
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-17 14:52:53 +02:00
Oswald Buddenhagen
2c660bd5b5 make error() abort the qmake run, not just the current file
Change-Id: I82fc55680f9ffb227e25acb39c797596225ba89e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/0da7f097249f71726140a38647bb4824b09fad7b)
2013-05-17 14:52:40 +02:00
Oswald Buddenhagen
9a33891d49 fix non-bootstrapped $$system()'s line end conversions on windows
Change-Id: I026da1312bc28619dc7aa5974b7f4c00710517ac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from qtbase/d92fd4ca54ae71e9c0190d15df9c131435a4be68)
2013-05-17 14:52:33 +02:00