Commit Graph

25792 Commits

Author SHA1 Message Date
Robert Loehning
f626ea951e Fix typos
Change-Id: Ia3e08a61dcc9856a50ae11134558873a34a767e7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-07 22:04:29 +02:00
Oswald Buddenhagen
f24c986530 update size calculations for assignment statements
this was forgotten when the value lists were extended by a size hint.

Change-Id: I6f9b55ed671224a9b8735c8d937f94aac4a73a42
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-07 19:59:04 +02:00
Friedemann Kleint
ddb1c96650 Add addToLayout()-method to KitConfigWidget.
Provide default implementation to do a single-line layout
and let the DebuggerKitConfigWidget span 3 rows, aligning label
and button accordingly.

Change-Id: I0fb3a3116a593822da9c4499c142b8a8255c02d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-07 16:55:04 +02:00
Leena Miettinen
f278a87adb Doc: refer to mobile targets in alphabetic order
Change-Id: I65b46b79757eea2f96e37c910359e62d4a4d0ba5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-09-07 16:39:51 +02:00
Eike Ziller
77726ba1a9 Update changes file.
First run-through

Change-Id: Ifba29d76ee5f35d45ffd8770ff8aec66d21afa2b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-09-07 16:20:45 +02:00
Friedemann Kleint
a09cbc0b1c Another spelling error in text editor settings.
Change-Id: Ifab9dc9b6910c39d4d71b95760b1ad9d5565fc1b
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-09-07 16:09:48 +02:00
Robert Loehning
394f6d2db6 Squish: Updated getConfiguredKits()
Change-Id: I3f9dc08ce45eb773366a05de96a685a82266a54b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-09-07 16:08:03 +02:00
hjk
15ea29533a debugger: use DeviceProcessesDialog directly for attaching
Change-Id: I916c42bc141f5bfbf5dd163b3d9dfeed3703ed94
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-07 15:26:06 +02:00
hjk
61291e9421 debugger: fix Qt namespace recognition for Qt 5
The "magic" symbol was QString::fromAscii, which might be fully inlined
in Qt 5. Use QString::fromAscii_helper instead, and also make the detection
a bit more robust in case the magic symbol is not found.

Change-Id: I99e61797356a0d90467d32e54acc2d2a104d609a
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-07 15:17:38 +02:00
hjk
00f7677fc4 debugger: fix "Display in Separate Window" for QString
This is fixing a regression introduced recently during the
WatchModel rework.

Change-Id: I128368e78d00f1ef1fc96f7319b19873099396fa
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-07 15:02:00 +02:00
Leandro Melo
0e9568da3f C++: Completion for catch-clause arguments
Task-number: QTCREATORBUG-2822

Change-Id: Ia5a05e1c47c88ef3350b7223578ba800ee464c8c
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-09-07 14:59:41 +02:00
Christian Kandeler
93e3c3f36f SSH: Emit finished() for all running SFTP jobs when the server closes.
Otherwise a crashing SFTP server can leave the client hanging.

Change-Id: Ie96d7a9797074ddea3b50a1788b8ef7cd4bcd5bf
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-07 14:25:13 +02:00
Joerg Bornemann
95824dc298 fix usage of removed DEPLOYMENT property in Qt 5
For DEPLOYMENT, foo.sources has been superseded by
foo.files in Qt 5.

Change-Id: I8a357aca0969b7caa94b9e9ed63613064ba86299
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-07 14:23:38 +02:00
Tobias Hunger
e77bb8af04 Handle non-qmake projects without kits
Make it possible to add kits again after all kits were removed
from a non qmake project.

Task-number: QTCREATORBUG-7814
Change-Id: I38967cd4c106b95288b7020fe325d8cfe2688a7c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-07 14:20:48 +02:00
Tobias Nätterlund
aa8a0cf0ed QNX: Fixed asserts when stopping application on BlackBerry device
Change-Id: I0283d2a8c27e51f38c2e0939440bdbbef0063353
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-07 14:14:27 +02:00
Leena Miettinen
fdd4a81542 Doc: update info about Linux-based devices
Add info about the kits. Fix changed field names.

Change-Id: Ic8d10e17d3cef4082c0a151d15bfe8da14e7ad66
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-09-07 13:45:33 +02:00
Tobias Nätterlund
5f03803cf8 QNX: Fixed launching application when debugging on Windows
Change-Id: Ib87c028d071f7cf35ca462fb5bd71db9a6dfe1b8
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-07 12:27:15 +02:00
Tobias Nätterlund
0d092b051a QNX: Fixed port for gdb server, fixes broken debugging on BlackBerry
As fillParameters(..) (debuggerplugin.cpp) now overrides the start
parameters for channel, pass the port to use when remote setup is
completed instead.

Change-Id: Iad4c3e4d092105cde32b52814218b77990549f61
Reviewed-by: hjk <qthjk@ovi.com>
2012-09-07 12:26:14 +02:00
David Schulz
498f4450fe Editor: update autocompleter list width.
The width of the List view showing the
autocompleter proposals is now adjusted
when scrolling.

Task-number: QTCREATORBUG-7185

Change-Id: I5b26ef6195d389b30fdf0964bebd9c2f33056c66
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-09-07 12:19:53 +02:00
Eike Ziller
db8a20bc57 Select current kit when managing kits from projects mode
Change-Id: I65a540ef93d4d3a99829171e7b21138acb2d681e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-07 12:19:23 +02:00
Friedemann Kleint
5efc4cf00b Template project wizards: Add date and time.
Task-number: QTCREATORBUG-7827

Initial-patch-by: Christian A. Reiter <christian.a.reiter@gmail.com>

Change-Id: I241887acf0ff8006de74e0d67f3291b5638a54c8
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 12:02:20 +02:00
Leandro Melo
8ea4ed6b53 C++: Fix add definition test
To be consistent with the change 5b847a66df
in the InsertionPointLocator. Nevertheless, there are still issues to be
addressed in this class so we probably need more test cases when those
are handled.

Task-number: QTCREATORBUG-7833
Change-Id: Ie9abdd70566063a94350723432215d030c154fab
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-09-07 10:13:20 +02:00
Eike Ziller
b56b1c7d59 Revert "Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT)."
It depends on and mixes in changes made in another change on gerrit
that is not merged, so it breaks the package build.

This reverts commit c29bf6f652.

Change-Id: Ibb251150909271f3e119f05a1691832aae8ac633
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:40 +02:00
Eike Ziller
7337152c1e Revert "No QTC_PREFIX default on Windows. Causes too many funny side effects."
Because the change depends on reverted commit
c29bf6f652

This reverts commit 550f8218de.

Change-Id: If287c4b126b1ef710c074fd85946da41161c6ba9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 10:02:30 +02:00
David Schulz
da14147f2c Editor: Set default editor file text encoding to UTF-8
because Qt5 requires it

Task-number: QTCREATORBUG-7420

Change-Id: I0823c4701d5f1fef202fb38e423275bb9d3a66fe
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-07 09:23:11 +02:00
Eike Ziller
29e8a5c017 Show tool tip when hovering over project mode kit selector
Change-Id: I42871f00cea5ffd61b5f23fba2ffa084c289c051
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-06 16:53:08 +02:00
Tobias Hunger
9d90f8b396 Warn if kit has no tool chain set up
Change-Id: I551402c1e3023feeeb127f001a0e908938a07fc2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 16:52:21 +02:00
Friedemann Kleint
8b05f1afaf DeviceProcessDialog: add method to set visibility of kit row.
Change-Id: I42f3b2fd1eea1d958d914de86f7853bf29c2b651
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-06 16:41:18 +02:00
Daniel Molkentin
e6d68320c8 Libs to link must be lowercase to work with mingw xcompile.
Change-Id: I066ea0e0ecb6c0dddc86230b74b1c492bb63e002
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-06 16:37:44 +02:00
Daniel Molkentin
550f8218de No QTC_PREFIX default on Windows. Causes too many funny side effects.
Change-Id: Ic6448d7ef95f4ff95df8fddd1b78f4071fa5118f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-06 15:35:26 +02:00
Oswald Buddenhagen
1c28c5df02 fix default arguments of ProString::lastIndexOf()
Change-Id: If70f4f8e2aa8b68b5c87dbd1b6b95a7601eecce8
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 14:56:16 +02:00
Christian Kandeler
87529e30e3 Android: Do not instantiate the DeviceManager in initialize().
It is not guaranteed that all device creation factories have been set up
at that point, meaning that some devices will not be loaded from the
settings.

Change-Id: Ibce0e6c125980b1807efca4ce97693f9af7ab79a
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-06 12:25:43 +02:00
Oswald Buddenhagen
889f16c345 fix crash when modifiying some project files with scopes
TokBranch may hold zero-sized blocks, which must be explicitly handled
before trying to enter them.

Task-number: QTCREATORBUG-7706
Change-Id: Idaa129e12eb89cbc9572277083765fa6e15e0849
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-06 11:55:58 +02:00
Oswald Buddenhagen
99cfa88b90 fix skipping over TokProperty elements
properties now use hashed names as well.

Task-number: QTCREATORBUG-7706
Change-Id: I6f941647104152c61f8b86972d24dea6d227cb77
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 11:55:37 +02:00
Orgad Shaneh
8f56db9967 Qnx: Add qbs file
Change-Id: I9b9061970c92d8e6911772e3ca408e07ef6ea731
Reviewed-by: Tobias Nätterlund <tobias.naetterlund@kdab.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-09-06 11:33:37 +02:00
Friedemann Kleint
f60a94f759 Re-add version tooltips for debugger command.
Change-Id: Ic89c98426796401577abfd2301fc77e7ee8a8f9b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-06 11:28:47 +02:00
Daniel Teske
a50721ca7a Add more possible qmake names
Change-Id: I5f8d2a877ce37015bdea999cce805b0fdc910325
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-06 11:15:59 +02:00
Tobias Hunger
f3d8f967a7 Do not make kit names needlessly ugly
Change-Id: I18590604c307f0da831aa15efaf113633cd9a014
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 11:08:23 +02:00
Tobias Nätterlund
90357124f1 QNX: Fixed running the application if first attempt failed
When the first attempt to run an application on the BlackBerry device failed,
e.g. due to not being able to connect to the device, the Play button remained
disabled, so any subsequent attempts to run the application was not possible.

Change-Id: I2b9778f7b936e06b2594d2485d7e5575cddbba14
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 11:01:55 +02:00
Tobias Hunger
7aeac1d5f7 Make sure newly added kits are visible
Task-number: QTCREATORBUG-7803

Change-Id: I4dd190dc336ef6d64a8f3a800438909cdd3f258e
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 10:20:57 +02:00
Christian Stenger
bd43956bbd Squish: Use global objects.map from inside CCOM
Change-Id: Icc22f595f6c5c9472755e1134b7663dde7bccb86
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 09:42:38 +02:00
Christian Stenger
e216d43649 Squish: Substitute tilde inside toolchains
Change-Id: Ibf0ddfa4aecaa669d843d28f83fe6d814faeb219
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-06 09:42:30 +02:00
Leena Miettinen
5bbc6db284 Doc: remove Remote Compiler, as it is no longer supported
Change-Id: I98c7a66303a7b6c4a6e6a52a2a7fd85aef647d37
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-05 17:00:48 +02:00
Daniel Molkentin
c29bf6f652 Introduce $$QTC_PREFIX instead of abusing $(INSTALL_ROOT).
Reason: $INSTALL_ROOT is only meant to be used by packagers
to temporarily put the contents into a different location,
which is needed for fakeroot packaging.

QTC_PREFIX is not a qmake variable, and defaults to
/usr/local. On Windows the default prefix is "QtCreator",
since "make install" is expected to be used in
a packaging context only where either INSTALL_ROOT
should be used or QTC_PREFIX should be set to the
absolute destination path where e.g. an installer
generator will pick it up.

Change-Id: Ifa4950340e58e34726c53f5417adcc7b50828ce1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-09-05 16:37:42 +02:00
Leandro Melo
d1b65bbf83 C++: Discard comments in macro definitions
Task-number: QTCREATORBUG-7815

Change-Id: Id3e6b018bfd58b0f0072c637d69721a4bde1603a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-05 16:35:33 +02:00
Friedemann Kleint
c3f50e3192 KitChooser: Introduce virtual methods for Debugger.
Introduce virtual methods such that it is possible to
write derived classes for specific KitInformation classes,
allowing for filtering and setting text and tooltip.

Remove debugging-specific code of KitChooser from
the ProjectExplorer.

Move populate() away from the constructor as not to call
virtuals from it.

Implement DebuggerKitChooser. It should no longer be
possible to to choose an invalid kit for debugging
from the debugger starter dialogs.

Add a protected constructor to DeviceProcessesDialog
allowing to pass a KitChooser.

Change-Id: I8c683a2da7d69bfbccdc08213cb47d69a0df8b3e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:49:20 +02:00
Friedemann Kleint
af6bbc442e Add debugger engine type to configuration.
Introduce a struct DebuggerItem as a debugger configuration
item, containing debugger engine type and binary. Store
information as a variant map. Add a combo box.

Remove engine guessing logic. Parts of it are still required
when checking the suggested debugger from the SDK.

Split error checking to be able to do a quick error check
and find only valid profiles in the matchers.

Pass on errors up to RunControl::create().

Change-Id: I08653e2a76ca2c371701082f8173b0b8f8ed462e
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:49:11 +02:00
Tobias Nätterlund
824d04252e QNX: Fixed crashes when no BlackBerry device is selected in the kit used
Change-Id: Ic3059a0dd128bc66495f3288bbf1982f81d023d6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-05 15:44:07 +02:00
Friedemann Kleint
2c3fe560b9 tr()-Fixes: Fix spelling errors in text editor settings.
"Occurrences", "parentheses", "applied to".

Change-Id: I48d3d4e6c10e29888f4f2ee6dfbe02b0b0c5646b
Reviewed-by: David Schulz <david.schulz@nokia.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-09-05 15:29:51 +02:00
Christian Stenger
6e1ac1aafa Squish: Use global objects.map from inside APTW
Change-Id: Ica05af5652a3666277723e6ef9e96ecd5dc0c9f5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-09-05 15:26:50 +02:00