Commit Graph

57165 Commits

Author SHA1 Message Date
Christian Stenger
cd45ce5f39 Squish: Remove Qt4 from expected kits for widget application wizard
Change-Id: I747b47a5adb684f9ef3c245427707ead9ffba20a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-26 14:21:19 +00:00
Christian Stenger
922c73ad67 Squish: Add VS2017 as expected compiler on Windows
Change-Id: If68d6a143f4c1f9b96fe7c561977ab481a31ecb4
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-26 13:20:37 +00:00
Tobias Hunger
282cd88063 ProjectExplorer: Load extra ABI OS flavors from file
Change-Id: I8c25eaa7d765364ba1dad2cd0fba33f8b5687a9c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-26 10:56:28 +00:00
Alessandro Portale
4b13170565 qmljs: Use C++11’s override and remove virtual where applicable
Fixes warning: prefer using 'override' or (rarely) 'final' instead of
'virtual' [modernize-use-override]

Change-Id: I17955fd0fdb052678228f1bda32cd8d3b4298998
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-06-26 10:38:38 +00:00
Orgad Shaneh
64b8f98a35 FancyTabWidget: Set focus on widget change
If the locator popup is open, and the user changes mode using the keyboard
(Ctrl+num), the popup was not closed.

Change-Id: I7d5cb93229715dd293b6eb4d36cf2a9cb4467123
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-26 08:52:37 +00:00
Tobias Hunger
527484bba9 QtVersion: Allow to override ABIs via SDKtool
Allow for overriding the ABIs detected for a Qt version from the
sdktool.

Leave the default at "auto-detect ABI".

Change-Id: Ibe2625b0a321a9541512d36a91aa2e42611a959b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-26 08:19:33 +00:00
Tobias Hunger
7799f7fa21 SDKtool: Add new addAbiFlavor operation
Add a new addAbiFlavor operation to register extra ABI flavors to
load during startup of Qt Creator.

Change-Id: I3fd2bc791e2c9bfa267f832c423b8fd9cecf51b9
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-26 08:19:25 +00:00
Orgad Shaneh
5b95d91294 TextEditor: Fix crash
Happens when closing an editor while tooltip processing is in progress.

Change-Id: I023f62ab6ba1e8b1bbe207da08c1e526fb99430a
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-26 08:05:26 +00:00
Eike Ziller
629b5abd7e Bump to 4.7-rc1
Change-Id: I071ef81b3285102eeedba7d475aabfda762926d3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-26 05:16:35 +00:00
Christian Stenger
7ed1ca0fac AutoTest: Fix finding corresponding item for data tags
Change-Id: I95518b69f0a60206a45318586d7ba033d101d1d6
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-26 04:59:01 +00:00
Leena Miettinen
e2e55a2f88 Doc: Replace "Qt Quick Designer" with "Design mode" or \QMLD
To make source text usable also for Qt Design Studio manual.

Change-Id: I7a5090ea2308a3091c34193cce3a8b57da1eb498
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-06-25 15:48:15 +00:00
Leena Miettinen
ef40f8445e Doc: Make info about managing projects more generic
The details are described in the listed topics.

Change-Id: I243eb8dc102ef42030a1a2e1b28af2679e6ca631
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-25 13:50:00 +00:00
hjk
e8ce8e3e5f Debugger: Allow stack layout to be shown in a memory view
... as opposed to an editor (only)

Change-Id: Ideb176b961afef8674a7597f1b18a90c48e5e9f8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-25 13:44:40 +00:00
Tobias Hunger
f7163a1e8a SDKtool: Modernize a bit
Change-Id: Ia78421a9a9557efda76a37aeb551b0a9aea845ba
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-25 13:25:31 +00:00
hjk
b0e31ddf43 Debugger: Make "Memory Editor Showing Stack Layout" easier accessible
The restriction to a local active item is not needed, as the whole
submenu will be deactivated when the debugger is not debugging.

Change-Id: I36f5098d549dcb72f474caad8cfd13a6aa961212
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-25 09:33:35 +00:00
Eike Ziller
1bbe92df49 Merge "Merge remote-tracking branch 'origin/4.7'" 2018-06-25 09:20:26 +00:00
hjk
a2798bc2fc Debugger: Add a menu separator between memory views and editors
Change-Id: Ie642bab6fb8a34f6f9d071a22a264641601ca08c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-06-25 09:16:12 +00:00
Eike Ziller
997f7166fd Merge remote-tracking branch 'origin/4.7'
Change-Id: Ifec1f8dc20a18f432ec6ccf68153f31fff3f8b29
2018-06-25 11:07:03 +02:00
Christian Stenger
77c260e14c Wizard: Ensure compilable widget application template
The used template code is nowadays C++11 specific and this
is not default before Qt5.6. Explicitly enable C++11 to
make the generated project compile out of the box for all
Qt5 versions.

Change-Id: I720126b13bfc0d3da960438df1a1106c5574053f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-25 08:56:11 +00:00
Eike Ziller
a7871ada78 Remove mostly useless function parameter
for getting only the best matching editor factory. Almost all code that
uses it wants the whole list, the mime type settings will want the whole
list soon, which leaves just the file properties dialog, which can
simply fetch the whole list and show only the top entry.

Change-Id: Ia49f7a4b52a35c6140eeba19424386c18cb3ec59
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-25 08:08:33 +00:00
Eike Ziller
8cbe9db185 Mime settings: Avoid work at creation time
We do not need to collect all the editor factory information on all mime
types at creation time of the model. Do it on request.

Change-Id: I52e81a5f7949a69d96f0d3f1a5dfbe64b91977ad
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-25 08:08:22 +00:00
Eike Ziller
a8c5af56a9 Remove unneeded checks for validity of mime types
mimeTypeForFile(...) is documented to never return an invalid mime type
(it will fall back to binary if everything else fails), so remove
unneeded checks.

This also removes fallback code that used text/plain in case of invalid
mime type, which is probably a relict from the old mime implementation.

Change-Id: I88ed41fa3b81704f110f9f481b0f01424a487cbb
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-25 08:08:14 +00:00
Eike Ziller
e00218b997 Fix large text file detection
Text files don't start with "text" (and non-text files might), so check
for mime type inheritence of "text/plain" instead.

Change-Id: Ia9b7a2e68d43adbb8741dcd9d3ba9b2936a680de
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-25 08:08:00 +00:00
Eike Ziller
c4fb356772 Do not show external editors in mime settings
External editors are never used to open files, except on explicit
request with "Open with", so should not be considered in the settings'
"Handler" column

Change-Id: I8fe7b9d260754ce84d52db554d6ee25d1af3bfe2
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-25 08:07:54 +00:00
Eike Ziller
96b214eb40 Move code for finding editor factories out of editor manager
And move it into IExternalEditor / IEditorFactory

Change-Id: I4505824e44571a4c6f26d0192edf3929c2a00fb7
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-25 08:07:47 +00:00
hjk
8ea32d4051 ProjectWelcomePage: Do not open project on right click
And neither sessions; in that case pop up the mini menu, too.

Change-Id: Iea5ed023ab477f4f1e526aa36f9b27f42881b052
Task-number: QTCREATORBUG-20487
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-25 07:59:18 +00:00
Razi Alavizadeh
f009d5f151 CorePlugin: Switch split if remote command tries to open an already opened file
It seems more natural that remote commands
don't change current editor of active view if file
is already opened in another view.

Change-Id: Ie27de0d159cae6e63fa1d477fab59887a0e6d198
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-22 18:04:54 +00:00
Christian Stenger
1a6522b47c Wizards: Drop support for Qt4 for widgets application
Generated code uses some C++11 features which cannot
get easily enabled when using Qt4.
Instead of adding several lines for correctly handling
this on all platforms just drop the wizard support.

Change-Id: If0e748283cfdddbefd3c27e3c9f4316c0ce7efe3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-06-22 16:39:33 +00:00
Tobias Hunger
ffc651d54e BaseQtVersion: Modernize code
Use member initialization, remove lots of duplication in the different
constructors.

This adds a wrapper around the unique_ptr of the MacroExpander to enable
use of the default copy constructor, which would be blocked by the deleted
copy constructor of unique_ptr otherwise.

Change-Id: I8bad5cedb71069b3d535436b89057f68319367ea
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-22 14:25:30 +00:00
hjk
1058e21d02 Android: Merge {Qmake,}AndroidSupport::androiddeployqtPath
... into its only user, in the build-system agnostic base.

Change-Id: I1fe312125a32e3150e4f3183470df716896e55c4
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-22 12:47:08 +00:00
hjk
d4f5b74df9 Android: Move some generic apk build step code to base
Change-Id: Id11e5d684e2e1003178d06b4421ec34df334fca2
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2018-06-22 12:45:50 +00:00
Christian Stenger
dfdfff2148 Squish: Fix expected string
Capitalization has changed.

Change-Id: Icbfa295beab27c1cfb2ec1ae6198784f134563a6
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2018-06-22 10:50:17 +00:00
Tobias Hunger
172d6184a5 SDKtool: Fix tests
Change-Id: I64e7d415bed1e6cea055d4d80102c8fa98434361
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-22 10:27:39 +00:00
Christian Kandeler
5c30f00ac4 Update qbs submodule
To HEAD of 1.12 branch.

Change-Id: I06eb59ad42b0e4ccbb965558ee895d28edb32a8d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-06-22 08:33:33 +00:00
Christian Kandeler
2f5c3d3cf0 QbsProjectManager: Allow the user to cancel the project resolving phase
Support for this was either forgotten in the initial implementation or
accidentally removed.

Change-Id: I4e35b8063bd0b847459d630e7c8ca0d7b09835aa
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-06-21 13:16:04 +00:00
Ivan Donchevskii
2d97b5950c Clang: Add checkbox for fix-its column header
Make possible to select or deselect all fix-its.

Change-Id: I2ff88afb0c451092752ee2cd7c9f083e24033500
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-06-21 13:10:40 +00:00
Leena Miettinen
a8cbc1c4da Doc: Reflect changes in the names of Clang checks
Update the text and screenshot accordingly.

Change-Id: I0f89d7fc02ab6195cdf9d3e64188f0097688e98b
Reviewed-by: Ivan Donchevskii <ivan.donchevskii@qt.io>
2018-06-21 12:44:13 +00:00
Christian Stenger
10d4792c85 ProjectExplorer: Fix compile for gcc4.9
Change-Id: I60a85f39183cd7855d8aa2093e67dbbe8478a70f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-21 12:03:23 +00:00
Tobias Hunger
55aab0e910 Abi: Allow for user-defined OS flavors
Allow for user-defined OS flavors to be registered by plugins.

Make sure the GenericFlavor and UnknownFlavor are always listed
last to keep the UI happy.

Keep the Abi::OsFlavor enums for compatibility. All of them are
pre-registered in the OSes they were available before.

Task-number: QTCREATORBUG-19899
Change-Id: I9bf6ef8b256cf42abd5fa1fe536cbe5dfadd3dd0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-06-21 11:10:04 +00:00
Christian Stenger
003f2ca5c7 Docs: Fix link target
Change-Id: I6e5f1d6b39682d708bab6c66ff9fd558996e5f1b
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-21 10:43:45 +00:00
Christian Stenger
31050ad6fc AutoTest: Fix detection of Quick tests name
Avoid setting and overwriting the test case name with
any string literal we find inside the TestCase item.
Instead use only the string literal used for the name
property and do not overwrite it after it had been set.

Task-number: QTCREATORBUG-20642
Change-Id: I69aedfc9f51df4943370c4736e6aa2af4c39b697
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-21 10:43:35 +00:00
Christian Stenger
1b6a3fe493 AutoTest: Fix handling of test runs when project changes
If the startup project or the current active target changes
while tests are running strange things can happen as we rely
on these both being unchanged from triggering the run.
Explicitly check for these being unchanged and cancel the
test run if necessary.

Change-Id: I506c7b1c0ca4b6ea31559556f6141fe9276d0ad0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-21 10:24:29 +00:00
Christian Stenger
3568f23e7e AutoTest: Guard against nullptr access
Change-Id: I15e5d769b7a4b30421f52fbbe380ca7f19214b42
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-21 10:24:20 +00:00
Leena Miettinen
2e6177fe86 Doc: Update Performance Analyzer docs
The tool was formerly known as "CPU Usage Analyzer", but can
now be used also for analyzing memory usage on devices.

Change-Id: I8e0c2b76be44340e5511c2cbb85efadb5a2f559d
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-06-21 09:10:40 +00:00
Joerg Bornemann
a073e17612 QmlJs: Make "qbs" an implicit import for qbs files
We want to have qbs syntax highlighting, even if the
    import qbs
statement is missing, because we want to remove the reqirement for it.

Change-Id: I569be825440bc733c3c0fa8e146e785060e08384
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2018-06-21 07:50:49 +00:00
Ivan Donchevskii
50fb1b4972 Fix Qt Creator build with Clang
Change-Id: Id607170961db5b1919b316293a96ae3330216377
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-20 12:56:19 +00:00
Tobias Hunger
2b1fe00dd5 Android: Do not disconnect a signal that was never connected
Change-Id: I5820987f34bfe3227a17257646f6384c32d49044
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-06-20 12:43:41 +00:00
Christian Stenger
3c0f61ef0b AutoTest: Use correct parent for duration results
When using google test the duration results have been
added to the respective test case instead of the test set.
Take test set information into account as well.

Change-Id: Iacc647b9dd75daf197b92f50c704916c116e6977
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-06-20 12:33:02 +00:00
Leena Miettinen
34e803c542 Doc: Fix typo "The the"
Change-Id: Id7dd22d7d3582a453a7ff18a431c31169fba4c69
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-06-20 12:27:01 +00:00
Ulf Hermann
e30837fc1f Add all qbs files to qmake project
Change-Id: I365ece28bdd389d9a8fd9d85243238b901ca29d2
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-06-20 12:19:21 +00:00