Commit Graph

57165 Commits

Author SHA1 Message Date
Andre Hartmann
d7a0750a7f OutputParserTester: Modernize
Change-Id: Ifa8cd265d32f7fb9f875ede2b05ffb3616fcca62
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-06-15 05:59:14 +00:00
Andre Hartmann
3b9dfa2b96 CustomParser: Remove upgrade path for legacy settings
... after converting the enum-based parser selection to
a string-based system. The upgrade path has been available
for four major Creator versions.

Introduced by 2ff642d8e4

Change-Id: I0c7ef9794f56d9a1a663cc4bd4a7eeacf3847834
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-06-14 17:53:57 +00:00
Andre Hartmann
10b5e8dc52 BuildOutputParser: Make MSVC parser available on non-Windows platforms
Change-Id: If48e4fa361f3c306edf5dbfa129cc8a2e38abf53
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-06-14 17:53:41 +00:00
Tobias Hunger
28a1ef8bab Project: Fix setActiveTarget()
Allow setting to nullptr if no target is available.

Change-Id: Id51a176185eeaa31fef827d9ca722da9e62b9232
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-14 14:32:16 +00:00
Eike Ziller
cd7aafef50 Do not leak menus in watch model / debugger
QMenu::addMenu does not take ownership, and QMenu::popup doesn't delete
the menu either.

Change-Id: Ia11170db6538c1019d06b3fd84bb79b1241b0b9d
Reviewed-by: hjk <hjk@qt.io>
2018-06-14 13:05:19 +00:00
Eike Ziller
69d7b72837 Rename to 4.7.0-beta2
Change-Id: I6f5a5eb2dc9f12691e14ff4dac3da5aa732d96ab
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-14 11:08:15 +00:00
Eike Ziller
74eef6d908 Fix painting of clear buttons in history completer popup
We did set our own delegate, but QCompleter overrode that with its own
when setting the popup widget. So we have to override it after setting
the popup widget.
Also fix the icon painting on HiDPI screens.

Task-number: QTCREATORBUG-16037
Change-Id: Ibd06e945c75f2bceb02c0b5a23a9810d83b4b5e1
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-06-14 09:56:12 +00:00
Ulf Hermann
451e437afd Debugger: Use FileInProjectFinder for the console view
All the functionality to guess local files from remote paths is already
there.

Change-Id: I5bffeb0f126efef99edbaf152e1a5e9e1d244699
Task-number: QTCREATORBUG-12008
Reviewed-by: hjk <hjk@qt.io>
2018-06-14 08:18:56 +00:00
Filipe Azevedo
bf7e749099 Make it possible to request authentication
This still require each backends to connect to the signal and pass
their host url like this:
connect(this, &NetworkProtocol::authenticationRequired,
        this, [this](QNetworkReply *reply,
                     QAuthenticator *authenticator) {
            requestAuthentication(QUrl(QString::fromLatin1(PASTEBIN_BASE)),
                                  reply, authenticator);
});

Change-Id: Ia07e74f390b13f39c4f50c7514af03e9a39ac168
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-14 07:47:22 +00:00
Christian Stenger
cf030c7104 CPaster: Let cpaster finish on console
If cpaster is used from command line and KDE
paster is used as protocol we have no appropriate
way to specify the credentials yet.
Emit a signal to avoid letting the application
wait infinitely.

Change-Id: I7895d5211f1573fae0f69d2ea76532dec53b8d98
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: hjk <hjk@qt.io>
2018-06-14 07:20:32 +00:00
Christian Stenger
a8e5b9e509 QmlProfiler: Fix unit test execution
Adjust to changed message - otherwise we get millions
of fails on macOS. Amends 0f2febd784.

Change-Id: If9a4c453ae952e708c873c4b11f550aa6632bbd5
Reviewed-by: hjk <hjk@qt.io>
2018-06-14 06:30:10 +00:00
Christian Stenger
b870f01d11 Valgrind: Heob: Make heob support translatable
Task-number: QTCREATORBUG-19830
Change-Id: I0c9799d9b3f8b56d96e78bf48fe32b9a3c4591eb
Reviewed-by: hjk <hjk@qt.io>
2018-06-14 06:30:01 +00:00
Daniel Trevitz
ca2b9672db Support multiple clang installs
On debian testing it is easy to have version 3 to 6 installed
simultanouesly. Using llvm-config will fail to detect the desired
version. If available use llvm-config-6.0 instead of llvm-config.

Task-number: QTCREATORBUG-20525
Change-Id: I91d08674cf0d85555b8fc2ba14014e39e769b9bb
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-13 12:44:36 +00:00
Eike Ziller
a63a024b8a MimeDatabase: Don't pollute global namespace
Task-number: QTCREATORBUG-16119
Change-Id: If234669adf19ccf84b76b99c1a71574f3859eaf1
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-13 12:30:58 +00:00
Tobias Hunger
38a3839a10 ProjectExplorer: Hide invalid kits from Project Mode
Hide the build/runconfigurations of invalid kits in Project mode.

This keeps the custom information around for the time being, and also
provides for a nicer UI than what we had before.

Change-Id: Id43e6be8b964665bcbc8b2e3e4be9c41cc52c92c
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2018-06-13 12:21:59 +00:00
hjk
2093781f3a Android: Remove code to help with upgrades from Qt 5.1
Change-Id: Id9cf0cd585ebdaabc03ff58ab04e7c12a5af39ba
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-13 12:06:37 +00:00
hjk
a114a5e47e QmakeAndroid: Use build-system agnostic signals for updates
... of AndroidExtraLibraryListModel.

Change-Id: I3b1842fd38d64b3135689f060fb66b944a12d1ae
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-13 11:32:19 +00:00
hjk
eb2e673832 QmakeAndroid: Inline QmakeAndroidBuildApkWidget
To avoid name clashes in the AndroidBuildApkWidget area in
preperation of moving more build-system agnostic code over to
the Android

Change-Id: I259bb8b57f96ca87c22373f8ca23ad2586f64a16
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-13 11:25:27 +00:00
Alessandro Portale
6c8e47deeb Debugger: Remove Qt 4 specific code path in ConsoleView
Qt 5 does not come with plastique or cleanlook styles.

Change-Id: I716303b3344504f8f19c31b29bd7530ccc0c2e39
Reviewed-by: hjk <hjk@qt.io>
2018-06-13 11:25:15 +00:00
hjk
b774dff4e8 QmakeAndroid: Move some build-system agnostic items to Android base
Change-Id: I0f258ee5e4afcb3abc7c2bbbaa612b1912a8d2b9
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-13 11:23:59 +00:00
hjk
e78d5bf28f QmakeAndroid: Consolidate access to build system specific target info
Some build system specific stanzas were repeating.

Change-Id: Icfcd89f9e58e4c415322d07a6102a39798f6ab00
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-13 11:22:30 +00:00
Ivan Donchevskii
14d585f105 Clang: Restore custom settings for Clang-Tidy and Clazy run
If the last run used global settings do not forget
the custom configuration.

Change-Id: Ie8e0eefb18eed60fd5f6bf07392e5a0d1474c549
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-13 10:43:07 +00:00
Eike Ziller
29dd67f45e Don't select file extension when renaming resource files
Resource files would not get the handling like files do, because they
are folder nodes.
For folders, if they provide the rename functionality at all, the file
extension can have similar influence on the type of folder like it does
for files (e.g. ".app", ".framework"), so just remove that restriction.

Task-number: QTCREATORBUG-20057
Change-Id: I3802f17695da9d323d4d60c14ecef5c39aeef576
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-13 10:39:20 +00:00
hjk
3000e7a42a QmakeAndroid: Slim down some code
QmakeAndroidBuildApkStep::proFilePathForInputFile() did not do anything
depending on the build step at all, so move it to its user.

Also use (soft) asserts instead of plain if + comment.

Change-Id: I263ed8ec6e61c72a125c2202e06bfd3b2cf3cb56
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-13 10:21:52 +00:00
Orgad Shaneh
77941ef9b3 Qmake: Fix redundant qmake execution for sub-project build
When building a sub-project using the context menu -> Build, qmake was
executed every time, because the pro file in the Makefile was compared
against the root project instead of the sub-project.

Change-Id: Id76d7d23e3fa9a8e4c5c10cd10adcc945ff3b186
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-13 10:11:30 +00:00
Orgad Shaneh
fe525d2b86 AppOutputPane: Add timestamps to normal and error messages
Similar to BuildManager::addToOutputWindow.

This doesn't affect stdout/stderr output.

Change-Id: Iddee043aa46cc89860b4a2231fe075cb553b5ad3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-13 10:10:57 +00:00
Tobias Hunger
34b205ed22 ProjectExplorer: Fix some corner cases in signal subscriptions
Handle cases where targets/projects are removed and then added again.

This is currently not done anywhere, but there should not be nasty
surprises when somebody decides to do that later.

Change-Id: I47f9b4a1577f2021bcee87ccdd5435e3628b2a95
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-13 10:09:23 +00:00
Nikolai Kosjar
92230d57d6 Clang: Ensure using correct translation unit flags for clang >= 7.0
...otherwise things will get slower.

Change-Id: Ifc01c31a2bb50a277a38ede5dbe58583d15010f5
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-13 09:57:11 +00:00
Nikolai Kosjar
bcd1158b33 Clang: Check consistently for clang 7.0
Change-Id: I8abccb7ce2bd73ce4c991b2a5062f459513ea624
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-13 09:57:02 +00:00
Nikolai Kosjar
8dacae8eb5 Clang: Fix showing option in tooltip for diagnostic from clang itself
Change-Id: I84972c7b206741e9040e4654e6bc031251aa478c
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-13 08:33:31 +00:00
Filipe Azevedo
acb9a1b694 Enable GUI paster in Qbs builds
This is unconditionally enabled in qmake builds already.

Change-Id: Id80656f4889b7df33c83e9fab2f8ef87f9de7dc6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-13 07:52:33 +00:00
Leena Miettinen
0f2febd784 QML Profiler: Fix punctuation in messages
Change-Id: Iebe1bb75a47d2aff7b5e92a6d6890ebe758c771b
Reviewed-by: hjk <hjk@qt.io>
2018-06-13 07:13:19 +00:00
Orgad Shaneh
18edce07aa UnitTest: Fix build
This amends commit c62daf9cda.

Change-Id: Ia1d574f788f97a3d0bb3a7c6724659c2875e2c81
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-12 05:42:19 +00:00
Eike Ziller
9b43b55dc0 Merge remote-tracking branch 'origin/4.7'
Change-Id: I762dbddb0f337e9a5fc4b113c7876813e9f45c9c
2018-06-11 16:01:18 +02:00
Eike Ziller
4cba1d7c71 Merge remote-tracking branch 'origin/4.6' into 4.7
Change-Id: I5ffa9febea2ced10892a145aa0b930d45d84aea5
2018-06-11 14:31:54 +02:00
Orgad Shaneh
c62daf9cda CppTools: Do not use -isystem for header paths in the repository
Clang uses mmap for system headers. This locks the header files on Windows.

If the project file is not in the root directory of the repository, and it
uses header files that are outside its directory, but in the repository,
Git operations like checkout, rebase etc. can fail because the header files
are locked.

Change-Id: If8a258234479fc70ca0a8384bf24c68d767dbeaa
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-11 11:38:10 +00:00
Christian Stenger
cab82a94c7 Clang: Fix accessing nullptr
Change-Id: I204ff9263520dee70a89adf99182d198e4dd1036
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-11 09:55:33 +00:00
Leena Miettinen
a9b0fa026f Android: Fix messages
Change-Id: If1af26c7c5762b14887787a30cd7dc37d44f9950
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-11 05:19:56 +00:00
Hannes Domani
168e89e0a2 CppTools: Fix memory leak of QFutureWatcher when canceled
Change-Id: Ia9cd428e3bed193167903b6ffa080e4886193789
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-08 15:48:21 +00:00
Christian Kandeler
22dfd2c3c8 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: If660a6c249cd9fb231f3cdd6df505426443bbbdb
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-06-08 13:10:47 +00:00
Leena Miettinen
7a4da1fd63 Remote Linux: Fix capitalization of UI text
Change-Id: I1204bcba7748216bf5b0d5ba9853871b10821720
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-08 12:44:33 +00:00
Leena Miettinen
1067c2ed05 Core: Write MIME type in all caps in UI text
Change-Id: I8ba8448f3b38bd46353bb31d4e2c64e96827e997
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-06-08 12:44:12 +00:00
Leena Miettinen
b85905ca5f Projects: Fix capitalization in messages
Change-Id: I1928fe11a3a23c0577ecc941d259d310a211e86f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 12:43:57 +00:00
Leena Miettinen
791b81ab4f Qt Quick Designer: Write "file name" as two words
Change-Id: I153e625e8d3289630ecf46cf27dc0eb4acea8552
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-06-08 12:21:33 +00:00
Christian Stenger
aaf13b3c2b GlslEditor: Fix crash in function hint proposal
The function hint proposal gets filled with pointers
it does not own. It does not notice when these pointers
will get deleted or modified, but as long the
hint is displayed it tries to access them.
If the document gets modified and the gls parser tries
to update the document's AST these pointers might vanish.
Only use the needed information on the proposal's side
to avoid null pointer access.

Trade off: updating the proposal hint of declarations
           and definitions when document changes does
           not work on the fly

Task-number: QTCREATORBUG-20570
Change-Id: I20253e92e1ca9822b1fc1f327c5c5e16b4fd91be
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2018-06-08 10:52:24 +00:00
Robert Loehning
2d7d0abd2d Help: Make "System Information" a QDialog again
Making it a QWindow meant that Alt-Tab will lead to the main window and
right back to "System Information" because this is modal. This
incovenience outweighs the convenience of having a "Maximize" button.

This reverts a part of 40d7399755

Task-number: QTCREATORBUG-20513
Change-Id: Idcea54ee2f60f9f7efde7d25ce0c305b87f445dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-08 10:46:06 +00:00
Kimmo Linnavuo
5f9fa64d2b AutoTest: Export some classes
Change-Id: Ia7ae1879b99329f2d308f4264d133d8b64544243
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-08 10:07:31 +00:00
Christian Stenger
07ccefc1bd ModelEditor: Avoid accessing nullptr
When triggering the context menu on the navigation treeview and
having a model editor open QC might not find a node at all.

Task-number: QTCREATORBUG-20559
Change-Id: I71bc3e7c3f405460dd2af0a2b0cc7f1e6d3b68b6
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 09:23:15 +00:00
Orgad Shaneh
21c9740089 Qmake: Expand user arguments when comparing them to the Makefile
If the user used a macro, the Makefile will never match it, and qmake will
be executed on each build.

Change-Id: I2790db3a788ea7971145b475781a6193a1ed0842
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-08 09:21:23 +00:00
Marco Benelli
50f536b9ae QmlJs: check markers before cleaning them
Task-number: QTCREATORBUG-20197
Change-Id: If4594a72abf4acf2455e55688679ba7f78900f76
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2018-06-08 09:02:21 +00:00