Commit Graph

25792 Commits

Author SHA1 Message Date
Orgad Shaneh
34354148db FileName: Fix isChildOf for some corner cases
empty directory has no children, and root directory was not handled correctly

Change-Id: I1936eab96aef0a3be462f705c60f1f26995be68b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 16:50:02 +02:00
Eike Ziller
c29123158a Adapt to moved online documentation.
Change-Id: I4186502f0615ee16340a6cabc9c61d7a9ff4836c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-04 16:12:54 +02:00
Leena Miettinen
cb01d1cc22 Doc: updated screenshots because of term changes in the new project wizard
Change-Id: I145f2849db8b1a488b4af51f0f136cfa6ac12b67
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-04 15:33:23 +02:00
Peter Kümmel
264313ec90 CMake: add Ninja support
The cmake wizard proposes also ninja if ninja support is available

Ninja must be in PATH, but it is only called once, so it doesn't hurt.

Task-number: QTCREATORBUG-7720
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: If3c9c7ae55e6990fa16b031fc2998a8d8d9ed17a
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 15:26:08 +02:00
Tobias Hunger
bec84f09aa Backup foreign .user files before overwriting them
At the very least data can be restored that way.

Change-Id: I3a75783f9988fee7cd3571ed6e57c3cc0c86e0e8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 15:19:25 +02:00
Tobias Hunger
9a9443273e Fix having several unconfigured projects at once
Change-Id: Idac6b09d9b8d3371070490b68fe116e94f0fda72
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 15:19:11 +02:00
Tobias Hunger
eaaae54e10 Make sure to save settings when closing managers
This is needed to catch any updates that were triggered during tear
down of the UI (which happens after the saveSettings signal was emitted).

Change-Id: I9f14e8807070f3192551a3653bad31072db539f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 13:21:47 +02:00
Tobias Hunger
6bf583987a Warn when failing to restore auto-detected tool chains
Change-Id: If9582c35a35322efcd0d1666a6e52a62df98af21
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 13:09:28 +02:00
Tobias Hunger
95167c9aba Warn when dropping tool chains
Change-Id: I5246852f77f13791e7dfc8af781da69789519116
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 13:08:03 +02:00
Leena Miettinen
52eed97eaf Doc: remove Qt Simulator from the build and run example tutorial
Change-Id: Iadb961ec0c74529f0afe278e5e46473e22c05979
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-04 11:16:02 +02:00
hjk
4c51cbce0a debugger: use a more robust method to detect function pointers
The previous one was failing on 'this' pointers of instances of
classes templatized on function pointers.

Change-Id: I2be50db5be643974f318fb6999136f5c7a4cfc1c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2012-10-04 10:29:49 +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
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
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
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
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
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
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
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
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
Aurindam Jana
6067411db4 Debugger: Remove old code
Version specific snippets were introduced to
avoid incompatibilities during Qt5 development.

Change-Id: I60fa9beafc9d55b687c08e13cdf531baecb10fbb
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-10-01 11:07:15 +02:00
Leena Miettinen
fa9dbd3bf6 Android: check UI text for style and grammar
Change-Id: I8b808cf374fcdc124c5b2b7d9a113e6d64b17f2f
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-10-01 09:55:18 +02:00
Christian Stenger
68f2d2286a Squish: Set default compiler depending on arch
Change-Id: I1be1c018e293bb8ac11ba24968e5ba3c391ccf92
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2012-09-28 16:28:02 +02:00
Leena Miettinen
aeca8714b5 Doc: the Qt Quick 2 application wizard
Change-Id: I586a669995ca173648783bed2f1e6ea675aacda3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-09-28 16:07:25 +02:00
Tobias Hunger
bbe08f156d Update Overlay icon in MiniTargetSelector on Kit changes
This makes sure the icon is updated when changing devices in
the kit.

Task-number: QTCREATORBUG-7938
Change-Id: I6d5a07993593084a6226cfa044bb899d74cb5e15
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-28 15:23:38 +02:00
Przemyslaw Gorszkowski
7e9913f0f5 Fix crashes when typing code
Problem was with cyclic recurrence.
To solve it we need to check if derived class is different class than its base class.
Keep completion corrected.
Include some unit tests when base class has the same name as derived.

Task-number: QTCREATORBUG-7887
Change-Id: I7973c0b06e3b62d2da3d06048f4327d18a0b8011
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-28 14:54:52 +02:00
Eike Ziller
b02e954eff Fix command line arguments for installer generation.
Change-Id: I5b204936fbfc6073f32769ac0bf2196c26b40483
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-28 12:50:59 +02:00
Leena Miettinen
fe1f97ce43 Doc: experimental ClearCase plugin
Change-Id: Ia32913d0fc76700502c7f25f4fcb987b784e104a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2012-09-28 11:52:46 +02:00
Orgad Shaneh
0c13e640f1 ClearCase: Fix capitalization
Change-Id: Ic707363021430ad9c8b1df6d3e3e3b444967d08f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-09-28 11:45:24 +02:00