Commit Graph

31174 Commits

Author SHA1 Message Date
Friedemann Kleint
4f4fe8f3ec Fix build of Designer plugin against Qt 5 stable.
Change-Id: I53a6b49ff408c73d7532701a0b9eb5ed2c9aca6b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2013-07-10 08:58:27 +02:00
Nikolai Kosjar
20f3502754 C++: Introduce caches to Clone* classes
Done-with: Erik Verbruggen <erik.verbruggen@digia.com>
Task-number: QTCREATORBUG-8747

Change-Id: I7cb694f8180c6aa932b07066d98d095340111324
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
Reviewed-by: xSacha
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 18:31:14 +02:00
hjk
2a74ec4ffd Debugger: Don't use classnames as part of inames
They may contain spaces and other things confusing the
watchmodel.

Change-Id: I87932b342de5e1b29c75ed921d4d6afddf4d51da
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 17:29:38 +02:00
hjk
4352aba86a Debugger: Make autotest work with LLDB 179.5
Change-Id: I9834330633e5568b7c94059d4286c93adfecb1a2
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 17:29:13 +02:00
Daniel Teske
553e6267e0 ProjectExplorer: Fix build dependencies
Task-number: QTCREATORBUG-9601

Change-Id: Iece4fd11a42ac1562f9f6a2186c278ad49ce8d7d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 16:29:32 +02:00
Christian Kandeler
f71bb6d348 Adapt qbs files to qbs.fileinfo renaming.
Also update qbs submodule so Creator can open itself.

Change-Id: Iaa70d5e83d07a1120e795046ebbd8995159aa2db
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 16:21:24 +02:00
hjk
fe296e2b25 Debugger: Disable build-in LLDB formatters for old LLDB
This is kind of hot fix to solve conflicts with Creator's
pretty printing in the LLDB 179.5 context which does not
seem to handle SBValue.SetPreferSyntheticValue.

Change-Id: I9837bd3044a9ec90c67de3060d5895ae0b6b8653
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 15:16:43 +02:00
Eike Ziller
cc7c3c9623 Add QTCREATOR_COMPAT_VERSION
Necessary for keeping compatibility within a minor series.
When bumping versions, the compatVersion now needs to be taken into
account too.

Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 15:14:10 +02:00
Christian Kandeler
0a9d69a2e4 Debugger: Fix qbs build.
Change-Id: I92aa8707d30f57570af0f0932471a149294f94ef
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 14:22:12 +02:00
hjk
6db66ed73d Debugger: Remove spaces from template arguments
Makes LLDB happier in subsequent type lookups

Change-Id: I1243bd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 14:02:59 +02:00
Eike Ziller
dd43d9908f Rename IDocument::fileName --> filePath
That is what it actually is, wrt how Qt API calls it.

Change-Id: Ied02055debf6aad75556b0d9d22e8ba2f72be555
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 13:51:42 +02:00
hjk
bf34603320 Valgrind: Guard against missing logger
Change-Id: I2fa2df124b83be12c2156f944d2ecaece9e51eac
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 13:20:59 +02:00
hjk
1c6270a811 Debugger: Fix std::string display with GDB
Change-Id: Iaa9abd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 13:20:27 +02:00
hjk
5a0734a9bf Debugger: Fix std::string display with old LLDB (179.5)
Change-Id: I9a9abd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 13:13:56 +02:00
Eike Ziller
cee1602253 Fix wrong progress when loading session.
The code was trying to show one tick for each editor that is opened, but
editors are actually only opened for a file, if it is visible in a view.
So editorOpened is only sent for one editor per open split.
The new code just shows one tick for restoring editors, to keep things
simple.

Change-Id: I6a24061858f532c3ccfded9677b8928ae62a1448
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-09 13:05:09 +02:00
Tobias Hunger
e455371139 Qbs: Clear build system related tasks before reparsing qbs
Task-number: QTCREATORBUG-9778

Change-Id: Ic054f1619832a5ff0ea53d7fc5225fe674ddac13
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 12:34:32 +02:00
Tobias Hunger
793dced488 Qbs: Fallback to filename as project name if qbs parsing fails
Use the project filename as a fallback in case qbs parsing fails
without being able to extract the main project data.

Task-number: QTCREATORBUG-9777
Change-Id: Iceedf55c7f5d56a8876c19bcbd94082752c08336
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 12:28:07 +02:00
Tobias Hunger
0644a2efad Qbs: Fix qbs install step
Fix setting the installroot of the qbs install step.

Task-number: QBS-353
Task-number: QBS-354
Change-Id: Ia99abd3044a9ec90c67de3060d5895ae0b6b8652
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 12:19:53 +02:00
hjk
b860eab724 Debugger: Fix "Show in separate window" for string-like classes
Change-Id: I036be36070444cd761f215f3d60b9db25a5c149a
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 12:16:55 +02:00
Daniel Teske
65c2930c06 Android: JDK location is a directory, use correct file chooser dialog
Task-number: QTCREATORBUG-9706
Change-Id: I0a1892eb94024529cf450926dee22e629ef85e0b
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
2013-07-09 12:00:08 +02:00
Orgad Shaneh
41b51ff67f Git: Preserve reset type
Task-number: QTCREATORBUG-9666
Change-Id: I364bc0eefef376a9a14953b259e9d7b2eb29c228
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-09 12:00:07 +02:00
Nikita Baryshnikov
7da5e1635d AndroidDeployStep: remove unused strings
m_QASIPackagePath and m_runQASIPackagePath are not used anymore, so
could be deleted

Change-Id: I48d2f1531277c07be630c3156f04a40248da5271
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-09 11:58:50 +02:00
hjk
997aa2e076 Debugger: Fix display of default-initialized QStringRef
Change-Id: I3986541bb23bb7647f2a36798577a1e489fdc90b
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 11:43:39 +02:00
Eike Ziller
79fbb0db04 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	src/libs/cplusplus/FindUsages.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp
	tests/auto/debugger/tst_dumpers.cpp

Change-Id: I20e2002c7b25cc25d8120922fa9b52e59db498e3
2013-07-09 11:04:59 +02:00
Thomas Hartmann
0d92b468b7 QmlDesigner.DesignDocument: removing code called twice
This is already called in changeToSubComponentAndPushOnCrumblePath()

Change-Id: Ia101144cc33407b0c6268cf7c3717502211654c6
Reviewed-by: Marco Bubke <marco.bubke@digia.com>
2013-07-09 10:41:55 +02:00
Eike Ziller
99c383f3d0 Make IDocument::fileName a member with setter.
Instead of requiring subclasses to implement a method.
Also renames IDocument::rename to IDocument::setFileName,
since it doesn't really rename any files or such.

Change-Id: I1344025c24d2f74a6a983e04fb0a5245f1f37aad
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 10:21:58 +02:00
hjk
79c8a8fbb0 Debugger: Fix libc++ std::{unique,shared}_ptr dumpers
Change-Id: I9efb22543bf31f43381e57fb0acf4aeb15e8a293
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 10:20:34 +02:00
hjk
a6cae022ac Debugger: Split <complex.h> auto test into GDB/LLDB specific
Results are different, but ok.

Change-Id: I5550dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 10:20:02 +02:00
hjk
a307d88667 Debugger: Add facility to check float values in auto tests
Change-Id: Iee50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-09 10:13:48 +02:00
Eike Ziller
7dd81eca30 Add a <no document> entry to editor views.
This fixes issues with splitting when an editor is active that doesn't
support it.

Task-number: QTCREATORBUG-6827

Change-Id: Ib71117cb5723482b4212f99a7c4136005273ae44
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 09:46:06 +02:00
Eike Ziller
3557603b1e Editors: Don't use model index outside of model/view.
The model index is an internal detail of the model/view and shouldn't be
used outside that context.

Change-Id: I2c1f742fff427484f6ff244dd3e0d8428a7318d3
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-09 09:38:03 +02:00
Orgad Shaneh
02512e234e Git: Use direct settings member instead of accessors
Change-Id: Iba2954934218bec92716a8df1c04fe9347defd17
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>
2013-07-09 08:50:54 +02:00
Daniel Teske
47f683f45e Android Create AVD Dialog: Simpler code
Change-Id: I953ff641f46caedc47551298dd1fedb62008ee92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-08 19:32:00 +02:00
Daniel Teske
4b9fa4f004 Android Avd Dialog: Target not Kit
Global search and replace mistake

Change-Id: I2213fe591912faff4168f0cba6dccb2675aed794
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-07-08 19:31:52 +02:00
hjk
7c81f6f518 Debugger: Align dummy member names in anon structs
Use the same numbering schem for GDB and LLDB.
More consistent, helps auto tests.

Change-Id: I9b50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-08 18:43:36 +02:00
hjk
39e44e2e66 Debugger: Fix inames of array items with LLDB
Harmless, but needlessly breaks auto tests.

Change-Id: Iee470411c02686b6975c1e7efd79ac802eb37037
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-08 18:43:20 +02:00
Daniel Teske
77ddc869e0 Qt4Project: Use exact parse to decide which runconfigurations to create
Task-number: QTCREATORBUG-9549

Change-Id: Ib504073a3dfbdf8a66429b3fb6a8930d2284f76a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:13:05 +02:00
Daniel Teske
f8034a353f Qt4Project: Don't update runconfigurations for all targets
Change-Id: I383d0c5b7f01bf00be3249dc2721e69ed27dc148
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:13:01 +02:00
Daniel Teske
cc7fe5eac6 Project: Simplfy file adding/removing interface
The filetype is only relevant for Qt4 projects. But even for Qt4 projects
the file type is insufficient to decide where the file should be added.
So remove the file type from the interface and let the projectmanagers
themselves figure out what they want to do.

Also fix
Task-number: QTCREATORBUG-9688

Change-Id: I02f7b1cd2e05efaf76e36fb9af34b109d4482f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 17:05:04 +02:00
Christian Kandeler
5728f7e673 qbs updates.
- Make project files buildable with current qbs.
- Update qbs submodule to enable Qt Creator to open these project files.
- Fix an invalid access that caused a soft assert.

Change-Id: I976d19240112d1ff048e51036e6702383735352b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 16:42:42 +02:00
Tobias Hunger
bcb74fa9a4 Qbs: Fix QbsRunConfiguration setup
Task-number: QBS-349
Task-number: QBS-355
Change-Id: Ibfa88e2d5ec59984c54ae9f69659f231a962a64c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-07-08 16:41:54 +02:00
Tobias Hunger
29372a0f5a Qbs: Do not export symbols
Change-Id: I0e2332156ba481562ac3c2bc9fb1930f1368b2c9
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 16:41:48 +02:00
hjk
af17f33a75 Debugger: Improve hash "unsalting" in auto tests
Do it in code. Relying on the environment variable breaks in
too many cases (remote; unmodified project; ...) to be useful.

Change-Id: I67577fef22942d75d32d356f38c4ff0c752fe157
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-07-08 16:24:10 +02:00
Christian Stenger
702402a638 Squish: Avoid false positive warnings
Change-Id: I6cf15b571aae9a1ba4dcd02048e7ca6b21fab1da
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2013-07-08 16:15:34 +02:00
Erik Verbruggen
d70a33c0d0 C++: fix scope matching for templates in FindUsages
When the cursor is on the name of declaration of a templated function,
then since f93758b8e1 the scope returned
by Document::findScopeAt is the scope of the template declaration.
Before it was the parent scope of the template declaration.

The check in FindUsages::checkCandidates did not check all combinations
of template(-child symbol) scopes for the searched symbol and its
occurrences.

Task-number: QTCREATORBUG-9749

Change-Id: Idc84a2ba718721ce54683a67635a93352784ddd1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-07-08 15:05:10 +02:00
Eike Ziller
a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD
Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9
2013-07-08 15:01:17 +02:00
Eike Ziller
07c0a8348c Progress summary: Forward click to "current" progress details.
It was annoying that it wasn't possible to click on the summary progress
bar to e.g. open the compile output or issues pane, even when you had
only a build running.

This change forwards the click to either the progress that currently
shows a details widget in the status bar (like the build errors/warnings
from the build progress), or to the last progress that was started.

Change-Id: I4b50dd4b43bdc12fac329d33e158fa759bee4d28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 14:32:55 +02:00
Orgad Shaneh
2c21100725 Git: Disambiguate branch/tag names
Task-number: QTCREATORBUG-9700
Change-Id: I48e779fba65afc71ba13b426e526c3cb82070142
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:28:23 +02:00
Daniel Teske
bcd5ce77b4 Qt4Project: Remove unused function declaration
Change-Id: I7cd020b35b95340007e9ec9c7a3bd41a59481f84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:27:59 +02:00
Daniel Teske
f34a4a6000 CMake: Set a initial displayName for projects
We set the display name for cmake projects based on the projects's
name in the cdb file. The parsing of that happens quite late, so
we need to set a fallback displayname in the ctor.

Task-number: QTCREATORBUG-9641

Change-Id: Iabfef7a3cc9710e6ba04523845d4142a89493011
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-07-08 13:26:53 +02:00