Commit Graph

40728 Commits

Author SHA1 Message Date
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
Orgad Shaneh
a79df8e1e7 Utils: Make SynchronousProcess use second based timeouts
Change-Id: Ie2de2359225017cae7181bee0df17542fa36efd8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-15 12:42:46 +00:00
Tobias Hunger
5a2b5036ab Git: Get rid of findExistingVCSEditor
VcsBaseClientImpl::createVcsEditor does do the same check.

Change-Id: I89c8d954e8d104261d8ee51a098b97110b4538f4
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:35 +00:00
Tobias Hunger
ee7a47681b Git: Use vcsExec in favor of plain VcsCommand
Change-Id: I9e422d3ef7749f37323edf1f85d1c65b8c60344a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:29 +00:00
Tobias Hunger
be3e0438c6 Git: Rename asyncCommand to vcsExecAbortable
This name makes it more clear what the method does.

Refactor to use VcsBaseClientImpl::vcsExec.

Change-Id: I4cf742c2b172d2589bd7d6740461e4a4c8d470ed
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:24 +00:00
Tobias Hunger
d45dea6cf8 Git: Move executeGit into VcsBaseClientImpl
and rename it to vcsExec. Accept a QVariant to set as cookie on the
command instead of a int for the linenumber.

Change-Id: I8240b53e775ac3883f92bdbf7b111abeeeb39426
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 12:24:20 +00:00
Christian Stenger
62941c7b87 Tests: Fix parsing of gcc version on SuSE
Change-Id: Ieb8b5a1ea998abbd2d3baf13829f81f9d4cc43e5
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-15 11:58:35 +00:00
Leena Miettinen
53502d7c5b Welcome: update links to videos from Dev Days 2014
Give preference to videos about using and developing
Qt Creator.

Add new icon for 2014 and updated icon for 2013 with new logo,
and remove icon for 2012, because it is no longer used.

Change-Id: If7f34b03247eb8cbe68b9460efbb55dc42770dd4
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-15 11:49:37 +00:00
hjk
89661af04e Debugger: Fix one call to check(False)
Not much harm done, the code was meant to raise an exception anyway...

Change-Id: I81db4081b4ca583e46a826aaee2fc8fa3f186a11
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 11:37:35 +00:00
hjk
6965fc30b1 Debugger: Disable parts of QDate* dumper for GDB on 32 bit
Older versions of GDB (~GDB 7.4 on 32 bit) will cause segmentation
faults in inferior calls due to misaligned %ebx values in an SSE
call in qstring.cpp:findChar.

Change-Id: I44492106080f12e645f9d57828438ec70fd66ca6
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 11:07:30 +00:00
Orgad Shaneh
7668d4388b VCS: Remove superfluous metatype declarations for QVariant
Change-Id: Ib3d48607a66199255fbcfc90815d104bc9cd0402
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-15 10:39:43 +00:00
Ulf Hermann
05edc86cad Help: Remove extra event processing
It's not clear why we need it there, it's generally not advisable to do
qApp->processEvents() and in this case it clearly creates problems.

Change-Id: I2707ef0ec98ee761078283ee3ce3f76f9da95f31
Task-number: QTCREATORBUG-14215
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-15 10:35:15 +00:00
Orgad Shaneh
5bf6cfb381 Git: Suppress double logging of commands
appendCommand() is already called by runVcs.

Change-Id: I215ac00d0efc36e5f62865d7d2cf9941533a160d
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-15 10:31:54 +00:00
Tobias Hunger
d7ecf7df4b Git: Add a static method to attach a GitProgressParser to a VcsCommand
Change-Id: Ia7e104665360a254d5f3867b69e11fb7c46ff93e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 10:12:46 +00:00
Ulf Hermann
1da6b16a55 Timeline: Make sure timeline renderers are properly destructed
The base class should delete the d-ptr and the derived classes
should delete the members they add. The missing virtual destructor
in TimelineAbstractRendererPrivate constituted undefined behavior
(which wasn't triggered as it was never deleted) and the missing
destruction of render states and d-ptrs was a memory leak.

Change-Id: I4db9e5e2d6f23a3a58541c48ce08aa8fe5951cc9
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-15 10:12:41 +00:00
Tobias Hunger
9364f64f2a Git: Use default encoding for git-branch output
I see no reason why that should require source encoding.

Change-Id: Idd7103f09fd66f0363f8e58e04a8abdb183f74ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 10:12:38 +00:00
Tobias Hunger
b6608d0d37 Git: Simplify use of conflict handler a bit
Disentangle binding to an existing command from the actual task of
the conflict handler. This makes usage more clear.

Also rename "command" to "abortCommand" which is also more clear
as to what it is used for.

Change-Id: I862cfec97fbf512a3121f0a7d58ae12f148879a6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-15 10:12:14 +00:00
Leena Miettinen
de119bc119 Doc: add typical QML Profiler use cases
Change-Id: I81bd8eface83f4b505c0ff30dfcfc74882001f3a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-04-15 09:28:33 +00:00
Christian Stenger
ff81a1a754 Test: Dumper: Limit single check to Qt5.x
Change-Id: Ia769c16761a171e3e472144cd3ace3280ae5a6aa
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-15 08:58:44 +00:00
David Schulz
88d9740642 Bookmark: Fix crash after saving file under a different name.
Task-number: QTCREATORBUG-14225
Change-Id: I5416b21dc0494825a892e42ae6bd4ff6f4cc0a56
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-15 08:56:41 +00:00
hjk
32aff7820f Debugger: Make QThread dumper test compile and pass on Mac
Change-Id: I094d3add58681cbc94a76cdc0d45040c705169e5
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 08:11:50 +00:00
Nikita Baryshnikov
12dffc6590 Qml&Js: properties/methods/enums inspection
.. of builtIn qml and cpp code over "Inspect API For Element Under
Cursor" action.

Change-Id: I70d5bec2933b682295c5242248a2b0f95dba4e76
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
2015-04-15 08:02:50 +00:00
hjk
8c7d3c3a90 Debugger: Weaken QVariant(QUrl) test
... to make it pass with LLDB. The exact display of the private
is not *that* interesting anyways.

Change-Id: I2d0a8bdd5daff4b03c77b00c887837c7568ea508
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-15 07:46:20 +00:00