Commit Graph

26012 Commits

Author SHA1 Message Date
Eike Ziller
db4311d5b5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217
2012-10-04 12:23:39 +02:00
Lukas Holecek
d2bf853ca1 fakevim: Star and hash search with g
Added g* and g# commands to search without \<, \>.

Change-Id: I74f010f2415e4d493be9925ab047a1c06f35d7a9
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-04 09:43:36 +02:00
Lukas Holecek
f357502984 fakevim: Improved repeat command
Repeat commands in visual mode correctly.

Task-number: QTCREATORBUG-7248
Change-Id: I937688f669f9bb9e1ad5f64b42dc0ee56dc3ca38
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-04 09:43:01 +02:00
Nikolai Kosjar
82599d5593 Locator: State language in filter names.
Task-number: QTCREATORBUG-4929

Change-Id: I9b21010d14e27ace13ba7939db6ce4efb4b36435
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 09:07:46 +02:00
Nikolai Kosjar
ed86a7ca58 Get rid of some Q_WS_X11.
This macro isn't defined in Qt5 anymore, so use Q_OS_* where
appropriate.

Regarding bug QTCREATORBUG-7936:
Now the fonts look normal again on GNU/Linux, e.g. in the text editor
and the application/compile output pane.

Task-number: QTCREATORBUG-7936
Change-Id: I501cca608f273789d095e1138b32c2c8c38b0059
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 08:00:26 +02:00
Orgad Shaneh
945fb79e4b GDB build: Remove symbian target
Change-Id: Id15d42d9447221be85baff92d08823d3fff4c3da
Reviewed-by: David Schulz <david.schulz@digia.com>
2012-10-04 07:39:09 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Thomas Hartmann
ad94d4f09c QmlDesigner: fix warning
Change-Id: I2addb29b617fc682aa766de9e080323133185093
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-02 17:13:22 +02:00
Tobias Hunger
3d1d0a3e0a Do not loose device settings in Kits when adding a new device
Change-Id: I1947726b67c5f9474b0052c25ea8dca494f4c6b4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-02 15:02:33 +02:00
Tobias Hunger
c450eea96f Make kit config tidy again
Do allow kit config to become "tidy" again after a change made it
dirty.

Change-Id: I764093c2ce199633d8f67bea0e4747d6b0bfd2b7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-02 15:02:11 +02:00
Tobias Hunger
0d17f24024 Fix isDirty detection of tool chain config widget
Change-Id: I17046315b286dd4c224f7465da0ec981941c77d5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-02 15:02:02 +02:00
Przemyslaw Gorszkowski
fbb756cdcc Fix crashes when cyclic inheritance
Task-number: QTCREATORBUG-7933

Change-Id: I98469a092ff3ff0acc69800e9aade4ebb268332a
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-10-02 14:59:52 +02:00
Friedemann Kleint
8dc234c171 German translation for 2.6.
Change-Id: I8cbb07c76c730cf40d6099b3cd26ebc82923931c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-10-02 12:38:17 +02:00
Robert Loehning
4df4d1c0c4 Squish: Added test for automatic conversion from "." to "->"
Change-Id: Ib1cd24818b691fc4ccd43b60ff4afdd4e0394fde
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-02 12:17:27 +02:00
Lukas Holecek
ceaedb0883 fakevim: Correct Undo/Redo position for large editing operations
Change-Id: Ie5d354a0e7f59c61646d14da79bf7059821c12e5
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-02 12:09:53 +02:00
Andre Hartmann
4f0d86b4fe Project Management: Switch to Welcome Screen on "Close All Projects"
The natural thing when closing all Projects is to start a new work, so
switching to Welcome Screen seems useful.

Change-Id: I0520848739049f1685075eeed3ccaa17bf143618
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-02 11:28:20 +02:00
Orgad Shaneh
36c4479a9f Bookmark: Minor cleanup
Change-Id: Id866e0aafa117f357520032a59b467ba63e06154
Reviewed-by: Vasiliy Sorokin <sorokin.vasiliy@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-02 11:27:59 +02:00
David Schulz
37a95617f2 Editor: Fix resizing of proposal widged
Stop resizing width on scrolling the proposal
widget via drag of the scrollbar.

Task-number: QTCREATORBUG-7925
Change-Id: I948a0ec1bba8a9294b8a65b5eaa72063bbede48f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2012-10-02 10:26:19 +02:00
Christian Kandeler
dff0761406 Device support: Ensure UI changes are always propagated to the device.
The original problem was that we cannot assume
QLineEdit::editingFinished() is emitted when clicking a button while a
QLineEdit has the focus (QTCREATORBUG-1675). The original solution to
that introduced two more bugs, namely that changes are not visible in
other tabs until the dialog has been closed and reopened and that
pressing "Apply" also applies changes that are done later and which the
user intends to revert by by pressing "Cancel" (QTCREATORBUG-7288).
This patch intends to fix all of these issues.

Task-number: QTCREATORBUG-1675
Task-number: QTCREATORBUG-7288
Change-Id: I569a89f64843e08ee389e3eba6bdcb473ba22393
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-02 10:17:03 +02:00
Lukas Holecek
37c3dbc57d fakevim: Fix text indentation commands
Fixed indentation commands with movement and correct behavior in tests.

Change-Id: Idb77427c556f54c75658f806bb6c94402cab52ea
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-02 09:03:09 +02:00
Lukas Holecek
3e6ac65444 fakevim: Fix search issues
Highlighting text is always case sensitive regular expression.

Fix asterisk and hash search.

Change-Id: Ia41eee9266de4ed9bf0bd221609d8e02b72ada03
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-02 09:00:41 +02:00
Przemyslaw Gorszkowski
30b5534667 Fix "Apply function signature change" for boost::shared_ptr
Problem was with nested template type(in this case shared_ptr<T> is nested template type)
Task-number: QTCREATORBUG-6784

Change-Id: I8ea9203f2b1fbde73d9ac4e6c8cdeb2b6e0afcef
Reviewed-by: David Schulz <david.schulz@digia.com>
2012-10-02 07:47:02 +02:00
Vasiliy Sorokin
d47b058c9b Added feature for change note for bookmarks.
Task-number: QTCREATORBUG-5572

Change-Id: I12e84928e1c9d2b212991fafa7de99e0ec618d70
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-01 21:08:27 +02:00
Aurindam Jana
59f8c87659 QmlInspector: Fetch data when needed
Fetch data on demand for 4.x. Since, parentIds are not
known, the tree will be reset when new objects are created.
Related changes in Qt side:
https://codereview.qt-project.org/#change,35982

Task-number: QTCREATORBUG-7779
Change-Id: I8b53604979bbbc2e6f01bc7b785929811a76f398
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-01 17:43:58 +02:00
Thomas Hartmann
f3194ee1ac QmlDesigner: Do not use deprecated functionality.
toAscii -> toLatin1

Change-Id: Ib709f046fac965af6ee82c1432588e6467cd711b
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-01 17:39:00 +02:00
Orgad Shaneh
192bd214c7 qml files: Use buildDirectory as includePath for app_version_header
Add some missing app_version_header dependencies

Change-Id: Ieaa16e9a1bdace9032ef78a3329dfac60d28e99a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-01 17:37:26 +02:00
Orgad Shaneh
6fa5f833dd qbs files: Group and sort QmlDesigner
Change-Id: I38930748f4c2f5540f2a631f04020f783c35612b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2012-10-01 17:35:03 +02:00
Robert Loehning
319e425e65 Small string fix
Change-Id: I06fadcc2643b16a59adb962f134c259aa3991c39
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-01 17:11:58 +02:00
Marco Bubke
18d34fef04 QmlDesigner.NodeInstances: Share NodeInstanceClientProxy between puppets
Change-Id: I49ffa49e45d12950150bedfa8452de4c89674ef8
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-01 17:10:28 +02:00
Marco Bubke
b21e4fbeb7 QmlDesigner.NodeInstances: Fix merge
Change-Id: Ib1f4580470ecbec25e6939de82e2f27ec14df5d2
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-01 17:05:26 +02:00
Friedemann Kleint
c5e0f9cfbd Prevent modal dialogs from locking up in Qt 5.
When choosing "Manage kits" from the wizard, the settings dialog
locks up when using Qt 5 since 2 modal dialogs execute on the
mainwindow.

Task-number: QTBUG-27206

Change-Id: I69b756fed48983ec7217452b2f6c3049a520f1c3
Reviewed-by: Oliver Wolff <oliver.wolff@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-01 17:04:16 +02:00
Friedemann Kleint
2de2af5ee0 tr()-fixes for 2.6.
Change-Id: I6ad0e25d084cfccde6776c8d4cdaae43ea071b55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-01 16:47:05 +02:00
Thomas Hartmann
b5f6361dec QmlDesigner: fix for QTime
We have to call start() for QTime.
Calling elapsed() without calling start before
was never defined.

Change-Id: I229b3cbb30a2b3e5e98fdb05736ee0f37ae42c38
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-01 16:38:39 +02:00
Christian Kandeler
8eabfcbbd7 QMLDesigner: Replace compile-time check with run-time version.
We try to compile as much code as possible on all platforms, and that
particular piece does not have platform-specific compile-time
dependencies.

Change-Id: Ic78e6bdef24df6a7463f49979cdd8e2b8611c1b7
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2012-10-01 15:51:35 +02:00
Tobias Hunger
599e4881c2 TypeHierarchy: Make type hierarchy independent of editor
This makes it possible to close all editors and still have
the typehierarchy visible. It used to close for no apparent
reason.

Change-Id: I4d1500b5402905c6a04623ea60247c9d746acab8
Reviewed-by: David Schulz <david.schulz@digia.com>
2012-10-01 15:40:54 +02:00
Leena Miettinen
a17d7d7528 UI text: fix capitalization
Change-Id: I16419b21a7414c0e97238d33c433a88233076cf5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-01 15:21:36 +02:00
Leena Miettinen
e06582731e UI text: fix capitalization for debugger strings
Change-Id: If70418319529f75e893f3d5b60cb7dfa6a739dca
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 15:08:01 +02:00
Leena Miettinen
a791fee251 UI text: make zeroconf error message clearer
Fix typo.

Change-Id: Iee76e5f7a0c09d4e1d0f7c08a8c80f5bad9e5109
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 15:04:43 +02:00
Leena Miettinen
174226e21e UI text: write Git in upper case
Change-Id: I012af35287b0ee478eb99c95c54ba438f8e4e6d7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2012-10-01 14:31:30 +02:00
Thomas Hartmann
43ec9e261f QmlDesigner: fix for QTime
We have to call start() for QTime.
Calling elapsed() without calling start before
was never defined.

Change-Id: I229b3cbb30a2b3e5e98fdb05736ee0f37ae42c38
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2012-10-01 13:57:03 +02:00
Leena Miettinen
701ecb7da8 UI text: use sentence style capitalization for labels
Change-Id: I80b8b74c07bc909e35d5e001bd65afd7d114a7c1
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
2012-10-01 13:55:00 +02:00
Leena Miettinen
aece556c1d UI text: fix capitalization
Change-Id: Idcad814afc9e12256821106ee3272391ad95c8ef
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-01 13:37:00 +02:00
Leena Miettinen
5ec5c2d772 UI text: fix capitalization and punctuation.
Change-Id: Ic312b7f78a65c7a2f17f3186f4f0ce7f0c1cf2ee
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-01 13:15:04 +02:00
Aurindam Jana
bb00f59d66 Debugger: Client for DeclarativeDebugger
A client for DeclarativeDebugger Service. The service is
a backport of QmlDebugger service.

Change-Id: I868a286756c2d6bcbb2f41904a13d7f691e9704c
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>
2012-10-01 12:49:59 +02:00
Tobias Hunger
ceb9319e4b Offer to import builds not done by this Qt Creator instance
Change-Id: I7dd8d3b8ae919808fd7089079dcd5583ebc89913
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-01 12:46:14 +02:00
Leena Miettinen
cd807f974d UI text: fix capitalization and unify message style
Change-Id: Ib5e24e6d697e5ce9c3960adecee5b015f7dee450
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-01 12:15:39 +02:00
Christian Kandeler
591fd56eeb ProjectExplorer: Fix warning.
Change-Id: I151ada62c270efa1e5580f5e64fc87439703dfa6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-01 12:03:07 +02:00
Leena Miettinen
28c0929f9e UI text: fix capitalization and punctuation
Change-Id: I7a974072096689aaa4b1ec1cca93dcd9febe14d9
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
2012-10-01 12:00:54 +02:00
Tobias Hunger
a92e6fced0 Give a qWarning when restoration of kits failed
Change-Id: I5b714d04f40aee6365520fd1b6f76ee1ca7d4cba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-01 11:46:00 +02:00
Leena Miettinen
b0f7810072 UI text: fix capitalization and punctuation.
Change-Id: Ib0dfa00b827830365ce4482b14da3668bcadd142
Reviewed-by: hjk <qthjk@ovi.com>
2012-10-01 11:44:50 +02:00