Commit Graph

31174 Commits

Author SHA1 Message Date
Orgad Shaneh
63cf15b180 Git: Start interactive rebase in topLevel
Change-Id: I99edfed36b12942e64ee1947a46eddd1ca08b9ba
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 13:24:16 +02:00
Orgad Shaneh
2ee83d4c9e Git: Fix stash pop on end of a continuous command
Broken in 92392454b7

Change-Id: I4e3d3b1c2fbec66c5471baedf1996529b852b868
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 13:23:44 +02:00
Christiaan Janssen
485315ec67 QmlProfiler: fix potential crash
fixes Ib2ea66bd5694046577a0b5a0e2f611f3ffba0238

Change-Id: Ib7a4e02391513984f1c81a43a5fab490b7f88923
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 12:41:16 +02:00
Friedemann Kleint
8140a87f9a QmlJsTools: Compile fix for Qt 4.
Change-Id: Ifaa78943be52d821bfbc3f32fb3fc914cf2d4315
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-05 12:20:39 +02:00
Marco Bubke
d931583008 QmlDesigner: Double click in the form editor only for the left mouse button
Change-Id: I130bacab8d94ddc5b8544a1b74d662059f976aca
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-05 12:20:13 +02:00
Marco Bubke
6b49ef4f2e QmlDesigner: Fix nodeinstancesignalspy
The signal spy never worked with value types. The recursive code is not
needed anymore and anyway broken.

Change-Id: I28861d13fa6ca8b7e8af97f5720c2968759da264
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-05 12:20:03 +02:00
Eike Ziller
8f8b8dda6a Merge remote-tracking branch 'origin/2.7' into 2.8 2013-06-05 12:06:08 +02:00
Thomas Hartmann
34022107f0 QmlDesigner.PropertyEditor: Add generic QtObject pane
This patch adds a generic property editor pane for QtObject.
Objects derived from QtObject get an auto generated property editor
for their additional properties or can use the specfics mechanism
to define a custom one.

Task-number: QTCREATORBUG-9451
Change-Id: I730b19e4e417f3f4d4ee6cdf2b3f3ef32f8c1f94
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-05 12:05:33 +02:00
Thomas Hartmann
1b3e526944 QmlDesigner.PropertyEditor: use F3 to reload property panes
F3 is still free in Qt Creator

Change-Id: I0588e467a5f7c60ee621c472614be6003d5fe2dd
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-05 12:05:10 +02:00
Thomas Hartmann
fef85f745f QmlDesigner.PropertyEditor: Adding lookup rules for different versions
The property editor will now try to find a pane for the specific
version first.

Example:

If we have a QtQuick.Item 2.0

We first look for: QtQuick/ItemPane_2_0.qml
And then fallback to: QtQuick/ItemPane.qml

The same does apply for the specifics file.

Task-number: QTCREATORBUG-8681
Change-Id: If210998780073295f168169d2fc424288d3bd6a0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-05 12:04:58 +02:00
Eike Ziller
570320fecd Fix translation file / build
Change-Id: I6b48de43028b75a1e477d90334fecb2e7bf30835
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-05 12:04:36 +02:00
Eike Ziller
4acece6d9e Merge remote-tracking branch 'origin/2.7' into 2.8
Conflicts:
	src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4
2013-06-05 11:14:48 +02:00
Tobias Hunger
cd028ac14f Do not pass a file that we know to be broken to QTextStream
Change-Id: I1a593af642c70ca7a0654163e7a32d405a1c2aa6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-05 10:40:56 +02:00
Tobias Hunger
8cd56cf68d Make sure to call FileSaver::finalize
We may leak resources otherwise.

Change-Id: Ic09f58bd47cbf283e22f17f2c3393ca03c5dfacf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-05 10:40:51 +02:00
Tobias Hunger
c6cbc97a5c FileSaver: Do not rollback if we never opened the file
This will silence some warnings about removing files with empty
filenames which we get due to trying to remove a file we never
managed to open.

Calling finalize() unconditionally is the right thing to do here
as that processes and/or displays on error message to the user
if there is any.

Change-Id: Ibe7d07233f2c2698e53a7ad21041bc5cc4fcac0e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-05 10:40:41 +02:00
Leena Miettinen
1d5eb6812a Doc: the -block CLI command
Change-Id: I955ebdd5896750fd0c598e9d59cf2ace5c28a591
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 10:20:59 +02:00
Orgad Shaneh
277fa49d28 Fix compilation
Change-Id: I269013c06dd540309b95cf1411bbc3571df2c5b5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-05 10:10:46 +02:00
Orgad Shaneh
81fc8ff210 Doc: Remove \fn lines adjacent to functions
They are unneeded, some of them are unmaintained

Change-Id: I0ad87e152d8e2328b486b2f904f7cf9613004afe
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-05 10:07:14 +02:00
Friedemann Kleint
506b4ca9a8 tr()-Fixes.
Change-Id: Ie4645f3a3c82d18099dd154293d242ab07b1e5fc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2013-06-05 09:45:29 +02:00
Eike Ziller
7c8db79817 Switch less often to edit mode
This change
* Removes IMode::type, ModeManager::activateModeType, and
  IEditor::preferredModeType, and adds IEditor::isDesignModePreferred
  instead
* Adapts the mode switching code in EditorManager to handle multiple
  windows, for example switching to edit mode should only happen if
  the editor/view is in the main window. Otherwise the editor window
  should be raised and focused
* Renames EditorManager::NoActivate --> DoNotChangeCurrentEditor
* Reverts the EditorManager::ModeSwitch logic to switch mode or
  make the current editor visible by default, introducing
  DoNotMakeVisible flag instead
* Fixes a few instances where EditorManager::ModeSwitch should have been
  used

One non-trivial problem left: If you open a .ui file and switch to an
external editor window, edit mode is activated, because the current
editor no longer is a .ui file, which means that the design mode gets
deactivated.

Change-Id: I76c5c2391eb4090143b778fb103acff3a5a1ff41
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-05 09:43:14 +02:00
jkobus
f99ce422b4 Remove unused code
Change-Id: Icc4bb2648fc4e18e95216012ce08365940a80937
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-05 09:16:34 +02:00
Eike Ziller
9d0346a373 diffeditor: Fix qbs build
Change-Id: Ia657fbe20f51657295bfe657a88dab58c668c3f1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-05 09:16:18 +02:00
Petar Perisin
046fd0523d Git - remove unnecessary member m_createRepositoryAction
Change-Id: I3b3f72c5699e63f3f273b1564ea0a093b6c9725b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-04 23:34:16 +02:00
Petar Perisin
45e6edaf3a Git - fix bug with empty working directory in ChangeSelectionDialog
and also remove unnedded command.

Change-Id: I6c20f2061fc3628693d80ad01fe23c1a835ca127
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2013-06-04 23:12:53 +02:00
Petar Perisin
808afcfbb2 Git - made Clean List support submodules
Change-Id: I106420e8492d64451eee3648800ce57a4de2bfb9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-06-04 21:14:12 +02:00
Marco Bubke
4ca80b1577 QmlDesigner: Add panning for the formeditor
You can now pan if you drag the mouse around with the middle mouse button.

Change-Id: I70e1666c542406b126214c2b9b8b56193bcbcf76
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 18:31:47 +02:00
Leena Miettinen
9fa03fb3d5 Doc: applying style sheets to Qt Creator
Task-number: QTCREATORBUG-9238

Change-Id: Ibbb81dc61f5f2938aee81d85129cdaad48c112df
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-04 17:19:14 +02:00
hjk
9c5a4dff1d Debugger: Work on LLDB dumper autotests
Implement putEmptyValue, use type priorities,
introduce concept of backend specific tests.
39 pass, 136 fail...

Change-Id: I71e89259dc925f799bca413b537b65e9e689e1b8
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-04 17:04:29 +02:00
Marco Bubke
c770e7074f Revert "Force gray-antialiasing for text."
Was already picked in 2.8 and the file it is changing is renamed in 2.8.

This reverts commit 83b0e3ce7650fca1a6388297f54627677eebe5d5

Change-Id: I2288241dc33fb713efaf8f182568bb1cd348f633
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-06-04 16:43:37 +02:00
Marco Bubke
093c937c4f QmlDesigner: Export DesignDocument
Change-Id: I3aa1217c990ae36a43b269d8177fc5566b1c9dea
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 16:26:26 +02:00
Marco Bubke
b90c26bd55 QmlDesigner: Add plugin directory to the exported directories
Change-Id: If230176bc7e96476e2f748d850a5a4c93b57cafa
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 16:25:51 +02:00
Lorenz Haas
cc1b66f1cc CppTools: Open InsertionPointLocator::methodDefinition for symbols
Remove restricted use of declarations and add an option to define if
SymbolFinder should be used to find a matching definition for symbol.

Change-Id: If5cf5b11926e116766dd60dd3726b4fcf2e1c9f5
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-04 15:54:19 +02:00
Nikolai Kosjar
1738ff64a6 CppEditor: Fix moving definitions
* Move initializer lists completely
* Respect whitespace as it is

Task-number: QTCREATORBUG-9462
Task-number: QTCREATORBUG-9463

Change-Id: Id9c41394b4aa55b0a85957286ab42f2ce8966c08
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2013-06-04 15:53:47 +02:00
Oswald Buddenhagen
28df27d924 update m_featureRoots less aggressively
it's not necessary to immediately re-calculate the roots after assigning
QMAKE_PLATFORM - it's sufficient to do it on-demand, so merely
invalidate them. this avoids that we re-calculate them multiple times
without ever using them in between while processing specs with
distributed platform assignments.

Change-Id: If508594764811b96a577fc81c5ded34ab0453148
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
2013-06-04 15:43:00 +02:00
Oswald Buddenhagen
fa27cd79e0 cache results of feature search
looking up the same files in the same locations over and over again
is a rather significant waste. in particular, looking up the CONFIG
flags that don't correspond with features has a measurable impact on qt
creator's project loading time.

Task-number: QTCREATORBUG-9154
Change-Id: Ibae3d8b7797e706a6416a7d45c77734ab1281b51
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 15:42:46 +02:00
Oswald Buddenhagen
12652c2071 minor optimization: don't concatenate strings needlessly
Change-Id: Iddec1a818ff9f3ad8b12491100883e433e4b8246
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 15:42:22 +02:00
Leena Miettinen
ff464d7b4b Doc: new Python class wizard
Updated the screen shot.

Change-Id: Ie65927bb872b37b6be78160810f97b215525c14f
Reviewed-by: Sergey Shambir <sergey.shambir.auto@gmail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2013-06-04 15:42:14 +02:00
Oswald Buddenhagen
66802ef8bf implement simple VFS to support caching during project parsing
this tremendously speeds up loading of qt 5.1 based projects (including
qt itself) under mac os, as these look up the sdk dynamically, and use
caching to avoid doing that in every subproject.

Change-Id: I833253f81c3159056fab2ff888f293b36cc2ef56
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 15:42:13 +02:00
Oswald Buddenhagen
571234786a don't unnecessarily use QFileInfo::filePath()
just directly use the filename we constructed it from.

Change-Id: Ia428a2cb4b192fea6bde62dfbf35361bcfc4b21e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-06-04 15:41:47 +02:00
Erik Verbruggen
ca291fbc7b C++: fix functionAt(), moved it, and added test.
Thanks to Jesper K. Pedersen for the fix!

Change-Id: Ie49c3352e26a9632b1500596b00d559bfe932dff
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-06-04 15:24:33 +02:00
You-Ruei Tzeng
1120581ba9 Fix path error in Chinese translations
Done-with: Liang Qi <liang.qi@digia.com>
Change-Id: I5bfe56344497b950951bc5f038ce6868abb2f41a
Reviewed-by: Liang Qi <liang.qi@digia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-04 15:17:58 +02:00
Liang Qi
7efaa7c536 Remove the locations in zh_TW translation file
Change-Id: Id1b330283a5f6e32300df3dbb2081fd287a2c752
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-06-04 15:05:55 +02:00
Leena Miettinen
6a4a926622 Doc: rewrite descriptions of opening links in split windows
Fixed two typos and used more consistent style with the rest
of the manual. Please ask me or some other tech writer to
review when you add text :).

Change-Id: I53fbd7268a82724e3ca862e7d6fcadb97899e478
Reviewed-by: David Schulz <david.schulz@digia.com>
2013-06-04 14:53:30 +02:00
Marco Bubke
782e8f66a1 QmlDesigner: Remove code which does nothing
Change-Id: Ia6edcd10c42f0ef71ed1237e45185e5fd8a4a66e
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 14:37:35 +02:00
Marco Bubke
7784baf54f QmlDesigner: Make it easier to add new arguments to the puppet
Change-Id: I15bc4a1a431787e350ace9fa09d8c140d06a7ed6
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2013-06-04 14:37:28 +02:00
jkobus
cacc6b2971 Revert 27aa0e89c9ee9f0d28acea13b72d73b36b7a469f
Change-Id: Ib0615de8dec6fa7d50ec1901e42ebe6c3c9b98e8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-04 13:37:58 +02:00
jkobus
42c5149e03 Test change
Change-Id: I4b286051da2267ff7130e5cab8dbeeececd07769
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-04 13:35:58 +02:00
Leena Miettinen
bf5136d4a1 Doc: new options in the editor toolbar.
Moving to line and column and showing the file encoding.

Change-Id: Ifd9727b3f1812da4b165eb9224cc7d042ae840d2
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-06-04 13:34:23 +02:00
hjk
8510c2ab2b Git: Try do consolidate code duplication
Change-Id: I5ac34d96152d6e4f9abc8f6dd18d1e1eab0bde7f
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-04 13:20:33 +02:00
hjk
0f4cfa7e39 Debugger: Enable dumper autotest suite for LLDB
26 pass, 149 fail...

Change-Id: I243eb03fe0ddcb193ed8d45e672564f7113b662f
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-06-04 13:12:47 +02:00