feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
50,170 Commits 108 Branches 368 Tags
d3b51ccda7ff1e2f699acbe10397f40a2e25b9eb
Commit Graph

40457 Commits

Author SHA1 Message Date
Orgad Shaneh
71c2352e4b Git: Fix parsing of "already merged" files in merge tool 
If you have several files that require merging, and you externally resolve
(and git add) some of them, the following message appears:

foo.cpp: file does not need merging
Continue merging other unresolved paths [y/n]?

We don't identify the first line, so the second one is lost too.

Change-Id: I54c579910656c07be7e6b3236551257443fe8fb9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 12:13:58 +00:00
Orgad Shaneh
86f32f5b9c Gerrit: Ignore default port when comparing servers 
The user can have the default port set in .ssh/config

Change-Id: I2b59b224c15ed32326e7daa2e33dbb9fe398a137
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 12:13:00 +00:00
Thomas Hartmann
b6a9aeef59 QmlDesigner: Add logging category for viewmanager 
Change-Id: I7e605f617b32fb271fb6303fc6475ab176a8ef1a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-23 12:11:52 +00:00
Tobias Hunger
021ea165dd CMake: Export CMakeParser 
Task-number: QTCREATORBUG-17731
Change-Id: Iae2fdb0fd06489c558a58c698553edeaec9924ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-23 12:00:16 +00:00
hjk
4637b3fed7 Debugger: Don't crash if targets vanish if the last kit is deleted 
Task-number: QTCREATORBUG-17702
Change-Id: I42cc08cab67f57d749898f5b01925b7ef3658165
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-23 10:04:32 +00:00
Eike Ziller
311bed936c Fix that last session could reset to default session 
E.g. when opening and closing Qt Creator without opening a session.
The last session may only be updated to the "active" session, if it is
not the default-virgin session (which is actually a "no session" value).

Change-Id: If47da30d94c20df62d45960224e3137bcc6ba1b8
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 09:57:48 +00:00
hjk
7045a07d5d ProjectExplorer: Remove some more uses of FolderNode::projectNodes() 
Avoids some temporary intermediate containers.

Change-Id: Id8dd2387c06a1f4fdbc5524359a624876534a569
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 09:43:24 +00:00
David Schulz
330d8cab16 Debugger: Fix Qt 5.8 QDateTime dumper for cdbextension 
Change-Id: Ic621cc67d647ab6396ddbef214ffcd104b66a1da
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-02-23 09:42:43 +00:00
Nikolai Kosjar
f571253d49 ClangStaticAnalyzer: Simplify testProject_data() 
Change-Id: Id49441993b01c9a058e94071a555468b5e7b9ad1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-02-23 09:40:32 +00:00
Montel Laurent
9bccdb8885 Convert some 0 to nullptr 
Change-Id: Ib3ca8e2cc0d63fd35582c73b3cf7c915fb64ddfb
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-02-23 08:22:14 +00:00
Orgad Shaneh
4d402664c6 Gerrit: Place newer changes first 
Change-Id: I14c5fad3061cac9656ddba49a6a8d6e3bdb934f3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2017-02-23 07:35:19 +00:00
Montel Laurent
44802d754e Delete QMessageBox after usage 
Change-Id: Icba5fddb5596f263f2cbb19f91b6ce95ca7785c6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-02-23 07:25:27 +00:00
Orgad Shaneh
2cf2aca136 Git: Remove last "slots" 
Change-Id: Id628004ccb7e00b44bb5639072a081ed6ca8c852
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-02-23 06:28:08 +00:00
Orgad Shaneh
9f697128c3 Gerrit: Remove now unused member 
+ fix bold unreviewed changes logic.

Missed in f7bd558883

Change-Id: I7463b476e9591e8a0d22dfa8c63eea51fea0d4f4
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-02-23 06:28:00 +00:00
David Schulz
bb05b5ff11 Debugger: Pass Qt type info version to the debugger protocol 
Fixes Qt 5.8 QDateTime python dumper.

Change-Id: If6fab7bf3ea63372ef01942bcaa2121eb9c2b6db
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-02-23 05:55:46 +00:00
Denis Shienkov
2276845ed8 BareMetal: Fix startup of OpenOCD in TCP/IP mode on Windows 
Previously, the OpenOCD utility fails as the startup arguments
contains a wrong quotes wrapping for Windows OS. For example the
'gdb_port 3333' argument contains a single quotes, instead of
double quotes, due to passed the Utils::OsTypeLinux parameter for
any OS. We need to use the Utils::HostOsInfo::hostOs() function
instead.

Task-number: QTCREATORBUG-17765
Change-Id: I08acc4158baeca04e1b8685f1fdac40684f1c70c
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 16:57:29 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists 
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 16:25:09 +00:00
Tim Jenssen
005ca71cac qmake: Use a QSet<FileName> for sets of folders 
Change-Id: Ia2b9c435bd16eb5175534975fd822cecb74cc70f
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 16:10:33 +00:00
Tim Jenssen
f716aac52a qmake: sprinkle some const 
Change-Id: I7f4ecc97650d8ed9c9720f3ff3af1b7eaa89c623
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 16:04:22 +00:00
Tobias Hunger
f9eab73dad qmake: move over from QmakeProjectNodes to QmakeParserNodes 
Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 16:00:49 +00:00
hjk
62726c3f77 Debugger: Fix transfer of non-8-bit output with LLDB 
Task-number: QTCREATORBUG-17533
Change-Id: Ib8f700cf1705273b22ee1ee4700d1a1d468fa2d0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-22 15:49:26 +00:00
Tobias Hunger
025d57981d qmake: Remove QmakePriFile::runConfigurations 
There is no need to forward that from the QmakePriFileNode.

Change-Id: I6ebc267eac68729ddb13027412cb315f81d55e82
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:20:40 +00:00
Tobias Hunger
e06e00c23c qmake: Add knowsFile() method to QmakePriFile 
Change-Id: Ib3f0799313afdb141270caa135b208a300078bc5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:19:50 +00:00
Tobias Hunger
8f0697e33d qmake: Unify TargetInformation and TargetParserInformation again 
Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:19:20 +00:00
Tobias Hunger
96a7902383 qmake: Introduce QmakeNodeTreeBuilder 
Introduce a new class used to turn a tree of QmakePriFiles into
a project tree.

Change-Id: I13b785fb988db3c5784bdf6e8daca6ba42f5a333
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:16:34 +00:00
Tobias Hunger
4ab44b07e5 qmake: Add method to find QmakePriFiles and QmakeProFiles 
Change-Id: I04a75b94603b5483d5f9eaa827d08415c0a92985
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:14:00 +00:00
Tobias Hunger
bc64e91c5e qmake: Use more FileNames in Qmake*File 
Change-Id: Id9f704d941a0f8df98bbb4e83e1ea773241a7023
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:13:27 +00:00
Tobias Hunger
5a223ca94e qmake: Add accessor for file lists to QmakePriFile 
Change-Id: I37f9f39eba3bae2376d5349ce597e29fca6cb21f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:12:17 +00:00
Tobias Hunger
f8aaa2e0eb qmake: Do not rely an rootProjectNode in QmakeProFile::buildDir 
Change-Id: I68211110c84587376079c02e0a7cd5f6ac6f9295
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:10:55 +00:00
Tobias Hunger
ea23967630 qmake: Simplify QmakeProFileNode::buildDir 
Change-Id: Ibca12d7c88e2dbdd3d9097a0c199d8ef039a56f4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:10:31 +00:00
Tobias Hunger
167762c2c6 qmake: Implement QmakeProFile::allProFiles 
Change-Id: I9074b398e8b90657125c697cfa366f304c6c9ab5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:10:04 +00:00
Tobias Hunger
2f333b1072 qmake: add displayname method to Qmake*File 
Change-Id: I90e6ef357f050953f51ae9cad4eb1c1d2daf4e5a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:08:53 +00:00
Thomas Hartmann
6505a69718 QmlDesigner: Avoid updating selection 
If we move the cursor, because the selection changed, we have to stop
the timer. Otherwise the curser change will again trigger a
selection change.
This is bad for performance.

Change-Id: I16f3a530ae6518707e744efbe52e83f0e148ea22
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:08:16 +00:00
David Schulz
fc43fb477b C++: Do not add double quotes when splitting raw string litterals 
Task-number: QTCREATORBUG-17717
Change-Id: Iffb34a3d77ada624dc13b8ab050ac08731d25863
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2017-02-22 13:08:15 +00:00
Tobias Hunger
5103d4e53b qmake: Use nullptr in Qmake*FileNodes 
Change-Id: I64605a59056cdee660cb1d8b2d447a79d0db94b4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:08:08 +00:00
Tobias Hunger
bc390a8e99 qmake: Do not use out-parameters for QmakeProject::findProFile 
Change-Id: I9eec5138ebe0d3c02dadb91c66146e4419fc9cd3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:07:21 +00:00
Tobias Hunger
8eb63d8375 qmake: Use Utils::FileName for QmakeProFile::subProjectsToDeploy 
Change-Id: Iaa87f8049998939c883867aa13d9d347c19c33f9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:05:59 +00:00
Tobias Hunger
9e63c71412 qmake: Update QmakePriFile::subPriFilesExact 
Change-Id: Ie1db4eb200c2a5d56bbca678dbe007f91aadf04a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:04:33 +00:00
Tobias Hunger
aa4c7dc07c qmake: QmakePriFile is no longer a ProjectNode 
Change-Id: Ife3ca88e0d4e0a9de290b2b991ac8d10e3c55674
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-22 13:03:12 +00:00
Thomas Hartmann
80aad7bdd4 QmlDesigner: Do not check for warnings if validating 
If the rewriter is validating the changes come from the ui.
Do not show warnings in this case, since this is simply annoying.

Change-Id: Ia48233fbff26506c58e10ed2772212aac711f4fe
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 12:58:44 +00:00
Thomas Hartmann
36cc76670e QmlDesigner: Do not enable states editor for Popup 
Items derived from Popup do not support states.

Change-Id: Ib201fc6f2258c4c459f3bcbccc607a7cc5e4a609
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 12:58:35 +00:00
Thomas Hartmann
6e30faba73 QmlDesigner: Quick fix for Popup 
This is a quickfix for Controls 2 Popup, Drawer, Menu and Dialog.
We pretend everything derived from QtQuick.Controls.Popup
is an item instead of a QQObject.

Change-Id: I603dce8a1a1b08df3e2c1dccc0fa57e7ccef0800
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 12:58:20 +00:00
Robert Loehning
68130c5f97 Debugger: Initialize members of DebuggerItemConfigWidget 
Change-Id: I445b9fd6d343fca8f03ba1d8b163d31970a7ff7e
Reviewed-by: hjk <hjk@qt.io>
 2017-02-22 12:51:51 +00:00
Robert Loehning
936ad724d0 SSH: Catch all exceptions in SshConnectionPrivate::closeConnection 
SshClientException or SshServerException might
be thrown in SshAbstractCryptoFacility::convert

Change-Id: I0950ce8d7979c171926a12f6c6d94abeffcc4b93
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-02-22 12:51:34 +00:00
Eike Ziller
65d6a5aa0f ClangPchManagerBackend: Fix build warnings 
Change-Id: Ic5159ba09b6ce3d7d64dadc454268a34dd85f2a4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 12:30:29 +00:00
Thomas Hartmann
f1a27250f9 QmlDesigner: Add missing Qt enum 
Change-Id: I6447bb6664627eb9dd5cb39c661ca3b96d4bf178
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 12:01:10 +00:00
hjk
aaf94aac57 ClangStaticAnalyzer: Use common pattern to access SessionManager 
Change-Id: I335b4ffedd679cb14e9502c98513409859e34c8f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2017-02-22 11:30:58 +00:00
Montel Laurent
cb8d0f0678 Remove last Q_NULLPTR usage 
Change-Id: I8a55a9f1927e6db979d61eb4702f2ebde8d27572
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-02-22 10:27:26 +00:00
Montel Laurent
f3c8a2db1e Use isEmpty() vs "count() == 0" 
Change-Id: I9b3103fbc4e881693039c1a5e81f0d2b97803978
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
 2017-02-22 10:27:14 +00:00
Ulf Hermann
65e22d5a0a QmlProfiler: Drop some dead code 
Change-Id: I3eead26da7048ecc839edcc946c677da8a7134be
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
 2017-02-22 10:17:02 +00:00