Commit Graph

40750 Commits

Author SHA1 Message Date
Tobias Hunger
12c7f73676 MiniProjectTargetSelector: Fix graphics glitch
Change-Id: If0441cd6aaf505c311a50d7bd307e5b83edbc428
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-22 08:29:14 +00:00
Tobias Hunger
acc35ab402 MiniProjectTargetSelector: Update Kit area on Kit changes
Simplify the code a bit, and make it work while at it:-)

Change-Id: I4eb613ce526e148c18588443e5153d6e0118fa01
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-22 08:29:10 +00:00
Daniel Teske
4f383f77b4 Tasks: Make the linking of compile output to Tasks more robust
Clicking on error messages is supposed to jump to the editor.
And "Show Output" on the task is supposed to select the error
in the output.

The old code just registered the task for the last line of
output. This broke for every parser that allowed for
error messages that spanned multiple lines. And was obviously
also incorrect for tasks that weren't generated due to
compile output.

Fix both of those issues by giving the IOutputParsers more
control on which lines are linked to a task.

Task-number: QTCREATORBUG-14136
Change-Id: I095922c9875620dabfb7d406f6b152c8a9b25b62
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 13:42:03 +00:00
Tobias Hunger
02068b8ef1 ToolChain: Add scrollbar to config widget
This is necessary for the custom tool chain that has its widgets
squashed together.

Task-number: QTCREATORBUG-10329
Change-Id: I53f125721c1e018bca07503049f412fec3725c22
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-21 13:37:14 +00:00
Tobias Hunger
bffca9b1db Kit: Simplify rendering of config widget
Do not bother to paint a nice gradient just to paint all over it
again.

Change-Id: Ia01dae59f48e3b7cd2923e28770e9d953028b22a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 13:35:14 +00:00
Daniel Teske
ba33fac6fb GenericProject: Mark files ending in .qrc as Resource files
Otherwise the Designer doesn't know about those files and removes all
refrences to them from edited .ui files.

Change-Id: Icbb0a19b191c789ae00e45d8d8e26f92fddbae0b
Task-number: QTCREATORBUG-14275
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-21 13:34:42 +00:00
Tobias Hunger
94874bdf1c Utils: Enhance resize shrinking behavior of the AbiWidget
Allow the first combobox to shrink below the length of the displayed
text: That information is repeated in the details anyway.

Change-Id: Iadb554cbd08a4a9a0a0d8060cbbedc8cdacb791a
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 13:29:34 +00:00
Daniel Teske
598a4c46ed ProjectMode: Fix double scrollbar
The Build and Run pages already have a scrollbar, so remove the
outer scrollbar.

Change-Id: I1b3ac31d2fa85c7ddca2b22644107c0718a13f7c
Task-number: QTCREATORBUG-14289
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 13:10:39 +00:00
Daniel Teske
d1a7176f1c QmakeProjectManager: Don't add mkspec include dir explicitly
It will be added via INCLUDE anyway.

This also removes all code using BaseQtVersion::systemHeaderPaths(),
which is thus also removed. This function was introduced to support
Symbian.

Change-Id: Id372e1cfc20bd22de948ed9a7d28dfa9135cbfa9
Task-number: QTCREATORBUG-13964
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-21 11:29:37 +00:00
hjk
f5e2e6d4f2 QtSupport: Make qmake built-in variables expandable
Task-number: QTCREATORBUG-12724
Change-Id: I4b8939ec80e398b251fd79387bc2863aa1da775b
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-21 11:00:25 +00:00
Orgad Shaneh
edf1d0d513 Git: Fix diff for renamed/copied file from commit editor
Change-Id: I8100c3f029687d5d0b7af6a8f4c29cf939ee93e6
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-21 10:43:27 +00:00
Nikolai Kosjar
eb808980f7 C++: Remove unused member
Change-Id: I3469aab3ea699d531f12383138f4e91411b98e7f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-21 10:03:46 +00:00
Benjamin Zeller
255b5850e2 CMakeProjectManager: Support mapping chroot include paths
Provide a way for plugins to map include paths into a build chroot.
Plugins can register a path mapper if required, otherwise the paths
are not touched.

Change-Id: I621982831fa354d6d0f558a6c1dce4e014421f12
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 09:58:53 +00:00
Orgad Shaneh
9f7c801e4d AutotoolsPM: Update dependencies
Change-Id: Ib6e3a0ef5d11a5c1e8807ae39f228dfab58786cc
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 09:53:21 +00:00
Orgad Shaneh
4896bb41e9 ProjectManagers: Detect Qt by kit for code-model update
Change-Id: Idf5f8233e4457bb22437d442732432acf0ce313e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-21 09:19:01 +00:00
David Schulz
b192d18e04 TextEditor: Caching links at cursor position.
Reducing the number of calls to findLinkAt() when hovering over
text.

Task-number: QTCREATORBUG-12573
Change-Id: I679ee7d9599071e1e3ea20cc028440df6dad0d25
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-21 08:47:37 +00:00
Joerg Bornemann
4b5315bd7c CppEditor: fix "Convert to Stack Variable" for empty initializer lists
The "Convert to Stack Variable" quick fix generated invalid code for
the following snippet: QString s = new QString();

Task-number: QTCREATORBUG-14279
Change-Id: I1f5e33d2089bc2d5713eae1e9f4dc5986523112c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-20 16:14:43 +00:00
Tobias Hunger
465cf130d7 KitManager: Enable sorting on the target setup page
Add a separate method to sort lists of kits and remove the sortedKits()
method again.

You should not use the sorted list whenever possible, so requireing a
two-step process to get that is not too hard. And it allows to sort
sub-sets of all kits, which is exactly what we might have on the
TargetSetupPage.

Task-number: QTCREATORBUG-13549
Change-Id: Iaa8443bcc8c321425daa13a1fb1e024d18939306
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-20 15:00:32 +00:00
Orgad Shaneh
cb350bfeb2 C++: Rename ClassOrNamespace -> LookupScope
Change-Id: Ide74482b133dd1fec40a725d9aa81bd749385f37
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-20 14:51:56 +00:00
Orgad Shaneh
9e1e11db60 Git: Detect renames and copies on diff
Change-Id: I96e822df7eb5a0fc85108163a7ecf7b5e2a98d58
Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-04-20 14:36:47 +00:00
Orgad Shaneh
2f3d2a2490 C++: Pimpl ClassOrNamespace
Makes it easier to add features to ClassOrNamespace without rebuilding half of
the project.

Change-Id: I7ac646e8ad08fc8da6f7ed43ff184fb17edbd6b7
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-20 14:07:58 +00:00
Orgad Shaneh
29ac9fc65f C++: Remove DeprecatedGenTemplateInstance
It's, well, deprecated...

Change-Id: Ie9d7e80345a8d9404f702dd877b3e940a1a49d93
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-20 13:37:35 +00:00
Tobias Hunger
e5d8dbd070 Json Wizard: Do not write .user files for subprojects
Delay till subprojects are handled and only create .user files for
those projects that are not a subproject.

Change-Id: I606acbce5a9a8ca7c033f94869e796edd88d6c1e
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-20 12:44:36 +00:00
Tobias Hunger
40599b5296 Linux: Warn on build applications failing due to missing libraries
This can happen e.g. when a system upgrade bumps the soversion of
libraries moc/uic/etc. are using.

Task-number: QTCREATORBUG-12550
Change-Id: I4ee3427d8dcd390133ac178762a26ba48cddd4bf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-20 12:43:56 +00:00
Eike Ziller
b3fa02d0ed Automatically choose device pixel ratio
Change-Id: Ic595ee0f45b7d3ec22b4c4086c0c6785b41c21f4
Task-number: QTCREATORBUG-11179
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-20 12:19:16 +00:00
Tobias Hunger
0ff8b9e283 Json Wizard: Fix unsetting of attributes
This did trigger all kinds of side-effects, one of them was

Task-number: QTCREATORBUG-14294
Change-Id: If39f827828e9c5a2559bd6b3b5392ac819fbd931
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-20 11:50:01 +00:00
Eike Ziller
dd3a30090b Use QQuickWidget in welcome mode when compiling with Qt 5.5 or later.
Several bugs were fixed in QQuickWidget, making it viable to use it by
default with Qt 5.5.

Change-Id: If31d2cfabf80d01b1588269a1fde96742621e995
Task-number: QTCREATORBUG-13440
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-04-20 11:22:10 +00:00
Tobias Hunger
5ba30d9278 Vcs: Find better line-number to scroll annotate output to
Use new TextEditorWidget::firstVisibleLine, etc. methods to find
a better line to center on.

Task-number: QTCREATORBUG-14230
Change-Id: I36424fcd1200d362d06c456e7b4c13e671dbd4b6
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-20 07:56:46 +00:00
Tobias Hunger
3b68a46ba1 TextEditor: Add methods to query the first, last and center line
... that are currently visible on the screen.

Change-Id: I6c56f376f1a34a7314584df057cf03a8e5387a08
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-20 07:55:47 +00:00
Orgad Shaneh
be88c38e42 Utils: Support ~ in PathChooser
Change-Id: Ib4b79f8ba27ab856dfeb93a8b697b087be90d633
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-20 06:58:35 +00:00
Orgad Shaneh
0bf40a73c4 C++: Use explicit namespaces in LookupContext
Change-Id: I0c0cc577db9b75044ebd9f5fdc51cecc0f91e3ea
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-04-18 17:42:38 +00:00
Robert Loehning
0e96bd7e63 Update compiler info in README.md
Change-Id: Ie2aae8ae8246fbdfb6d79ea250cca2ae35b96121
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-17 12:21:25 +00:00
Tobias Hunger
49aa04bf1e Git: Use colors from theme
Change-Id: I1627f7d55d50f302f76c591345c021a3b400e43e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-17 11:56:23 +00:00
Tobias Hunger
5c60bb9dd5 DiffEditor: When jumping to a file then put that block to the top
When jumping to a file via the dropdown box: Have that block be
scrolled to the top of the view, not to the center. This is way
less confusing.

Change-Id: I5c629dda1af8bff76ca93a70357aa35c8efcb37a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-17 08:24:31 +00:00
Daniel Teske
804a573105 Fix renaming of seesions not deleting the old session name
This was caused by the PersistentSettingsWriter writing the old
session on being deleted. Which was after we removed the file.

So delete the PersistentSettingsReader earlier.

Change-Id: I7e73775cc1c2e31b2f2a567b1d08efefdb3ee949
Task-number: QTCREATORBUG-14285
Reviewed-by: Sergey Belyashov <Sergey.Belyashov@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-16 13:50:11 +00:00
Daniel Teske
2023489869 AndroidDeviceDialog: Move refreshing devices to a diffrent thread
Easy to do and makes the dialog feel marginally nicer.

Task-number: QTCREATORBUG-13123
Change-Id: I64098f1fd751100d40227c298a9e7eb358552bfb
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-16 10:36:18 +00:00
Eike Ziller
3b64374a3e FileSearch: Search in parallel.
Task-number: QTCREATORBUG-10298
Change-Id: Ib15a7aa015bf88ba89cb91451a9130bf452d8449
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-16 08:36:21 +00:00
Eike Ziller
37fb296e72 FileSearch: Move FileIterator to std iterator semantics.
We need this when we want to use QtConcurrent::mappedReduced.

Change-Id: I4a6a31f4a0cc9a739a263cc148a1d51d7aa5d418
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-16 08:36:13 +00:00
Eike Ziller
50fe3585a8 Merge remote-tracking branch 'origin/3.4'
Conflicts:
	src/libs/timeline/qml/MainView.qml
	src/plugins/git/gitclient.cpp

Change-Id: I0b6ec7b9a592014deb0dd2e1145b19dd6753b1c3
2015-04-15 17:45:47 +02:00
Ulf Hermann
bd964ab0be Timeline: Fix visual appearance of filter menu
The text next to the checkboxes needs to be elided to fit into the
menu. The filter gets reset every time we clear and reload. The
checkboxes reflect this now.

Change-Id: If34188a4abb0c087a8f585653abcf0a787fc3232
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-15 14:14:59 +00:00
hjk
d3c06c9e4a Debugger: Make QUrl dumper test pass for LLDB on Linux
... by relaxing the namespace checks.

Change-Id: I2c2978fe4e95bdc87df24fd6ecbcba4bf1913df3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 13:49:59 +00:00
Eike Ziller
340882f564 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ieb0b3d9a598b9c99f4339fa64e92cf8b72d4bf5f
2015-04-15 15:45:34 +02:00
hjk
7007bf4057 Debugger: Use a more generic approach to LLDB's namespace problem
This is a generalization of 134234be67. '?QFoo' is now meant to
match both 'QFoo' or 'Ns::QFoo' in a namespaced Qt. '@QFoo'
continues to match 'Ns::QFoo' only.

Change-Id: I4285cd9f75a2e4cd94ec5dbb107214f75a60c810
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 13:39:48 +00:00
Christian Kandeler
3fce8cfc4f QbsProjectManager: Don't offer "Add File" functionality for folders.
It does not make sense to add files to anything besides products and
groups.

Task-number: QTCREATORBUG-14286
Change-Id: Iced8cefc4eff3857e9a1a6d3a3a9311dcbb44f11
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-15 13:25:25 +00:00
Tobias Hunger
3d6d33f60d Fix printing of seconds and milliseconds
We use a space between the number and the unit and use 'ms' or 's'.

Change-Id: I689a8639c2d33c2f97789455b1e05693be0b2ccb
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-15 13:06:56 +00:00
Christian Kandeler
bde83c30bf SSH: Fix TCP/IP forwarding support.
We hardcoded the remote host to the SSH server for some reason, and the
originating port was bogus as well.

Change-Id: I8f6700bc12f4374302dd3bfc035c9c9f060f56ef
Reviewed-by: Caspar Romot <cro@icd.ee>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-04-15 13:06:29 +00:00
Daniel Teske
387f746768 AppMainWindow::raise: Use Qt's activateWindow
The work around doesn't seem to be needed anymore. The case that
is described is a Creator hitting a breakpoint, but not being raised.
This works for me on both gnome and kde with this workaround removed.

Removing the workaround also fixes:

Task-number: QTCREATORBUG-13845
Change-Id: I4f751c701a17ee39679b951b9cf7d52a68552d9f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-15 12:59:40 +00:00
hjk
aee5668b62 Debugger: Handle char const* and const char* the same in types
Helps recognition of default std::maps and makes the StdMapQt
dumper test pass with LLDB on Linux

Change-Id: I2d2a91d65e895c7fc2c99e24cc77d21ca6353b22
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 12:59:12 +00:00
Christian Kandeler
6cf2167b91 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: I870c6c8fb86fd06cb77a7c2a333442f05c9f69b0
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-15 12:49:28 +00:00
Orgad Shaneh
ec2d13641b Git: Suppress stderr output for fully synchronous executions
Broken by dcdcf54048.

Change-Id: I32f56bb432dfd3ce26397fd41908c6823cd4d7f1
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:48:54 +00:00