Commit Graph

32962 Commits

Author SHA1 Message Date
hjk
35e883eea0 Utils: MacroExpander API cosmetics.
Make const-correct, add convenience function for commandline parameter
expansion.

Change-Id: I12c3651e4e7b8a0a9319d1dfbea676b622b1a41a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-22 10:21:21 +02:00
hjk
1b3db2f57b QbsProject: namespaces and Qt 5 connects in build configuration
Change-Id: I4e86a2549f58c2f5ddf00b609598e426de2d3128
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-22 10:21:08 +02:00
Orgad Shaneh
061860551a Theme: Delete on shutdown
Change-Id: I54a7122f72e3c13c239af1b4293b187cff5b1fd2
Reviewed-by: Thorben Kroeger <thorbenkroeger@gmail.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-22 05:07:53 +02:00
Orgad Shaneh
da203fbf5c Theming: Remove now unused variable
Change-Id: Idddf0c3505875e2bb61106ced8692715619dc14b
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-22 05:07:43 +02:00
Eike Ziller
ccc6b09cce Help: Fix funny blank page when opening same URL again
For some reason the load() calls in the nested HelpViewer::setSource
calls lead to even more nesting because webkit decides to cancel loading
inbetween...... so we make the side bar viewer synchronization async on
the event loop.

Task-number: QTCREATORBUG-12742
Change-Id: I276272af7c477d627638e9611a34e80cca945b21
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-21 16:50:26 +02:00
hjk
c6ef3addcc Make expanders work with subexpanders
Change-Id: I30bad85ce2fbaf1f02043b3d97f657461f5a1995
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-21 16:20:07 +02:00
Robert Loehning
58be8e6476 Normalize connect()s
Change-Id: I27fee97c2837210d91948cc02f56cc5f6e6b19a2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-21 16:05:31 +02:00
Daniel Teske
3781c7ec88 GenericProjectManager: Remove never used pkgconfigtool.h/cpp
Added to the source repository 5 years ago, never used.

Change-Id: I85b4aa19b4351710f9eae3776275f554372465e1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-21 15:33:37 +02:00
BogDan Vatra
80040491b0 Make sure apps that are using Qt < 5.4 are really uninstalled.
Change-Id: I313b7a991fcc7adc7b9da85dbebc6dcd65b78ced
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-21 14:45:33 +02:00
Nikolai Kosjar
4fc5eeb97b CppTools: Remove last traces of CppEditorSupport
Superseded by commit

    commit 89bd4ee3c4
    C++: Base parsing on editor document instead of widget

Change-Id: Iffa6e47bddc0fa3de1eab9b65fe8f711520d2d7f
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-21 13:33:24 +02:00
hjk
22c15b3ea8 FakeVim: Use a bool to indicate recording, not QString::isNull
Change-Id: I30f996aa61b357dc6b83f3f313abb0448e7f0fc3
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-21 13:22:14 +02:00
Erik Verbruggen
3f24bd1e95 C++: fix multi-line continuation handling.
When having doxygen enabled, but leading astriskses disabled, a comment
continuation line did not insert an extra space for where the astrisks
would have been, thus mis-aligning the second line.

Task-number: QTCREATORBUG-12539
Change-Id: I47baa203fd5d9279fa89a06f526f3abed06ce443
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-21 12:09:01 +02:00
hjk
601ce9baa5 CPlusPlus: Inline some Literals members
Basically all that generate at most 7 bytes. With the call being 5
and some hope of intra-caller optimization gains that shouldn't explode.

Change-Id: I4145d69d38a7956362263e9d432eb47bb58d3261
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2014-10-21 09:42:27 +02:00
hjk
0c42d826ae Debugger: Go back to normal after attempting to kill GDB
Task-number: QTCREATORBUG-13044
Change-Id: I2610136b1d5c4c2d55d13b378156d382ab6f73cc
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-21 09:39:05 +02:00
hjk
f743778a43 Debugger: Move RunControl creation helper code to debuggerruncontrol.cpp
No change in functionality.

Change-Id: Ib948a788cdfdd9f8911c206df71ff2d20888c9d7
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-21 08:29:06 +02:00
hjk
8d8b45d35f Remove src/libs/zeroconf
The code has been unused for a while and shows up in the static
analyzer.

Change-Id: I7b59be985d7e6e140eaee217978660b767e7b11c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-20 17:00:36 +02:00
Eike Ziller
c6d8d4bee4 Help: Fix initial state of side bar and external window size
In the case of clean settings.

Change-Id: Ie230cc6a20a932c5917c4a9af26f94c0292e5ada
Task-number: QTCREATORBUG-13197
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-20 13:29:50 +02:00
Nikolai Kosjar
f07b876a93 Move some functions from ClangCodeModel to CppTools
Most of the functions were quite generic and not specific to clang.

Change-Id: I160cfeb7eca5b69ad6a8932a4f76db5bf5c1d42d
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com>
2014-10-20 13:11:08 +02:00
Alessandro Portale
821f08a905 ProjectExplorer: Native dir separator in project Tab Tooltip
Looks more familiar.

Change-Id: I206cfcc7a02b9c4331ea3e48dfed5092338933b1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-20 12:07:10 +02:00
Daniel Teske
60997f6a64 QmakeProject: Fix mergeLists which lead to cumulative parse being ignored
Any .pri files only found via cumulative parsing were ignored.

Task-number: QTCREATORBUG-13181
Change-Id: I1a7a639097b38a4ce1de01824be196a0c2781e84
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-20 11:50:13 +02:00
Eike Ziller
0c9c17aa25 Help: Resolve shortcut conflict between index and C++ type hierarchy
By making the global Help menu items (index & contents) independent from
the help view shortcuts again.

Change-Id: I1008efd0bfa95a5b3134edae9e324b106273a708
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-20 11:08:08 +02:00
hjk
55b2bb16dc Debugger: Consolidate RunControl creation
Export factory, de-export plugin, to remove one indirection

Change-Id: I13a46460d07d5ded6b26f2b5ceccd01142fb10e8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-20 10:23:56 +02:00
Alessandro Portale
4fca423f77 Theming: Unify namings
The names for Color[Role] and Gradient[Stop] are not used consistently.
This patch unfifies the naming.

Change-Id: Idd06978a628427cb448a158d620bea561752750d
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 18:25:36 +02:00
Alessandro Portale
34ba0c273a Theming: Use QQmlPropertyHash for passing theme to QML
This makes the mapping of theme values to QML automatic.

Change-Id: I4442ef454dc3a7dde1bd6b068b03ff890db3e49f
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 18:13:28 +02:00
Alessandro Portale
b8ed1f61ff Theming: Remove obsolete Q_ENUMS()
It is a left-over

Change-Id: I316c5f589a801b901a3e00621ea7e37b4294c549
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-17 18:13:05 +02:00
Christian Kandeler
59fa91e97d Update qbs submodule.
To HEAD of 1.3 branch.

Change-Id: I41005f0665ed69f9823ee5232e9f2421e4584c84
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-17 17:37:33 +02:00
hjk
e30e34f464 TreeModel: Rows are not columns.
Change-Id: I33a6d017f14ee9703b374f645c279cc26e3cb3e5
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 16:45:21 +02:00
Alessandro Portale
245792d0b7 Theming: Undo unintended "default style" changes
Change-Id: Id2a185f90a4e27ec2c74d63278a4abe7e3983b20
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-17 16:02:35 +02:00
Eike Ziller
fc568fd0d4 QtSupport/OS X: Fix issues with selecting qmake from Qt 4 packages
Native file dialogs can only filter against the names of resolved
symlinks, not the name of the symlink (native Cocoa issue), which is
"qmake-4.8" in case of Qt 4 binary packages.
Simply avoid any stupid issues with not being able to select qmake
executables with whatever prefix by making the filter "qmake*".

Task-number: QTCREATORBUG-13190
Change-Id: Ieb059da75f3f1ecf2a2ff4a3e0633719e54ea43e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-17 14:23:49 +02:00
Eike Ziller
cc42a08723 Class view: Add drag & drop onto editor splits
Change-Id: I35bc03d4e963500a7edf37d6f9d0ddd0a6c68529
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-17 14:23:33 +02:00
hjk
216b950124 Debugger: Remove messaging indirection in DebuggerRunControl
The base functionality is good enough.

Change-Id: Ie39398828733245e0e74ca9a2941c069116014f0
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-17 14:07:44 +02:00
hjk
7e5bad4905 Debugger: Remove DebuggerRunControl::runConfiguration
This needlessly duplicates parts of the base class.

Change-Id: I2070cdfeb389cf90554eaa597c716d1049186be5
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-17 13:53:43 +02:00
hjk
4f242d3382 Debugger: Move more RunControl setup to factory
Reasons mentioning S60DebugControl do not apply anymore.

Change-Id: Id7686ab90f2c25492685eb655403ed369bf99ee4
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-17 13:53:34 +02:00
hjk
1bb2f04d4d Debugger: Don't issue monitor commands for local debugging
Change-Id: I8a81ae78a279b6f5cc354dde3ba0814b3a650d06
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-10-17 13:38:49 +02:00
Eike Ziller
eb3584d2d8 CppTypeHierarchy: Get rid of '+' when dragging.
Change-Id: I87ee3da9f27d5d286c843fa78334e0591549936b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-17 13:26:34 +02:00
hjk
1eb4d2ab8b BookMarks: Fix line contents display
This really needs the dynamic type for the update.
Also using the IEditor interface is sufficient for most parts.

Change-Id: Ic9806f39077065c43b6325b2345ef5d8bab4ff34
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-17 13:04:45 +02:00
Orgad Shaneh
605deb55e8 Theme: Remove theme_p.cpp
Merge into theme.cpp

Change-Id: I2068f224e6364a87573fe7e938d4dd8089cbaafa
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 12:51:52 +02:00
Alessandro Portale
58b39b2ab4 WelcomeMode: Remove unused code
The "platform" function is not used in QML, so let's remove it. In case
it will be needed at some point in time, better use Qt.platform

Change-Id: Ie9cecf8f2953934fbe8b0bb16f2267975af30fd0
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2014-10-17 12:50:51 +02:00
Christian Kandeler
e50b75eb66 QbsProjectManager: Support UI-based file renaming.
Task-number: QBS-652
Change-Id: Iaaf767871b1f546814acec62330e2c8d732b8d75
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-10-17 11:26:15 +02:00
hjk
d87f3d53c7 CppEditor: Make the string auto-string splitting less eager
It was already triggering when inserting a new line in a .qdoc file
such as /data/dev/creator-3.3/doc/src/howto/creator-help.qdoc. In that
case, tokens() was empty, but prevState == 5 (T_DOXY_COMMENT).

Change-Id: I445d4df14182b0b536181588a224917a814a3f7f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 10:56:00 +02:00
hjk
4d02144b72 KitManager: namespaces and Qt 5 cosmetics
Change-Id: I584b24ec8ead56ea7a53921fac1f39881b2ce0a8
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-17 10:34:18 +02:00
hjk
db1c21a3f8 Debugger: Make WatchDelegate less dependent on WatchView
Change-Id: I07c1c22d1dfa9323a2fed8938c4fe53d1a534e90
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-17 10:17:14 +02:00
Orgad Shaneh
649cd6fb22 ManhattanStyle: Fix wrong operator precedence
!option->state & State_Enabled is accidentially satisfied because
State_Enabled is 1, so the condition is true for any non-zero value of
option->state.

Change-Id: I965012ceecbad7296fae4eff7d429dcb8391aa2c
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-17 08:52:40 +02:00
hjk
4f70388aca Analyzer: More Qt 5
Change-Id: Ic377524b00f24f75899b8006d94bbd37f5aab6c3
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-10-17 08:11:00 +02:00
Erik Verbruggen
f70051903a ClearCase: change QTC_CHECK to QTC_ASSERT and remove dead stores.
When the QTC_CHECK would fail, a nullptr deref would happen directly
after the check.

The dead stores are not harmfull, but add noise when checking for dead
stores that are due to logic errors.

Change-Id: I8285b1b3d941491b581536a7a10678cab7e0ade4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-10-16 22:14:57 +02:00
Christian Kandeler
910650e7fc Core: Fix qbs build.
Change-Id: I8dfc2aa436537b3bd5da0a090397cc8a473b36a7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-10-16 18:13:08 +02:00
Thomas Hartmann
8308907c7b Theming: Fix regression in ComboBox label
The opacity is set to 0.8 if disabled (Not if enabled).

Change-Id: I7016a083f71c700de68444a62e97d5dee4b733e7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2014-10-16 17:57:32 +02:00
hjk
ef563d8085 MacroExpander: Fall back to global expander
... and use that all over the place.

Change-Id: Ie6e0ed0f0d9eaba9b4466761e6b455f33a905086
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2014-10-16 16:32:58 +02:00
Tobias Hunger
89602419c4 JsonWizard: Make sure to open files as the last thing
Make sure to open files only after last touches were applied by
the wizard.

Change-Id: I0da8b49ebe58b0516fa44ef7b0472cce20a5936f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-10-16 16:23:01 +02:00
Thomas Hartmann
3c88d65a21 Fix warning
Unused variable

Change-Id: Ic7baf8b17cb0b6a5091efe3bfe262ed42b1e9bda
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
2014-10-16 16:06:04 +02:00