Commit Graph

32962 Commits

Author SHA1 Message Date
Tobias Hunger
9e4cc1316f VariableManager: Remove unused static variable
Change-Id: I7c53a91dec1e0a863f37d24787582a1ee1ba0adf
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 11:53:22 +02:00
Tobias Hunger
c8db57e663 VariableManager: Allow variables that are triggered by a prefix
E.g. "Env:<some environment var>".

Remove the special handling for the "Env:" varibale that was coded
into the VaribaleManager.

Change-Id: If8b074b66eeaa97903b41634f9a3c86dd73087d4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-16 11:53:09 +02:00
Tobias Hunger
c7703600be Debugger: Quieten warning on testing this for non-0
Clang used to complain about this several dozen times when building
Qt Creator.

Change-Id: I4dadd40de1133fe8558d6b50730f68b40e07de55
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-15 22:19:16 +02:00
Christian Kandeler
5cc3749167 QbsProjectManager: Do not expose the "check timestamps" option.
The functionality it offers is not essential, and it has side-effects
that can lead to bugs if users turn it on for no particular reason.

Change-Id: Iaed660c649de46e7f81d3a1c3311693ed0820d50
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-15 17:39:42 +02:00
Oswald Buddenhagen
62da66a0aa AbstractMacroExpander: expand macros recursively
Started-by: Tobias Hunger <tobias.hunger@digia.com>
Change-Id: Id2e88efbb475221cd7c0347f7d5e7009e4372eec
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 17:13:57 +02:00
Daniel Teske
1b11f9b3c0 QmakePriFile::update: Don't call buildDir() all the time.
Instead call it once per .pro file and pass that to all .pri file parses
and other functions. This cuts down the number of calls for opening
qtproject.pro from ~3000 to ~700 and speeds up opening qtproject.pro
by roughly 3%.

Change-Id: Iffd46d4bbedc9c380f70e916dae7151495990b39
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:33:20 +02:00
Daniel Teske
0b3d05aec2 SessionManager::openProjects: Don't processEvents() for just one project
Change-Id: I4f3075aa8ab1b3fe12eabe39740d28ff06a87f88
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:16:15 +02:00
Orgad Shaneh
0188b74a65 ClearCase: Use check out comment on check in
Task-number: QTCREATORBUG-12846
Change-Id: I02b3d713df8cc0e28d1bd32a401f692460c5fdbd
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:15:26 +02:00
Orgad Shaneh
c69e4f27cb Git: Use the right commit from history before merge
Task-number: QTCREATORBUG-12415
Change-Id: I6328c8b0e3579eeddae9051a9ac5c587426163fe
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:14:53 +02:00
Orgad Shaneh
8ec4451069 Git: Disallow quotes for branch name
At least on Windows it fails.

Change-Id: I2e119bf47b468a9f881184ad26fa9fbd10f16124
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:14:31 +02:00
Orgad Shaneh
5078b70ddb ClearCase: Fix unreserved checkout
Task-number: QTCREATORBUG-12847
Change-Id: I8b42631adf62cd9b6afea619a17bf01a725a2968
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 15:13:18 +02:00
Ulf Hermann
74c8faad6d QmlDebug: Move utils dependency into qmldebug_dependencies.pri
Change-Id: Ia5b6fdf4303b889337442903eeb2a4efda6720ca
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-15 14:04:47 +02:00
Christian Kandeler
6046d872e4 qmldebug: Fix qbs build.
Change-Id: Ibfeb6e26404468b02a5bd06a7b2ebc65ead65128
Reviewed-by: Ulf Hermann <ulf.hermann@digia.com>
2014-09-15 13:22:43 +02:00
Oswald Buddenhagen
df1f576666 use DISTFILES instead of OTHER_FILES in docs, templates, and editors
the latter variable is entirely meaningless to qmake and should have
never been recognized by creator. unfortunately, qmake's dist target
wasn't very useful before qt 5.4, so it didn't occur to anybody to
actually use the variable associated with it, even though it is
semantically exactly the right thing.

Change-Id: I249857f54fdc38fb5ecac0f608e5f4140624c23c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-09-15 13:19:27 +02:00
Oswald Buddenhagen
3e4f17c164 remove pointless uses of OTHER_FILES
these cases are automatically covered by other variables

Change-Id: Ic32411fa361346633d3127be063fcaabc9ef7c28
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:51:02 +02:00
Orgad Shaneh
c0c324d75c QbsPM: Clear progress bar on project unload
Change-Id: I4f695a74032aa9f1e1b4d45f17ab8c4170717297
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-09-15 12:40:41 +02:00
Oswald Buddenhagen
ca492c8fac use DISTFILES instead of OTHER_FILES in creator's own build system
it's the correct variable to use.

Change-Id: I9ec7795099097715a64969516cd3fae9e213a0f4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-15 12:10:01 +02:00
Daniel Teske
7dbb9b2678 DesktopQmakeRunConfiguration: Use Qt5 connects
The future is now.

Change-Id: I68fa2fc75d8fe4437600a808949892e9002d950d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-15 11:54:52 +02:00
Christian Kandeler
5e4f3a4f4e QbsProjectManager: Turn the timestamp check off by default.
One line was overlooked in a recent patch that intended to do this.

Change-Id: I1c344c4e25d47b2c4cc89071c2a4e059b451c9fd
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-15 11:45:30 +02:00
Christian Kandeler
4cfaeb8b51 QbsProjectManager: Fix crash when calling QbsProject::files().
We can't do that during parsing, as qbs::Project::buildSystemFiles()
might run into a race condition.

Change-Id: Iae3fd3000fdc71fec50c82d50fb3b4e3888351bc
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-09-15 11:45:16 +02:00
Eike Ziller
a29de8f7ad Fix build of qmldebug library
It was missing the dependency to the utils lib

Change-Id: I215dff08036b3cfb7a28cedad99932bb7dd916f1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 10:55:11 +02:00
Orgad Shaneh
41ea3ffea8 Git: Fix comment indentation in BranchAddDialog
Change-Id: Ia1cd72b598555681e62444f6843a746049c5c04d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2014-09-15 10:08:18 +02:00
Ulf Hermann
0234148249 QmlDebug: Fix typo
Change-Id: I5e316ada7d03c465a7f60246e2c04e1a89078689
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:16:26 +02:00
Ulf Hermann
84d5afcbf4 QmlProfiler: Document which thread scene graph events come from
It's very nice to see that at a glance, rather than searching around
in the code.

Change-Id: I1d1cdf10d98578ca1fe3275fdf2dfc98f6499eed
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:16:17 +02:00
Ulf Hermann
344712646a QmlProfiler: Provide UI for hiding and showing categories
Change-Id: Ia1e2cd87523d53d4a2d0de9f74980e05c565f8e0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:16:05 +02:00
Ulf Hermann
8c080e909a QmlProfiler: Make timeline expand buttons actual Button items
It looks better, both in the code and in the result.

Change-Id: I5d24b24de429fb6a6d15c2df97f977924bb9fb00
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:58 +02:00
Ulf Hermann
2b362de064 QmlProfiler: introduce properties for empty, hidden and displayName
Like this we can properly refer to them from QML.

Change-Id: I98378d543d307f78909191225e72c9d0404dfa1d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:52 +02:00
Ulf Hermann
5799901bcc QmlProfiler: Protect AbstractTimelineModel's loadData() and clear()
They really shouldn't be called from outside. We'll introduce an
"empty" property whose notify signal will depend on data handling to be
done in a controlled way.

Change-Id: I272eaa3638ba571d9f9ffd964b0d33449d0adda1
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:43 +02:00
Ulf Hermann
2e11197bca QmlProfiler: Centralize timeline rowCount calculation
Change-Id: I0db3641c0d6e750459d815e25909babf8534a4f6
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:39 +02:00
Ulf Hermann
69743fef93 QmlProfiler: Filter event types also on client side
Like this we can still save some time and memory if the profiled
application doesn't support filtering.

Change-Id: I534ad4a11f62d28bd2fcfbffdc44f3902758dcbe
Task-number: QTBUG-41118
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:30 +02:00
Ulf Hermann
6d58de0bad QmlProfiler: Allow preselection of events to be recorded
This allows us to reduce the amount of data we need to handle
if the user isn't interested in certain categories.

Task-number: QTBUG-41118
Change-Id: Ieaac12fb1dec29d6035642f433bc1a1d49e545c2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-15 09:15:24 +02:00
Erik Verbruggen
7290c43da1 C++: update project info once after finishing adding all project parts.
So that recalculating the information is not O(n^2) but linear.

Change-Id: I69903e0b5ad321d071804d782ad634a3f300e71a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 17:42:32 +02:00
Francois Ferrand
9c1f44e942 [Valgrind] Use standard font for currently selected memcheck entry.
The current item was displayed using the hardcoded "monospace" font, so that the current/system
font and size was not used. We now use start with the same font as the error list, and simply
activate 'fixedPitch'.

Change-Id: Ifcf6f0fc044e47b3a57281f6af2d70b7f1c618e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-12 17:03:44 +02:00
Nikita Baryshnikov
87bcfab099 CMakeManager update connections to Qt5 style
Change-Id: I0e44d60aa22eeb7da9020f6028899a42f07e212f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 16:32:31 +02:00
Ulf Hermann
9ca42dacf3 QmlProfiler: Don't process all events twice when loading traces
At the end of QmlProfilerFileReader::load() we have a perfectly valid
set of types and events which we can just pass on to the model as-is.

Change-Id: I6981663f409c4647f4d5ae8a73b5d14cc701017b
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-12 15:44:28 +02:00
Erik Verbruggen
ce49f92cb7 Clang: remove dead code.
Change-Id: I06bac5443af41a27c2641199948705c45e8a4586
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 15:42:42 +02:00
Ulf Hermann
b4f336f142 QmlProfiler: Add EngineControl
With EngineControl multiple QQuickViews can be profiled in one
profiler if they're all running in the same thread. As the QML
engines are never run in parallel then this results in useful
data.

Change-Id: I83a34fb81fd466c5cac838b096c1b1f322ded882
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-09-12 15:40:48 +02:00
Ulf Hermann
165f759e18 Editors: sync the layout with the contents before setting text cursor
Not doing this makes the QPlainTextEdit interact with an invalid
layout, potentially causing crashes. Now the cursor setting itself is
not part of the undo stack anymore, but as undoing sets the cursor
itself, that shouldn't be a problem.

Change-Id: Ic6f8ee9781faed655ac20f058b562c098ced20ae
Task-number: QTCREATORBUG-12987
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-12 15:36:18 +02:00
Nikita Baryshnikov
d38e8283df CmakeProjectManager remove stale methods
Looks like they are zombies scince
b419403b0f

Change-Id: I5fe0c728dcce1931e543e15f04ae24e0c65db61a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 15:19:58 +02:00
Nikita Baryshnikov
c363ce4263 CmakeProjectManager decrease N of included headers
Change-Id: I4b216e9e228668c7e01bc31c30334397cb07b15e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 15:19:48 +02:00
Tobias Hunger
ffe432e8d8 Fix string
Remove the '.' as the VariableManager will append text starting with ':'
to that textFix strings.

Change-Id: I490319fac964ea8fd8078dff90ec81c9bdef8d09
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-09-12 15:00:48 +02:00
Orgad Shaneh
ad957282c8 Debugger: Cleanup
Change-Id: Iaf7a3d69d920f8096763e2d8033df2d6371683a7
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-09-12 13:58:47 +02:00
Eike Ziller
50ad2a4d99 Editors: Support drag and drop from open editors pane to splits
Change-Id: I6f8685319f0afe2a326a66e36a1e6b671e317614
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 13:00:30 +02:00
Eike Ziller
0e0471d698 EditorToolBar: Show editor context menu when clicking on file icon
Change-Id: I0a66d7a2a77ed0b2c7c87005887a7847bb9ee5f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 12:56:02 +02:00
Eike Ziller
e0c5d2365f Support drag and drop between splits
Change-Id: Ia1e43cb44639e332ee4f9100c7ce3029e9485198
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-09-12 12:55:51 +02:00
Erik Verbruggen
67421f6c53 C++: fix invalid nesting of if statement.
Reported as a dead store by the clang static analyzer.

Change-Id: Id5eb72ea4698a17486b8a05d88ee66f3fd89bcfc
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 11:31:56 +02:00
Erik Verbruggen
4cfb7a62b7 C++: remove dead store.
Pointed out by the clang static analyzer.

Change-Id: I2d73d4c9ef2511c5697a4e4da89b61efb1149a3f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 11:31:51 +02:00
Erik Verbruggen
ebcd4ce8db C++: fix possible nullptr deref.
Pointed out by the clang static analyzer.

Change-Id: I69ab89e651cbcb13606d5d93a05f629172cbd9e0
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-09-12 11:31:46 +02:00
Tobias Hunger
0ed377466c AbstractMacroExpander: Allow escaping of %{Macros}
Use "%{}" to put a literal "%" into the output of the macro expander.
E.g. "%{}{Macro}" will be turned into "%{Macro}"

Change-Id: I592789e5cd8f2d52df424db679baf7ba04723202
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-09-12 11:28:48 +02:00
Thomas Hartmann
4114297992 GlslEditor: Remove unused include
Change-Id: Ia531698eacab0f0c4f20f1bc1c54d59e7c2df010
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-09-12 11:07:51 +02:00