Commit Graph

24143 Commits

Author SHA1 Message Date
Christiaan Janssen
bbbc08a6ea QmlProfiler: reordered tabs
Change-Id: I9c198aef9ab97a8a956280a8637fcb011f10aa6e
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:21:43 +02:00
Christiaan Janssen
af72e4bb3f QmlProfiler: show empty trace
In the case that the application did not generate any event
after running the profiler, still show an empty trace.
Otherwise the user will think that the profiler didn't work.

Change-Id: Idd15225270d55d834719f66387864433fcb9026d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 17:16:12 +02:00
Christian Kandeler
a9680ec23c Device support: Streamline device saving.
We used to save the device settings only when the user pressed "Ok" or
"Accept" in the settings widget. Therefore, remembering auto-detected
devices never worked. Now we connect to the saveSettingsRequested()
signal.

Change-Id: I28964ebbc809596963d718bb66d518607174a841
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-05-11 16:06:18 +02:00
Tobias Hunger
badd22ebd6 Qt4PM: Fix crash when updating actions
Change-Id: I0d64616288ce6d1756b54ad146e53fd147ca67ce
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-11 16:04:28 +02:00
Kai Koehne
94300bf7a5 QmlInspector: Make sure children list is always displayed on expansion
Change-Id: I2c55e5a4c95088c1a1944916678483792ffaba95
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-11 15:32:47 +02:00
kh1
d762373b95 Make it possible to Show/Hide the sidebar in help mode.
Task-number: QTCREATORBUG-1533

Change-Id: I0ac767db5bcbda12a9d8ba1572ee75881308d0d0
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 15:14:07 +02:00
hjk
5787c1e4cd debugger: simplify OutputSafer interface
Change-Id: I22857522a5be4fb65d3124cd26f82ca1aeb68d60
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-11 14:57:31 +02:00
kh1
e159eb164d Update .gitignore for VS 2010.
Change-Id: I99866dbc11e6e79c11bd3ee22e4c41a0d08805f9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
2012-05-11 14:42:34 +02:00
hjk
21bf0046c3 editormanager: simplify use of interface
Less code on the user side, same meaning.

Change-Id: I14e54a5d2ed8e024a51cce74eaf7c8419ad544be
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 13:51:14 +02:00
Tobias Hunger
2ef2532bf6 Update coding style
Since Qt modules are changing between Qt4 and Qt5 we no longer
include them when including Qt headers.

Change-Id: I3ed8649faa20b7f7bcd4180c79219f24fdbba026
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-11 13:50:41 +02:00
Eike Ziller
2359fe3610 Merge remote-tracking branch 'origin/2.5' 2012-05-11 13:41:04 +02:00
Orgad Shaneh
dc52fbfc11 Qt4PM: Make enabling/disabling of subproject actions consistent
Change-Id: I56e139e364b71d71a6cf8db9f3add01ab56611c3
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-05-11 12:29:22 +02:00
tjenssen
bbfc49fe4d Prepare Qt Creator to have a flexible settings-path.
Change-Id: I4fcb5cbf36013eb5ba9c93155a167ee7f097627b
Reviewed-by: Tim Jenssen <tim.jenssen@nokia.com>
Reviewed-by: BogDan Vatra <bog_dan_ro@yahoo.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-11 12:18:00 +02:00
Leena Miettinen
e271000bf7 Doc: reorganize info to make it clearer
Readers got confused with qmldump and qmlplugindump

Change-Id: Ia228ac43e1f40659bc6df4e6e5fc5139055fc455
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-11 11:57:51 +02:00
Konstantin Tokarev
8bad963dee Show editor display names in "Open With" dialog instead of their Id's.
Change-Id: I5cf7b5b53ce05b422aec87f7cf347670133a81a9
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-05-10 18:45:38 +02:00
Kai Koehne
eba7b13c00 QmlAdapter: Don't translate status messages
Change-Id: I4f540cf4ccf3f75e5743c4c65fd265b8f2298671
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 17:20:24 +02:00
Kai Koehne
a0f7d6b5ec QmlAdapter: Move isConnected() to private
Change-Id: I0b8bd76af6492bf85c5dfdef3863d8ebc9babab3
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 17:20:16 +02:00
Kai Koehne
4884200b5a QmlAdapter: Remove unused method
Change-Id: I83c71e7683c5c6840e767df652599af25de62a88
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 17:20:08 +02:00
Christiaan Janssen
9694dcffd1 QmlProfiler: adapt binding location at call to gotoLine
Change-Id: Iceff7120a5e88181e5aad452d3f0f90b3215ce1d
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 16:47:47 +02:00
Christiaan Janssen
d1224783d5 QmlProfiler: use project file finder in detailsRewriter
Change-Id: I838180820da54baf0f334de36a8297bc8b461ccc
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 16:43:28 +02:00
Christiaan Janssen
cb12ef8f91 QmlProfiler: Set sysroot for embedded targets
Change-Id: Ieae3956a6ed47c40392b1f5bb2af8b97e01a19b0
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
2012-05-10 14:57:12 +02:00
Kai Koehne
232a1272d4 Gdb: Print missing tokens in timeout
Change-Id: I5a5693fa2c60511ee581bb2b4f5fa3f5604d0e42
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-10 14:51:55 +02:00
Kai Koehne
c9dad3cff2 Debugger: Don't trigger gdb calls for inspect properties
Change-Id: Iaed71894cb2b2e340e7fbbe2045842bc85bd5fe0
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
2012-05-10 14:34:13 +02:00
kh1
c1fbe9ddb1 Let the desktop system handle mailto links.
Task-number: QTCREATORBUG-4058

Change-Id: If48f8150bc05418c3ac0b9e132b84ed7836e08fa
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-10 14:04:51 +02:00
Christian Kandeler
c5b2ca298b Debugger: Make some name demangler operations static.
These variables are conceptually const and only have to be initialized
once.

Change-Id: I49adaa19909bb132982ae02b389bc43664a8dc9e
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 13:57:01 +02:00
Christian Kandeler
9d44e07843 Debugger: Fix coding style issues in name demangler.
Change-Id: I2ded86aa98576fe059f372b83fc8f9e17a4943ce
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 13:42:26 +02:00
Christian Kandeler
bc78b228fa Debugger: Use exceptions in name demangler.
This saves repetitive and annoying checks after every function that can
potentially fail.

Change-Id: Ic8f8a070195a6eff3e7b1d631e5d67e4fe23bad2
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
2012-05-10 13:35:00 +02:00
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 Stenger
5d92a73c82 Squish: Fix syntax errors
Change-Id: I61572a8369721ba4943f11f0edee236bd816e771
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
2012-05-09 19:24:55 +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>
v2.5.0
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
Christian Kandeler
f0d1a60d41 Debugger: Add auto tests for name demangler.
Change-Id: I79c0d25dbddb201e10079afa9fb76b3c737ba135
Reviewed-by: hjk <qthjk@ovi.com>
2012-05-09 13:55:10 +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