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

50929 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Christian Stenger
74fb4bb014 AutoTest: Use better names and remove unused code 
Change-Id: Ifb7f252e7c3fd020537eb46c62d8f5700b8a55ef
Reviewed-by: David Schulz <david.schulz@qt.io>
 2017-02-24 09:36:28 +00:00
Tobias Hunger
721c902cd8 Qbs: Simplify QbsProjectManager a bit by using member initialization 
Change-Id: I848b61bb67023852db51043e9eca0b417c2e6725
Reviewed-by: hjk <hjk@qt.io>
 2017-02-24 08:41:38 +00:00
Tobias Hunger
9e8b427a70 ProjectExplorer: Nodes: Do not makeEmpty() as part of buildTree() 
Do not call makeEmpty() as part of buildTree(). That makes it
impossible to combine buildTree with manual tree setup.

Change-Id: If0a0d9432fe39870917a6ba31594e8dcd6d31868
Reviewed-by: hjk <hjk@qt.io>
 2017-02-24 08:40:04 +00:00
Orgad Shaneh
919ba9a925 Dumper: QJsonValue of String has no children 
Change-Id: Ic6731ca6e7fe45792688623bffbbe0d9005bd1a8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-24 07:41:19 +00:00
Christian Stenger
2e7e95917e Squish: Remove unused object 
Forgotten to remove this in e03132f517.

Change-Id: I7699c657d0ff8300ac38d96a9430d8c1e372628f
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-24 06:28:42 +00:00
Christian Stenger
ed67e7121b Squish: Fix tst_session_handling 
Adapt to changed UI and Welcome page.

Change-Id: I413835926411687d6161026da42be97b2b6a41c3
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
 2017-02-24 06:27:55 +00:00
Lorenz Haas
f04c535ad2 Beautifier: Get rid of QRegExp 
Change-Id: If3f7e6d93ef1f0b6920f0958f1e2eb00c37462bf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2017-02-23 21:42:45 +00:00
Orgad Shaneh
037a96aefd Gerrit: Minor cleanup in GerritModel 
Simplify argument list handling

Change-Id: I4d3b676f3de0b0b1ba54edae3cd8a27e9069493a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-02-23 21:12:19 +00:00
Orgad Shaneh
7a3b216961 Gerrit: Minor de-noise 
Change-Id: I5ed6fcd8f74b982a7b17d924234bffe7c1a8019b
Reviewed-by: André Hartmann <aha_1980@gmx.de>
 2017-02-23 21:06:24 +00:00
hjk
70a7f80dba Nim: Adapt file collecting code to new infrastructure 
Change-Id: Iaeb931cb93a6020ef40f071fe1b3b51d411d2790
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: hjk <hjk@qt.io>
 2017-02-23 15:39:15 +00:00
hjk
fd5e0a1486 ProjectExplorer: Remove Node::asSessionNode() 
The only remaining uses could be removed or replaced by a
check for no parent node.

Change-Id: I13eba8ae418cf3d404bb3df7d389d72091af38d7
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 15:21:18 +00:00
hjk
4f47a8d745 ProjectExplorer: Remove FolderNode::projectNodes() 
Merged into the using code now.

Change-Id: I4b39998799dde530ab48c504ac2a389d72705c4f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 15:21:11 +00:00
Nikolai Kosjar
fe27f947b9 C++: Avoid inline namespaces in generated code 
Task-number: QTCREATORBUG-16086
Change-Id: Ic2f3fd38ae6cc93725bc214c24320f40a0a519a8
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-02-23 14:49:31 +00:00
Orgad Shaneh
151ae22bb9 Git: Fix "additional tools" path with "Git for Windows" 
They're in usr/bin now.

Change-Id: I5efe5f7fcaf1f74393624b9bb8dd0ab3f0075d3e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 13:07:08 +00:00
Orgad Shaneh
351f6b8f11 Gerrit: Improve default SSH lookup 
* Append exe suffix
* Detect also if not found (for example, when upgrading from msysGit to
  Git for Windows).

Change-Id: I9c47f0f4e54e957e21e224f100c2959dc1884ec2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 13:06:11 +00:00
Orgad Shaneh
f3f5a16f27 Gerrit: Fix initial refresh 
when the fallback host matches the remote.

Change-Id: I2c630739db4b698acdcf51f6b663070cfd5ecc4d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 12:15:26 +00:00
Orgad Shaneh
da3f9379c1 Gerrit: Improve server encapsulation 
Change-Id: If78fa05e0b328a86e699ba79673999650b05a7ef
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 12:14:57 +00:00
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
Christian Stenger
ce69c5da15 Scripts: Make dependencyinfo script working again 
Due to the change of using json based plugin information instead
of xml based (pluginspec) this script became disfunctional long
time ago.. Adapt the script to use the json information generated
while building QC.
This script is still intended to find unused or unlisted
dependecies of plugins.

Prerequisites: Linux platform
Usage (just as before): inside the build directory of QC just run
the script directly or pass it to the Python interpreter.
(still limited to Python 2.x with x>=7)

Change-Id: I92b48327944df1239e9fac7fbd8ed1bee4fefa61
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2017-02-23 10:43:29 +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
4eb75f57a5 Increase year in copyright_template.txt 
Change-Id: I1616c8e843c6821dafce9a8cbb4be3a56a5c7c5a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2017-02-23 09:40:50 +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
David Schulz
9c2e45aa3c Debugger: Use listTemplateParameters from DumperBase 
This will utilize the lazy lookup of template parameter types.

Change-Id: Id91ccaba7911e8769f42ec0c65a60f93558be1a2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
 2017-02-23 08:40:26 +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
Thomas Hartmann
ef50012e31 QmlDesigner: Add specifics for Popups 
Change-Id: I7fa3e606bec17e1b5cfc6cd002515a1704083fef
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
 2017-02-22 13:20:50 +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
Thomas Hartmann
d69ebea479 QmlDesigner: Adding MarginSection 
Will be used for Popup.

Change-Id: Ie584f42c193843ab83866b137ae6e3ad0cad94c7
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
 2017-02-22 13:17:43 +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