Commit Graph

25412 Commits

Author SHA1 Message Date
Christian Kandeler
b18b458dea Fix qbs build.
Was broken by I2d5bf2324a81bedcbe6ea0bb8d8a0eead94e52e4.

Change-Id: I78e3ae21ed0c45bc68f0467d6605588493f7f6bd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-08-31 16:03:43 +02:00
hjk
9df46317a4 qt4buildconfiguration: code cosmetics
Change-Id: I39e60655384798fe5dcfc9d2c7c01747650774bb
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-31 10:25:19 +02:00
Eike Ziller
25dea9a393 Merge remote-tracking branch 'origin/2.6' 2012-08-31 09:28:19 +02:00
Oswald Buddenhagen
64677d2e87 move statements to the right project file
there is no apparent reason to deviate from the standard of this library.

Change-Id: Ifffd2e7ebd3efdf4639e6ba616aff31da6c29b97
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-31 09:26:28 +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
Oswald Buddenhagen
91d81443ed make Utils::HostOsInfo have zero runtime cost
Change-Id: I2d5bf2324a81bedcbe6ea0bb8d8a0eead94e52e4
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:43:28 +02:00
Lukas Holecek
a897a3b00a fakevim: Added tests
Change-Id: I6b6e54817bf41402f5575142b1adb9362c717439
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-31 08:41:39 +02:00
Oswald Buddenhagen
a32e243e61 Merge branch '2.6'
Conflicts:
	src/libs/utils/consoleprocess_unix.cpp

Change-Id: I196f61e882bfce94e165d9c724bffee9df1011b7
2012-08-30 20:43:02 +02:00
Alessandro Portale
e6270852a3 Qt Quick App Wizards: Remove dead code
Initially, the wizard was able to make complex QML apps
with custom QML plugins deployable. That was then removed
from the UI. Let's now also remove the remainders.

Change-Id: If470d553c79d0e47bc8e4f0e814a0da2ef31bab6
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 18:05:43 +02:00
Marco Bubke
93e329e1eb QmlDesigner.NodeInstances: Use SharedMemory for image transfer if available
Sending images over the local socket is slow, but the Mac has a 4MB limit
shared memory. So we now use what we get and than fallback to the local
socket.

Change-Id: Idf40ee1603572c9e45bb1ed3e1abc7caf19e6fca
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 17:24:47 +02:00
Marco Bubke
463eca4053 QmlDesigner.Integration: Remove integration core
This class had only one function and was rather useless.

Change-Id: I99fa64881cdf29cf074e6d4173eec6ea85cc2a2a
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 16:47:33 +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
Oswald Buddenhagen
1ed3538b21 don't use HostOsInfo class in shared/proparser
this class cannot be used in code which is shared outside creator.

Change-Id: I0f4a6c1599bdf21fab532c974acf8ccd82ad318e
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-08-30 15:59:28 +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
Marco Bubke
037f055473 QmlDesigner: Remove PluginManagerPrivate
Change-Id: Ieb10bb6e3f5733bb123514adecbd251496aa4b34
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 15:09:23 +02:00
Marco Bubke
8f909fec6f QmlDesigner: Remove ItemLibraryWidgetPrivate
Change-Id: I64277786012821985ffaab2cabcec83d4e017e24
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 14:59:23 +02:00
Marco Bubke
41b03629a0 QmlDesigner: Remove DesignDocumentControllerPrivate
Change-Id: I760c79eddc2e8abfe9edcda270d3e81df337d51d
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 14:51:19 +02:00
Marco Bubke
d3f0560120 QmlDesigner: Remove ItemLibraryInfoPrivate
Change-Id: I66340a32e7627432b8a0f7b1fc8e71486303c6a3
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
2012-08-30 14:46:08 +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
Montel Laurent
f3649ce4d0 remote help: fix enable/disable button when we have selected item
Change-Id: Ibfed62844b729eb5a4fee32ff0d1c575b722dacd
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-30 09:29:37 +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
Christian Kandeler
42c965d17d ProjectExplorer: Add signal to inform about deployment data changes.
Also one for changes to the application target list.
This re-enables the RemoteLinux plugin's ability to react to changes in
project files, which has been broken by the removal of the
buildSystemEvaluated() signal from the Project class in
I50249b186917cd3a4f399f187f09ac8428ab6f9e.

Change-Id: I380db69c9396b99423ff305096d4b9f4f17d3075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-29 16:51:15 +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
a92694596e Editor: Fix visual whitespace highlighting
in comments and strings

Change-Id: I94cb478419afde77299b3be1ec252a21c17a1658
Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
2012-08-29 11:24:42 +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