Commit Graph

25792 Commits

Author SHA1 Message Date
Robert Loehning
a37eca63b6 Squish: Added Qt Simulator target
Change-Id: I367dc2fb71339a335700d7411465b16ec114a7eb
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-31 17:36:06 +02:00
Yuchen Deng
0cb8c46328 Fix cross compiling for CMake based project
On Linux/Unix, there does not exist "MinGW Makefiles" generator.
Using "Unix Makefiles" can simply fixed the issue on Linux.
And does not effect Windows builds.

Change-Id: Id69e1a24485fbab05866f52d823035abc1dca06b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-31 17:23:20 +02:00
Christian Stenger
89cfba79b2 zeroconf: Compile fix for MinGW
Change-Id: I08120e945fea6455ea109926b9b0a95406d078da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-31 16:03:38 +02:00
Friedemann Kleint
7f44d7b2ae Small compile fix for Qt 5/gccc.
Change-Id: I3bc3608f437e377f60fbf28ded950e3118ce69c4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-31 16:02:46 +02:00
Leena Miettinen
92113a8bb5 Doc: Tool Chain tab was renamed as Compiler tab
Fields were also renamed accordingly.

Change-Id: I2f2658cdca2293c10c73d967fe66d520cb6de4d0
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-31 13:42:43 +02:00
Daniel Teske
7dc7907cb8 Work around kde file dialog being broken
Task-number: QTCREATORBUG-7771
Change-Id: I11a41f624dbeddbbff75e2b3a827315d26995425
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2012-08-31 13:16:50 +02:00
hjk
27c8563c45 debugger: fix "accumulated" locals and expressions on Mac
Change-Id: I922764db127242f1e392a2cb3906c61ba83c9b64
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 11:48:15 +02:00
Friedemann Kleint
e67e58378d Debugger: Use gdb's tooltip expression fixup for CDB and editor.
Factor out to watchutils.

Change-Id: I8cf316be819d765dcea964ac6405bfa9b075de59
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:56:22 +02:00
Friedemann Kleint
5fdb9f0df9 Debugger: Add more C++ keywords.
Change-Id: I127a33939bd46945d2cfd47f70ee72cb50a986c7
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 16:45:32 +02:00
Orgad Shaneh
fb6b15f957 Remove stale shared/json directory
Symbian leftovers

Change-Id: I4479113b6f80eb4a667054d72da1b185c315f61d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 15:53:43 +02:00
Friedemann Kleint
5c4fddc6a5 Detect Linux terminal by checking a number of known terminals.
Change the behaviour of defaultTerminalEmulator() to already
return the run option in line with terminalEmulator().

Change the QLineEdit in settings to an editable
combo offering the available terminals.

Change-Id: I333ef08ad06934bcd9fcafb50ff1eced1af6293a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@nokia.com>
2012-08-30 15:49:40 +02:00
Leandro Melo
813539a70a C++: Fix lexer for token Q_SLOT
When adding Q_EMIT a while ago the the if chain got messed up
and Q_SLOT was being skipped.

Change-Id: Ib1f49c00290a09286506de9510d0067eaf5e3b96
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 15:34:04 +02:00
Tobias Nätterlund
e160d286f8 QNX: Fixed updating package path if deploy configuration changes
The path to the BAR package in the run configuration did not react to changes in the deploy configuration.

Change-Id: I5eabbf600a3c0704ff4049edeceee67644c615df
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-30 15:33:58 +02:00
Friedemann Kleint
f30111a6cb GdbOptionsPage: Fix text for break at 'abort'.
Change-Id: Ibd0385fbe5a7dacd9138b794c9927538be235680
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 15:33:00 +02:00
Jarek Kobus
cd91925dcd Fix source strings
Change-Id: I3c96c467f79fa7722c270a5887997294a7042adc
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-30 14:34:00 +02:00
Robert Loehning
c00a76bde3 Squish: Partly revert "remotelinux: rename LinuxDeviceConfiguration to LinuxDevice"
This reverts commit 6460254931

Change-Id: Ifa0aaf19787a0d73ddf1a6d3dfe690bbfa8b4e1e
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-30 14:19:12 +02:00
Robert Loehning
a39ad794a7 Squish: Removed workaround for closed bug
Change-Id: I6532c7d9639d587663a204d401295d67b2310d8b
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
2012-08-30 14:18:59 +02:00
Oswald Buddenhagen
465f2a1562 fix loading of qmakespecs in the qt support classes
it's not sufficient to load the qmake.conf only any more.

Change-Id: Ic699ad5e202d6f3e115e44621b4c6ee2def6edd2
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-30 13:45:45 +02:00
Friedemann Kleint
3e0950bd86 Debugger: Fix Windows terminal execution.
The console trap seems to cause a spurious "* stopped"
message without reasons in gdb 7.4. Ignore once.
Fix warnings about empty file names in cleanupFullName()
for assembly frames.
Ignore "* running" in state InferiorSetupRequested, which
occurs for Windows terminals.

Task-number: QTCREATORBUG-7770
Change-Id: Ief6dff4a946eea1b1489caddf8748fb10a647dad
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 12:04:34 +02:00
hjk
4dc6be6d43 debugger: add manual test
Task-number: QTCREATORBUG-7770
Change-Id: Iecfd25e11748622afaebc320ea29d633f9e08638
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-30 12:02:18 +02:00
Friedemann Kleint
3797595c31 Fix 'Attach Debugger' in output pane.
Bring back the slot, suppress a warning about empty binaries
in the release check.

Task-number: QTCREATORBUG-7677
Change-Id: I2f1703b38b68995a1e2533ed8a6c94985cc3b430
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 11:53:35 +02:00
Orgad Shaneh
d03f33e482 Find: Allow empty prefix for completers
Change-Id: Ie59a7613775c7e5ab19524adc0c5658a81532e95
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-30 10:10:30 +02:00
Kaffeine
9f98c27879 Project target page: Remove unneeded QHBoxLayout. Fix buttons spacing.
Change-Id: I82c4fde505d67de30787077c788af97822153b1e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-30 09:48:13 +02:00
Christian Kandeler
c216863cf7 Botan: Don't unconditionally build in release mode.
Mixing debug and release mode is a bad idea in general and does
not even work on some platforms.

Change-Id: I0e112de1f3e878c5d8f3b57789df194c772848ae
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-08-30 09:34:12 +02:00
Ryan May
2cf04cb248 Fix register view with GDB.
Because missing registers are discarded, the register number returned by
GDB (when values are obtained) are not the same as the indices into the
internal list of registers. Explicitly store this mapping now.

Task-number: QTCREATORBUG-7468
Change-Id: Ica6fc6e6bd0a240cbd59923e4cabc7127e1aad8b
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 09:10:23 +02:00
Orgad Shaneh
3518934e24 Dumper: Use Latin1 as default for char array
Change-Id: Ia3e2fc737c4d40e9b8bce0fbb147fe3d8a523351
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-30 09:09:17 +02:00
Daniel Teske
57097a151d Fix Ghost window on switching to debug mode for qml projects
Change-Id: I0724a3c8d4add1821b97a4a068f94df1dbc4e512
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-08-30 08:54:17 +02:00
hjk
bef43adb79 debugger: fix manual test description for stack colouring
Feature worked, test description was wrong.

Task-number: QTCREATORBUG-7281
Change-Id: I81c93b66cb28e9d6adf15a49c086d5faaa908d0a
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 16:28:39 +02:00
Leandro Melo
d87835cc90 C++: Always skip unknown preprocessor "directives"
Task-number: QTCREATORBUG-7780

Change-Id: Ie93704feff17ad8229e50fb1133048f2c7598dea
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 16:07:40 +02:00
David Schulz
813cd709fb Editor: Tooltips for color scheme items
in Fonts & collors settingspage

Change-Id: Ia067e86a31a12301458a5d49e1096e7b2aa0f118
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 16:02:29 +02:00
Daniel Teske
966c82d212 Give Import widget a parent
Task-number: QTCREATORBUG-7652
Change-Id: I0751a494f97ff77c7dc52e81c789b0f0111633c5
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
2012-08-29 15:46:07 +02:00
Christian Kandeler
8073ffdffd Madde: Fix some bugs introduced by profiles patch.
- Correctly read the packaging icon.
- Inform of packaging file changes in all cases, not on initial setup.
- Emit signals from debian manager with the right argument.

Change-Id: Id44828b6e581e639acd491923cff8114cb57f6c6
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-29 15:41:27 +02:00
hjk
aa178ebf31 debugger: Shorten "Debugger command:" to "Debugger:"
Sticks out in the target setup page otherwise.

Change-Id: I2b9e657dc05ff41e6e511e7bdd1abf5f83800bca
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 13:02:02 +02:00
hjk
47249020bb historycompleter: fix user experience
Make it actually remember things and allow completion if lineedit
is not empty.

Change-Id: Iccec6de94a8a304773dbb679e06fc68e2e496376
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 12:39:58 +02:00
Kai Koehne
d6dee16060 Plugins: Update Qt version checks
Remove the warning for Qt 4.7.0: The minimum version for Qt Creator is now Qt 4.7.4.

Instead, warn users that the QmlX plugins won't be compiled if QtDeclarative or QtQuick1 is missing.
(QtQuick1 isn't compiled by default on Qt 5).

Change-Id: Ib9713282ad3759045a6eb994da1a12aac5176910
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-08-29 12:01:21 +02:00
Kai Koehne
8ceff27cc6 QmlProfiler: Build only if Qt Quick (version 1) is there
The QmlProfiler depends on QML.

Change-Id: Iee2ed66540ed2aee7d667850852b5ea7815a17fa
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
2012-08-29 12:01:13 +02:00
David Schulz
33f8a42503 Editor: rename "Static" in Font & Colors settings
to more clearer "Enumeration"

Change-Id: I785edb6d31a4cd6a0875549f80bcf791ad61587a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-08-29 11:21:58 +02:00
Tobias Hunger
f47a916c53 Save settings on mode changes
This partly addresses QTCREATORBUG-7754: Settings are lost way less
often this way. We do not really want to save whenever settings might
have been touched, so this seems like a good compromise to me.

Most modes at least have some view specific settings that need saving,
so lets just save everything on each mode change. Settings are only
written to disk if they really changed nowadays, so this should be fine.

Task-number: QTCREATORBUG-7754
Change-Id: I26ae18cae38754da6c79a8b870ffae2e681db7c1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-29 10:12:57 +02:00
Christian Kandeler
2ebce73d13 Madde: Add deploy step for starting Qemu.
Until now, the code is duplicated in all deploy steps that
need access to the device, which obviously doesn't scale.
We now do it once in a dedicated step.

Change-Id: I27f67f28a2e9ccaf9d2b3a5a9635d84b14f5eb07
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-29 09:30:07 +02:00
Andreas Holzammer
909f936a32 Add GCC Toolchain also to other platfroms then linux
Change-Id: I89904d877d42904b9c37542ad3b51fe513542cfd
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-29 08:55:31 +02:00
Oswald Buddenhagen
e5e6cdd11e bump qt dependency to 4.8
Change-Id: I5aa424bacf9f66761d335f5b53734453ee864b80
Reviewed-by: Robert Loehning <robert.loehning@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 08:23:43 +02:00
Friedemann Kleint
5409d2d1d3 CDB: Add setting to add breakpoint at CrtDbgReport().
- Factor out message/tooltips for breakpoints on functions.
- Add stringlist of break functions to CdbOptions.
- Set breakpoints with module, ignore response.

Change-Id: If5cf7647b190057c18d8499b9f4862696610e4f6
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-29 08:18:16 +02:00
Nikolai Kosjar
d07e7d2aab Fix running applications in non-xterm terminals
Setting Tools/Options/Environment/General/Terminal to one of the
following works now as expected.

  1. xterm -e
  2. aterm -e
  3. rxvt -e
  4. urxvt -e
  5. xfce4-terminal -x
  6. konsole --nofork -e
  7. gnome-terminal -x

Without the '--nofork' option for konsole, from creator's pov, the
terminal emulator will finish immediately and therefore creator closes
the local socket. As a result of this, the user is presented with sth.
like this (from the stub):

    Cannot connect creator comm socket /tmp/qt_temp.A13523/stub-socket:
    No such file or directory.

Task-Number: QTCREATORBUG-1633
Change-Id: I732e20d34aebdc1591355e0c4e78c907f439924c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-28 16:06:12 +02:00
Orgad Shaneh
8ed9720cd1 TypeHierarchy: Invert bases order
Current display doesn't make sense (to me :))

Active class is the middle one, derived classes should be top-down, but
base classes should be bottom-up. That's easier to understand.

Change-Id: I06693da37c834f5a99fd62ae29a91d958bafe136
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-08-28 15:52:58 +02:00
Daniel Teske
f555c936a4 Optimize MiniTargetSelector's various update functions
Should be called less often now.

Change-Id: Id7cd751e2be348c13ecc7dc02bffd0e33ccc297c
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-08-28 15:42:50 +02:00
Leandro Melo
2342fbb32c C++: Fix duplicate base classes in lookup
Previously we detected the duplicates by name and then processed
the missing ones, but this was not handling qualification properly.
Now we process the bases and only after lookup (making sure we
are talking about the *same* types) we add then if necessary.

Change-Id: Ic318b174d2174e24c24a4f2f1b612fbcb3f20491
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
2012-08-28 15:19:38 +02:00
Eike Ziller
04bc18eaa5 Win: Don't require interaction with "make deployartifacts"
Change-Id: Ieacef53be501fdddc16c10e9facbb3937cbd37b4
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2012-08-28 15:13:27 +02:00
Oswald Buddenhagen
f35f55091d complain about missing input file
the parser explicitly excludes complaints about missing files (because
they are pretty common in cumulative mode), so we need to do it ourselves.

Change-Id: I3c36819ab7b26152271e4557b67fb36b0a595b60
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-28 14:37:41 +02:00
Oswald Buddenhagen
c5e87aa0c1 make $$shell_{path,quote}() use correct path separator
follow suit with qmake ...

Change-Id: I0221f6c81bc770c37f501d79c31860549c0c0076
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-28 14:37:32 +02:00
Oswald Buddenhagen
2db6609556 beef up Pro* APIs
so they match the Q* counterparts more closely:

ProString: startsWith(), endsWith(), indexOf(), lastIndexOf(),
contains(), at(), length(), QTextStream::operator<<(), toLatin1(),
toInt() & toShort()

ProStringList: length(), removeAt(), contains()

Change-Id: Iab78236f7152f6a4b93709abbf59b9027c44ba2c
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-28 14:37:28 +02:00