Commit Graph

41089 Commits

Author SHA1 Message Date
Alessandro Portale
8c1b8239f4 QmlProjectManager: Qt Quick UI templates via json wizard
Using the new .json wizard engine allows us to get rid of much old
custom wizard logic. As additional benefit for the end user of Qt
Creator, the .qml.ui split is now optional.

Change-Id: Ic6d35e650cf0a7735cdfac9080f95015309a5879
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 13:00:17 +00:00
hjk
039a29d50d Qbs: Use TerminalAspect in QbsRunConfiguration
Change-Id: I6f1ddec10abda39149dd3743bdff1d0186d1de31
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-18 12:52:56 +00:00
Tobias Hunger
3f6f02f2f1 Bazaar: Replace CloneWizard with a Json wizard
Change-Id: Ifce4d43a2f8d1ec97af4b30d32e5c8bb03c22bc9
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
2015-05-18 12:43:12 +00:00
Ulf Hermann
f356aae5f9 Timeline: Test TimelineZoomControl
Change-Id: I7053848aa5c77228ef2ce760899f411cf35c3c25
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:33 +00:00
Ulf Hermann
445c7f0014 Timeline: Test TimelineSelectionRenderPass
Change-Id: Ica6c007dd3f6d1e3d1347b7d805273e63e233483
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:29 +00:00
Ulf Hermann
3d09c1411a Timeline: Test TimelineRenderState
Change-Id: Ic89642b6b66f7daf83ba0fa6f74f80ef6af857b7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:25 +00:00
Ulf Hermann
a4945a9f01 Timeline: Test TimelineRenderPass
Change-Id: I20cede53c2a61bfd1a8cf216c4e7054d72c0fb3f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:22 +00:00
Ulf Hermann
e460c7d1e2 Timeline: Test TimelineRenderer
Change-Id: I0297601767b5660673b92c7f560e57b114a3523d
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:19 +00:00
Ulf Hermann
b6b8697bef Timeline: Test TimelineOverviewRenderer
Change-Id: I9450f9e260bb11c9e94f7bfe4beb0a9e47ad3ca7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:38:14 +00:00
Ulf Hermann
469ec25835 Timeline: Expose the "moving" state of the zoom control window
This is very handy for testing.

Change-Id: If07efebdc3da027d6f6a3b6d3a421bdb71a51e11
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:35:29 +00:00
Ulf Hermann
ef09282c22 Timeline: Don't use window movement logic when clearing zoom control
Otherwise we get a lot of confusing noise in that case.

Change-Id: I0fb77b0ae841fd863790acd86f2b24acab0e7374
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:35:25 +00:00
Ulf Hermann
84ae26e808 Timeline: If range moves out of window, completely rebuild the window
The previous code miraculously moved window and range to the right
places, but went through a series of invalid states in between.

Change-Id: Id6b1fd6d615d7900beda914a0415720a57d464b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:35:21 +00:00
Ulf Hermann
2ce83b5193 Timeline: Test TimelineNotesRenderPass
Change-Id: If4778e6cc661c76278a13a61f742e8bb0c2d2dad
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:34:14 +00:00
Ulf Hermann
dad60dfca5 Timeline: Extract common test code into separate files
Change-Id: I812c9343a73f8027a02d4e5670a9751c8b8790c7
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:34:10 +00:00
Ulf Hermann
de7caa70d1 Timeline: Test TimelineNotesModel
Change-Id: Ic29538d4e6f432a504f076665eb489100592d931
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:34:02 +00:00
Ulf Hermann
f8ed95f50a Timeline: Follow the d_ptr pattern in TimelineModelAggregator
Doing this correctly enforces the const-ness of the private class in
const methods of the public one.

Change-Id: I846cadfd4838cb56db9871469ba18ac861e2eb48
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 12:33:52 +00:00
David Schulz
f34b32abd5 Editor: Make parenthese mismatch color configurable.
Task-number: QTCREATORBUG-14357
Change-Id: I92a0d50fb8f3448195f3d38f7544a31eb695733b
Reviewed-by: Niels Weber <niels.weber@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 12:18:17 +00:00
Tobias Hunger
ef56bc6be0 Git: Make initial checkout more verbose
I tried this before and it did not work...

Change-Id: Ia503e1d9c72c6bec7e8fdb68c683a6666f32f851
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 12:11:04 +00:00
Tim Jenssen
de2f5f6339 remove NodeInstanceSignalSpy
Change-Id: Ia002967367e39ef9f8a6229e3c39d785382cc1a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:36:00 +00:00
hjk
75784cd266 QtSupport: Use TerminalAspect in CustomExecutableRunConfiguration
Change-Id: I4fddb145ed03b3bd28836cdd1d7b9f810a0ad111
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 11:20:51 +00:00
Ulf Hermann
aa78053974 Timeline: Reset selection on clear() and emit rangeChanged() only once
Change-Id: Ia4ca2fa6fac874ac66837e5c9d807a4e89b3b40e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:20:12 +00:00
Ulf Hermann
69bc92d1cc Timeline: Don't update selection render pass state if model is empty
This is more in line with what the other render passes do.

Change-Id: I80381e9436fa02c4573283c23a89873f3d6ade2a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:20:01 +00:00
Ulf Hermann
6d2ce1b0e7 Timeline: Properly encapsulate render pass states
We have to make sure that all the nodes get deleted when the states are
deleted. Previously, we relied on the RenderState destructor to
recursively delete nodes owned by their parents. This is rather hard to
understand and can easily fail if we create a pass state without calling
TimelineRenderState::assembleNodeTree() afterwards.

The best way to deal with this is to properly encapsulate the nodes into
the states and add destructors which delete them.

Change-Id: I8b1ce16084afc1c85a90609f8f8d889147f7832f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:19:46 +00:00
Ulf Hermann
70e8015fa7 Timeline: Move clearing of dirty flags into TimelineAbstractRenderer
As TimelineAbstractRenderer sets the flags it should also clear them.

Change-Id: I78245a9d9048ed50cd0819cc48d22bed89531883
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:17:49 +00:00
Ulf Hermann
f04121d1cb Timeline: Rename "timelineModel" to "modelId" in notes model
"modelId" is the term used everywhere else.

Change-Id: I36204a68e0b2537a1efa2f50737f3fb618d8bb8a
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:17:40 +00:00
Ulf Hermann
41572c77f1 Timeline: Make TimelineNotesModel's id conversion protected
This is a handy helper function for derived classes but shouldn't be
used from outside.

Change-Id: Iaa357c63cd711c38f299f30e0c7ed35b88b52b24
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:17:36 +00:00
Ulf Hermann
d573454936 Timeline: Remove the stateChanged signal from TimelineModelAggregator
It doesn't serve any purpose anymore.

Change-Id: I20c64e35415fc842852cf8e4bb20611294943a16
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 11:17:26 +00:00
Tim Jenssen
1e9f7e1e44 fix spelling in a comment
Change-Id: I7241a1e7e4cad1c1614ac95e7fe4e3a080eab265
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:13:33 +00:00
Tim Jenssen
76245df442 remove spaces
Change-Id: I0ca4812acd7c7efa710e18204ab0cd4426827396
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:12:44 +00:00
Tim Jenssen
31ddfd3e0a reorder includes and use <> where it makes sense
Change-Id: Ia4957cb5cfd2a58d293bda190490f30cdf475dd4
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:12:36 +00:00
Thomas Hartmann
d32c4cddf4 QmlDesigner: Remove qmlpuppet for QtQuick 1
Change-Id: I7427267a5f92f02bd6b90afcfb1cf666f85f0617
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 11:11:32 +00:00
Thomas Hartmann
5eb572d6dc QmlDesigner: Disable support for QtQuick 1
Change-Id: Id22bda847a127787f97f9f44a6121e3d1ff06016
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 11:11:19 +00:00
Thomas Hartmann
499f0ee55d QmlDesigner: Do not build qmlpuppet anymore
QtQuick 1 is deprecated in Qt 5.5.

Change-Id: I2af319cad8eb68269e31f93968ae6cc8ad9a2166
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-18 11:11:11 +00:00
Daniel Teske
0e95a56121 Make OutputWindow a bit faster
By limiting how often we scroll to the bottom and thus limiting
how often we redraw.

Change-Id: I42ec9dc6284112025108000420ccdfdf5d003f34
Task-number: QTCREATORBUG-14307
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 11:06:17 +00:00
Tobias Hunger
097ff14be3 VcsCommandPage: Disable back button when command is run
QWizard used to enable the back-button again after we were done
disabling it.

Change-Id: I14d756536de7d23cc4e6bac3a4e5a1d18b91f46d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 10:53:05 +00:00
Daniel Teske
ebf051be27 CMakeRunPage: Fix appending of error messages
Change-Id: I2b1c54bbe948ca8b3ba5384a2e97e29b2fd878c9
Task-number: QTCREATORBUG-14439
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-18 10:51:02 +00:00
Ulf Hermann
d71dfa97bf Timeline: Remove useless dataAvailable() signals
The only thing they did was trigger some QML code that set the zoom to
10% of the available range. 10% is somewhat arbitrary, so we shouldn't
have it in the general purpose timeline. Also, we don't really have to
pass the signal through several connections just to do that in QML.

The clearChildren() didn't have any effect there as dataAvailable()
should only happen if the view is already cleared.

Change-Id: I1813ed37a82fc3fd5c3b7fc02b2afb1dcbcadcfb
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 10:00:40 +00:00
BogDan Vatra
50a47cdb49 Make sure we pull from the selected device.
Change-Id: Ifbf1987e1b4322f1a0878855a12c4966bd77dc71
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 09:47:08 +00:00
Daniel Teske
e3171643ff Application Output: Close pane if the last tab is closed
Change-Id: I782aab3895f27b801c9517cf9ef21f4a474612fd
Task-number: QTCREATORBUG-14395
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 09:37:20 +00:00
Daniel Teske
fa401b8fab AndroidDeviceDialog: Move default device selection into Dialog
Change-Id: Ib4a272eba1f1521c082ec519ef016ad5969eb527
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 09:35:30 +00:00
Alessandro Portale
828360d87a Dark theme: Light icons for build step actions
For a dark background we need light icons.

Change-Id: I86714598be70bff981f94fb6c4e4afd6acfbe96a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 09:35:13 +00:00
Daniel Teske
11bcc8efe2 Android: Increase timeout of android list avd to 20s
Now that every usage of that command is using it in a separate
thread we can do that without any problems.

Change-Id: If38a734ceb5c519cd3ed28357374c83843e67c8e
Task-number: QTCREATORBUG-13634
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-18 09:34:26 +00:00
Daniel Teske
597096312f Android: Fix deployment to wrong avd
We used to only identify the avd by api level and abi. That was
obviously incorrect, but at the time I didn't know how to get
the actual avd name from a running emulator.

Turns out this is reasonable easy via telnet on the emulator port.

Change-Id: I387901a5294674f44399c0726abcc9feea221e8d
Task-number: QTCREATORBUG-13095
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-18 09:33:38 +00:00
Orgad Shaneh
b04986465d Core: Fix MSVC2013 compilation
shortcutsettings.h(84) : error C2536: 'Core::Internal::ShortcutButton::Core::Internal::ShortcutButton::m_key' : cannot specify explicit initializer for arrays

Change-Id: I8df6f788cd56c75b3fc71b8349a1c77139175460
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-18 08:52:58 +00:00
Tobias Hunger
5aeccb3be6 Mercurial: Replace CloneWizard with a Json wizard
Change-Id: Idcf5c523010ecb46d0ec6fa9475d182d14984852
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-18 08:14:03 +00:00
hjk
b02b0c8d6d CMake: Remove no more used CMakeRunConfiguration::setRunMode function
Change-Id: I1e618408ba87fa1fbcd3c78498adb83d149d935a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 07:36:35 +00:00
hjk
b03c3ef86d ProjectExplorer: Use covariant return types for aspect creation
... and cloning.  Most aspects already did, it does no harm, might
save a cast later, so follow suit.

Change-Id: Id6275806657b723d4352a4b772b220cb9a2d9a5f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 07:31:32 +00:00
Tobias Hunger
5d63c06e75 Empty Qmake project wizard: Make .gitignore work again
Change-Id: I590a88c4c66a0dbc879d2ba9198f273333fa35e5
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-05-15 15:42:31 +00:00
Eike Ziller
25057a7acc Improve keyboard shortcut settings
- change the line edit to accept actual text input in a form similar to
  QKeySequence::fromString (with special "native" form on OS X)
- add a button that allows entering a key sequence by pressing keys,
  including support for e.g. escape key, which was broken before because
  it closed the dialog
- add a warning label, that allows filtering the list for all
  potentially conflicting shortcuts

Task-number: QTCREATORBUG-6
Change-Id: I94fc63525f653127e87f6ef2bffe72d8dcaa867d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-05-15 14:40:45 +00:00
Daniel Teske
0bd0468263 Android Avd Dialog: Fix what the Name validator accepts
While at it, make non acceptable chars give better feedback.

Change-Id: I080f01592b2c8cbd6580734ca3e6fd46b9491106
Task-number: QTCREATORBUG-13589
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-05-15 14:22:33 +00:00