Commit Graph

20593 Commits

Author SHA1 Message Date
Kai Koehne
e6fb0179f3 QmlEngine: Stop connection timer if setup fails
Change-Id: Ibc2a0a311fb1b1af3fc7a6bf486010b31117475b
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 13:26:59 +02:00
Konstantin Tokarev
6bfb167c3b Show animated images in ImageView with QMovie.
Change-Id: I108190595deb710a83249bfd017f5393b27850b6
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-10 13:24:36 +02:00
Konstantin Tokarev
ce7113619f Added resource prefix and non-image file icons to ResourceModel.
Change-Id: I5221726c613a949d7882e3476d61a94244f8f119
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-10 11:42:57 +02:00
Aurindam Jana
1bfbff6f1b QmlAdapter: Match signature for signals and slots
Change-Id: Ib901fe3040e7f88b9b5b016313022a854d7ead05
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 11:17:41 +02:00
Christian Kandeler
49b9265679 Debugger: Use QByteArray instead of QString.
There is no reason to have the QString overhead there.

Change-Id: I46ab16dd44b1ea9670905ce58b574b7d9d8fc572
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 11:13:19 +02:00
Kai Koehne
b2a2a7cc18 QmlDebug: Renaming
Move Status enum out of QmlDebugClient and drop "QmlDebug"
prefix for the different 'Reference' structs. Allows to
avoid 'using namespace in QmlDebug' in header files.

Change-Id: Id9857977300e86d637cf128ff3417d8b24c8e995
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 10:33:45 +02:00
Kai Koehne
e9277df87b QuickFixes: Fix capitalization of descriptions
Always use camel case for actions in context menu.

Change-Id: Iafa0569c4bca4ecb858fe618780208322379b979
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-05-10 10:15:42 +02:00
Kai Koehne
49830c48fc QmlEngine: Cleanup
Merge private class back to public one.

Change-Id: I3255036ff60738418e2997dbeba97642afe87558
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 10:15:20 +02:00
Eike Ziller
06fff61d01 build fix for merge error.
Change-Id: Iaef98ed540f29ed5c9a4a6e6f476349cfd15aa92
2012-05-10 08:26:58 +02:00
Eike Ziller
0a0de08efb Merge remote-tracking branch 'origin/2.5'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/plugins/find/treeviewfind.cpp

Change-Id: Iaae61c98938df24bda5521a923303db89eb7f8fe
2012-05-10 08:14:36 +02:00
Christian Kandeler
ad3e94f67c Fix qbs build.
Change-Id: I235ef625162755192b3f499a2e46bbdb28ca5842
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 16:48:54 +02:00
Friedemann Kleint
ea96c245ce Fix compilation with Qt 5/Windows.
- Adapt to qpa change,
  qtbase:36547f4eff44361f7a6acd0cff107c0e47561f93.
- Implement the progress bar icon for Qt 5/Windows.

Change-Id: I42def27fb5e05a6227ce56dd580a5e669d211855
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-09 16:45:59 +02:00
Kai Koehne
29fd6bf663 QmlDebug: Fix warning about unitialized variable
Change-Id: Ia82f433c8ceb2f564ed9895b49b572d17a53da87
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-09 16:23:45 +02:00
hjk
d601875d07 compile fix with namespaces
Change-Id: I1c9a4180aad81514e862751783015e4ccd73adf5
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 15:10:59 +02:00
Daniel Teske
d05d697ab3 Catch a few common errors for failing .pro parsing
Task-number: QTCREATORBUG-7377

Change-Id: I43e1393acc09ee4fd923d6796b4a0298fb22ea71
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-09 14:38:16 +02:00
hjk
eadad258b9 debugger: fix toplevel expansion behaviour of pinned tooltips
That is the necessary part of the previously reverted patch.

Change-Id: Ie25171cd013712b7141de01d4c23deb20fe08578
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-09 14:13:19 +02:00
hjk
dd66fe6c48 Revert "debugger: improve expansion behaviour of pinned tooltips."
This reverts commit 89cee4313c,
as part of the patch breaks QTCREATORBUG-7277.

The GDB case should not filter the Locals model, but the Tooltip model
to display tooltips. CDB has no choice, as the tooltips are expressions,
i.e. cannot be handled, so using the Locals as fall back there is ok.

Change-Id: I196bc683e06f68301bd86aa6fcce14ad2e8c5774
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-05-09 14:11:20 +02:00
Friedemann Kleint
9ca4df02e7 Fix MSVC forward declaration warning (struct vs. class).
Coding style says class should be used everywhere.

Change-Id: Ia1c75d6b3222c6672e1ffac22395affd2f2add1c
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-09 14:05:40 +02:00
Tobias Hunger
33144c12a9 QtVersionManager: Emit less signals
Emit less signals when reading the qtversions.xml file provided
by the SDK. Especially do not claim a Qt version was removed and
added again on updates. This could potentially cause BuildConfigs
to update themselves in stupid ways.

Change-Id: I5e2b3ac4725f4a30910520e57ca0bbf9fe595f7f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 13:57:02 +02:00
Tobias Hunger
1511e0375e QtVersion: Delay reading of qtversions.xml on changes
Give the file a bit to settle, otherwise we might end up reading
a file that is not fully written to disk yet.

Change-Id: I88d91c095171bf3e603b68cc81ad5406320ef6d0
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 13:56:55 +02:00
Tobias Hunger
9739375255 Qt4BC: Get a better Qt version when the old one is deleted
Explicitly select a a new Qt version when the one in use gets
deleted. Do not rely on the UI doing the right thing anymore.

Change-Id: Ia78b56ae15a1aa81d11227d1f07ce43bff19b0f2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 13:44:08 +02:00
Kai Koehne
7f09d0b756 Merge QML inspector into debugger plugin
Merge QmlJSInspector plugin into the debugger. Also merge the
extra Inspector window with the Locals & Watchers: It now shows
the QML object tree in the running state.

Change-Id: I59ae0c1b970a48ba10ecda92ed3ba765d94b1d9c
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-09 12:42:44 +02:00
Christian Kandeler
d201c681da Device support: Disable some widgets when there are no devices.
Change-Id: I7849054f6a3942bf6d8affdf1cdc5a7d28fb997d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-09 12:12:51 +02:00
Daniel Teske
a3a7e7081a Qt4Nodes: Fix wrong "Parsing in progress" warning for some cases
Removing a subproject and changing the project type of a parent project
didn't set always the valid parse state nor emitted the parsing finished
signal. Also ensure that removing and then readding a node does update
the runconfiguration for that node.

Note: The error message is now: "The .pro file %1 could not be parsed",
which is better, but can be improved, improving that is QTCREATORBUG-7377

Task-number: QTCREATORBUG-7394

Change-Id: Ie0d9a430ee902bd194179b0512ac8295bc519f2a
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 11:33:55 +02:00
Daniel Teske
e664a53668 Prevent duplicated project entries on failed project loading
Change-Id: I4505d0957398d47c40843dbcbf8ce25365f6501d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-09 11:26:31 +02:00
Daniel Teske
d51edeaf51 Fix "Projects mode" looking broken if the startup project is "wrong"
E.g. this could happen if a session with two projects is opened, where
the startup project no longer exists.

Change-Id: I1c60bacb62b5f39f7830a3bc30e3aa388a825884
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-09 11:26:24 +02:00
Christiaan Janssen
5692c68154 QmlProfiler: printing current profiler state in error message
For debug purposes, facilitates troubleshooting when bugs are spotted.

Change-Id: I6f76d251bc4855f1d1f0ccf4724cd342c39cad29
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 11:23:06 +02:00
Christiaan Janssen
ba9c802e1e QmlProfiler: manage receiving trace after app stopped
Change-Id: I97409748ebac3ee8af3690f2d84d3038638a3419
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-09 11:19:46 +02:00
Christian Kandeler
5bf0280b2a Device support: Copy device object when adding to device manager.
Otherwise the caller might (inadvertantly) keep a non-const object
around and change it behind the device manager's back.

Change-Id: I71b3e83e94397416b843006e74dcc1924abed77b
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-09 11:04:28 +02:00
Kai Koehne
b3a3072edd QtOutputFormatter: Fix style issues
Change-Id: I9f97b5c545639217155fb46dfd32af3b435f00a5
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 09:51:20 +02:00
Kai Koehne
cd46079734 OutputFormatter: Make clearLastLine() virtual
Make sure subclasses can call clearLastLine() to at the same time
remove last line from the editor and QtOutputFormatter, where it
is buffered too.

Change-Id: I33910943b96d821018e936f72e0c32a96b844e15
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-09 09:51:13 +02:00
Orgad Shaneh
b3416a57d7 Debugger: Break on raise() -> Break on abort()
Win64 doesn't seem to have raise() at all, or at least it isn't
called on abort()

Change-Id: Ief7a97c321db0f91629848852719977d14094173
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 18:14:38 +02:00
hjk
4f169b2150 fakevim: fix :!cmd if there is no selection
Change-Id: Ieafb77ecc4d211f97b7b8321fc84fd7d6c81dfc0
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 18:11:40 +02:00
hjk
441b98b0dd debugger: make debuggerengine easier accessible to profiling
Change-Id: I5c9ed1e994e490a6a6859afc6ae1756b09b87af9
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 17:50:06 +02:00
Christiaan Janssen
7f3d93023e QmlProfiler: correctly manage "Application Output" controls
Change-Id: Ief08e953fa38b3eb3d9af8b0e84f793a80931868
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-08 17:26:38 +02:00
Daniel Teske
3e54136629 Fix crash on project loading, .end() detaches
Change-Id: I6bae9d04b745e27437c43b0bf6f96624be3dfd55
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-08 14:54:47 +02:00
Daniel Teske
cc3dd65329 Qt run configurations: emit enabledChanged if the disable reason changed
Otherwise a misparse might get reported as .pro parsing still in
progress.

Change-Id: I0958032c7692faa4672410f395ededf6f1a2e379
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-08 14:06:17 +02:00
Daniel Teske
e8ee898864 ProjectExplorer: Remove hack for virtual folders
Previously virtual folders, that is the "Sources", "Headers" folders used a
hack. This patch removes that hack, by introducing the following changes
- The FlatModel and the ProjectExplorer::Nodes now don't require path() to
  be unique. Thus allowing the virtual folders to all return the same for
  path(). [1]

- Introducing a new node type "VirtualFolder" which is sorted according to
  a priority.

- Introducing a few new virtuals for displayName and toolip(), which can
  be overriden.

[1] Note that all the project managers do require path() to be unique for
some types of nodes.

That also fixes:
Task-number: QTCREATORBUG-7100

Change-Id: I76b730f4c4254e2894467603bbe9a30e356a0bcc
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-08 13:12:17 +02:00
Christian Kandeler
bea0411107 Fix build: Add missing dependency for resource editor.
Change-Id: Ifde220d33f73501cc05079e30f4610530eb910ab
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 13:04:00 +02:00
Christian Kandeler
f26f65d319 Fix qbs build.
- Bump Creator version.
- Add missing dependency to resource editor.

Change-Id: I9337d916ec765ad7b299aaa78c24e6c75afd74f5
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
2012-05-08 12:57:07 +02:00
hjk
7dc71bc43c debugger: display references in type columns
This breaks tradition.

Change-Id: I6780f31d584021490293a1ed3a96b5c3608a8a36
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 12:24:02 +02:00
Daniel Teske
8fd9f28a8c Remove unused Node::setPath
Change-Id: If01d499ec105968c61f0651a29c5bb94f9f73566
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-08 12:10:04 +02:00
Daniel Teske
5795300ead Make the compile output window use the text editor font
This makes the output use a fixed width font by default.
Also the application output is also synced to the text edit font

Task-number: QTCREATORBUG-7378

Change-Id: Ia036b505017cac0b1254b1b183b798feaee130f9
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-08 12:07:45 +02:00
Kai Koehne
9d86ad7990 Debugger: Catch 'Remote connection closed' in response
'Remote connection closed' messages sometimes also arrive camuflaged
as a response to a command (with the response of the original
command already there).

Change-Id: I8fa75f561fb341463fc4c0ed0a35aa6fd8300694
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-08 11:35:04 +02:00
Christian Kandeler
5317ed796b Device support: Fix bug in DeviceManagerModel.
Yet another instance of using a potentially wrong index.
Also check some invariants.

Change-Id: I2306fe854481e85f38434ec73cf5e92675110bf1
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-08 11:16:40 +02:00
Nikolai Kosjar
4a0bfbff5f Device settings widget improvements.
- Use a form layout in the "General" group box - now the labels are
  aligned according to the platform.
- Set a minimum height for the "Type Specific" group box. If there are
  no devices the "Type Specific" label will be not cut off by the
  underlying spacer.

Change-Id: Ia4527628db204ad33852d8d21751ec60cfe225cd
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-08 10:55:11 +02:00
Konstantin Tokarev
b800aeb3cb Added find support to ResourceEditor.
Change-Id: Icf3770fde8329d8507befeeef89186f86476749d
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:25:42 +02:00
hjk
cad2966498 use Core::Id for IMode::id and IMode::type
Change-Id: Ic7ce5b883e054c6eeba078327042e99e1c556345
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-08 10:18:12 +02:00
Aurindam Jana
2d612a252b QtMessageLogView: Optimize performance
Performance is hit when rendering a large number of messages.
Show text contents that fits a line and expands to show the
complete text when clicked.

Change-Id: I803a8b2da12830172f9e75f86546adf121799a67
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-08 10:13:35 +02:00
hjk
64ade99b0c itaskhandler: interface cleanup
Change-Id: Ib85950a4715d6eaf4225bd8dbcc0c2a91b20dc1d
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-07 18:12:40 +02:00