Commit Graph

41387 Commits

Author SHA1 Message Date
Eike Ziller
c427650d62 Search results: Fix that auto-expand failed on first set of results
They were expanded but collapsed again when the model was reset in the
setShowReplaceUI(bool show) call. Avoid resetting the model by informing
about the data change individually.

Change-Id: I48a94f2aec5b5d31d11166a299a2463b757939fa
Task-number: QTCREATORBUG-14320
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-05-18 12:04:21 +00:00
Eike Ziller
76a4ed6b5f More change log
Change-Id: Iedc533079f0eaa7f0dd2cc241b012c3e07d935b0
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-18 11:46:26 +00:00
Eike Ziller
19dca2adc4 Help: Fix QDesktopServices url handler for qthelp urls
Change-Id: If55a35fcd0960bd7ac215493ccc7e4118a8c3187
Task-number: QTCREATORBUG-14459
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-18 11:38:20 +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
hjk
9edbd01922 Debugger: Fix crash in breakpoint view
... when double-clicking on an entry for which debug information
but no corresponding sources were found.

Change-Id: I48f57794e072752d444d7c3ccd8bfe517c9db1dd
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-05-18 10:08:35 +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
Joerg Bornemann
b448651877 TimeLine: remove strange selection lock magic
Let the user decide whether to select items on mouse over by pressing
the respective toggle button. The current magic is hard to grasp and
mostly just annoying.

Change-Id: Ied6bb36bd675bdc7ad237f841ecd345ad6c97e7a
Task-number: QTCREATORBUG-14415
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-05-18 08:21:40 +00:00
Ulf Hermann
94b42da80a Timeline: Make 0-width events visible again.
Events with duration == 0 were erroneously filtered out by the items
render pass. Also, we have to give them a very small width in order for
the "stretching" mechanism in the vertex shader to work.

Change-Id: Icb76168f0831547a3ca55ab79df7161736ed4dc4
Task-number: QTCREATORBUG-14446
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-05-18 08:20:43 +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
Orgad Shaneh
372173331c C++: Fix explicit typedef from base type in templated class
Use-case:

struct Foo { int bar; };

template<typename T>
struct Base { typedef T F; };

template<typename T>
struct Derived : Base<T>
{
    typedef typename Base<T>::F F;
    F f;
};

void func()
{
    Derived<Foo> d;
    d.f.bar; // bar not highlighted
}

Task-number: QTCREATORBUG-14218
Change-Id: Ic0b22b2f8adf80ff88a2f8b7359c276a744f89e8
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-15 14:22:10 +00:00
Nikolai Kosjar
cf66beffb6 CppTools: Tests: Fix memory leak
Detected by leak detector of Address Sanitizer.

Change-Id: I2aae2ba6fa2f218c9754d912dce7c398b1b384cb
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-15 14:22:09 +00:00
Nikolai Kosjar
df582f88ae CppEditor: Fix potential null pointer dereference
Detected by Address Sanitizer.

Change-Id: Ieab9c201e1fe6a7cf5c32747b2ce3d4562f4e598
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-05-15 14:22:05 +00:00
Orgad Shaneh
9b30795c02 C++: Fix lookup for instantiation by class object
Task-number: QTCREATORBUG-14352
Change-Id: I2ce4bc1d0dba2414afe050e80607b581686081a9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-15 14:21:45 +00:00
Orgad Shaneh
ee37f60bff CppEditor: Avoid local TypeOfExpression objects in VirtualFunctionHelper
Change-Id: Ifd9417b4573dab35dde72b84c261b58fec574ede
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-15 14:21:18 +00:00
Nikolai Kosjar
f27aa09ac5 C++: Fix crash on auto deduction with debug enabled
By adding the expression document to the bindings object.

Since ResolveExpression is always initialized with the context of a
TypeOfExpression object, the symbols and names in the expression
document will at least live as long as the most outer TypeOfExpression
object.

Done-with: Orgad Shaneh <orgads@gmail.com>
Task-number: QTCREATORBUG-14253
Change-Id: Ia97c7401a2ada9a36113a04cf39e2283393421dd
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-05-15 14:20:47 +00:00
BogDan Vatra
59da3a2bba Override text/x-csrc mimetype with QtCreator's own version
It is necessarye because fredesktop's version searches for /* and // magic
which is found in other files (e.g. .qml, .js, etc.)

Change-Id: I9cd3341167e5a0aa57d6046f4492bab241055c4b
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-15 13:30:26 +00:00
Alessandro Portale
8ae18a9ca8 ProjectManager: Qt Quick application 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: I4b5ebcc35a585fad6ebc2e994711ca23e3300717
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-05-15 13:14:37 +00:00
Eike Ziller
caaf460cdf Fix that activation mode default was accidentally changed to single click
Sort of introduced by recent form layout fix for OS X.
Add the missing break statements.

Change-Id: I0862c34f31e4afc7d1834fa436c6193345205b9b
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-15 10:30:58 +00:00
Marcel Krems
32d63165c4 Replace QRegExp with QRegularExpression in FileSearch.
This fixes a race condition when searching in multiple files.

Task-number: QTCREATORBUG-14403
Change-Id: I5572d7f2cd9fe3c399efdf37e874d9773be76f57
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-05-15 10:30:22 +00:00
Eike Ziller
3a2e9c13dd FileSearch: Avoid copy of function object.
Converting std::unary_function to std::function will create a copy,
which we do not want. Actually std::unary_function as a base class
doesn't serve a purpose at all in this context, so we can just remove
it. Bind a std::function to a pointer to our search object instead.

Change-Id: I31db62312eefdff19b09fbb4eb20e8e666125874
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-05-15 10:30:12 +00:00
Tobias Hunger
0b91b77cdc Subversion: Replace Subversion Checkout wizard
Replace the subversion checkout wizard with a Json wizard.

Change-Id: I969ff00e2e6fdc8088f8c7a928f80454cd987164
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-15 09:11:44 +00:00