Commit Graph

54723 Commits

Author SHA1 Message Date
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
Tim Jenssen
5667fdc46a QmlDesigner: introduce SwitchSplitTabWidget as center widget
Change-Id: I2ab91c3a6c68bb64c6875c37fa6fe2b4abc8b82d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-22 10:12:59 +00:00
hjk
7f597151db QbsProjectManager: Identify product nodes properly
Change-Id: I6922e2fb72c693be931fefb57f9686b727ad5bb1
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-22 10:11:46 +00:00
hjk
0073decb92 Give some reasons if plugins will not be compiled
Change-Id: Ibf667f9c7606e167856fff5ceff3f3724292becf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-22 09:37:26 +00:00
hjk
bce765aaa9 Make Creator compile without QtQuick module being present
This is an unsupported configuration for testing only.

Change-Id: Idf5dde8210e0599806a3374a964adfd192b60149
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-22 09:37:17 +00:00
hjk
eb579dec4f Debugger: Avoid some signed/unsigned warning
Change-Id: Ie61b0b33a912591927db7f3173f50ee100d52faf
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-22 09:37:06 +00:00
hjk
e069d2f9ce RemoteLinux: Add a few 'override'
Change-Id: Icd1cbb3adaf197c0e4e1fdb4367d85e457812410
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-22 08:55:54 +00:00
Leena Miettinen
2611002463 Doc: Remove link to removed tutorial
Change-Id: Icfc111addf4e9e69d29325275ef997a7f923b1ca
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-22 08:49:01 +00:00
Leena Miettinen
0ae475f03b Doc: Clean up links to previous pages
Change-Id: I4352760bfce5637905c432a90f77242d4ad4a668
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-22 08:47:14 +00:00
Leena Miettinen
cb8753d093 Doc: Clean up the TOC
Some titles changed, but were not fixed in the TOC.

Change-Id: I2e031e4ac89ea34ee8f385cffadf9cb880db7ce0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-22 08:42:59 +00:00
Tim Jenssen
7a73988c3a QmlDesigner: add widget method to viewManager
Change-Id: I468bd7e33b42c50bbb4dbe0d857b657fa207f0a6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-22 08:29:52 +00:00
Tim Jenssen
dff1f7442c QmlDesigner: add setFocusProxy(textEditor)
Change-Id: I8aa0f0b2feef6f70a96fb21fd21fb8980d22604d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-22 08:29:41 +00:00
Leena Miettinen
ffeddec94e Doc: Fix menu item name
This was changed back in the UI, because Stacked Container
is reserved for Stack Layout actions.

Change-Id: Id9fdf3ee6e36bdaa9afde492cfd60074d56da041
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 15:45:31 +00:00
Ulf Hermann
39459f98e8 QmlProfiler: Optimize flame graph model
foreach() is slow in hot loops like these. Also, by moving frequently
used children to the front we reduce the effort to find them in
further iterations.

Change-Id: Ib5dceb82511fdd1cb59c50e1ab2485f5035fbef8
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2017-02-21 15:16:18 +00:00
Thomas Hartmann
7e8591c017 QmlDesigner: Fix wrong display name
This is another category with another name.

Task-number: QTCREATORBUG-17768
Change-Id: I08701a33a768651cfba84d9869836a4bbbd1442e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-02-21 15:03:00 +00:00
Nikolai Kosjar
d201571a2d {Auto,Generic}Project: Fix setting ProjectPart::displayName
Before

    commit 8c90998fff
    CppTools/ProjectManagers: Reduce ui blocking when loading projects

the displayName was set in the ProjectPartBuilder constructor. Now this
needs to be done explicitly.

Change-Id: I67655a3a5b8052344084e467bb08efd07ab86ab4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 14:40:13 +00:00
hjk
b99059bfd6 Debugger: Run fresh expression evaluator also in combined debugging
doUpdateLocals() was called, but not re-implemented in the
combined case.

Task-number: QTCREATORBUG-17763
Change-Id: Id8c17ce0bda79cd61c57624aea5a05e4aad96c79
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 14:28:36 +00:00
Leena Miettinen
5c8b6f8a08 Doc: Use "build for", not "build on", because it is misleading
Change-Id: I78e00bda752780c238f46d58f1821c7d7d616436
Reviewed-by: hjk <hjk@qt.io>
2017-02-21 14:05:08 +00:00
Leena Miettinen
fb9cbc2edd Doc: Describe selecting the build system in project wizards
Change-Id: I853676d922ee688385cecb1e498bc4ea2c66fc04
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-21 13:52:22 +00:00
Leena Miettinen
20a16ef91c Doc: Move Qbs information into the generic sections
Describe build settings for all build systems in the generic topics
(using .qdocinc files) and keep only configuration in the Qbs specific
topic.

Change-Id: I80ff4cd2fc18339f9c07b0a0cb09bda86e8b61cd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-21 13:51:24 +00:00
Leena Miettinen
fd54b5bbaf Doc: Move CMake information into the generic sections
Describe build, run, and deployment settings for all build systems
in the generic topics (using .qdocinc files) and keep only configuration
in the CMake specific topic.

Change-Id: I334d7488b32aba90ee1e4ca898a65438b9d304a4
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-21 13:50:43 +00:00
Montel Laurent
06d62e36f3 Avoid to create empty code style name
Change-Id: I6f81aebecdb137c79d8a0a3c7d429f46672c24a6
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-02-21 13:20:32 +00:00
hjk
a4c0712cb2 Debugger: Add a message when trying to evaluate a bad expression
Change-Id: Id10f11876e9b6c852a04add6bd75aec7e8337891
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 12:26:27 +00:00
Montel Laurent
58282bdab3 Allow to translate checkbox text
Change-Id: Ib1fdf79293f094015655bb6fb2798c780513a846
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:59:29 +00:00
Nikolai Kosjar
0c0b004493 CppTools: Fix setting ProjectPart::project
This was forgotten in

  commit 8c90998fff
  CppTools/ProjectManagers: Reduce ui blocking when loading projects

Change-Id: I5c3a8a4015dd3b4389a21a80367a9eac7ebd95fd
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 11:45:00 +00:00
hjk
9c211ab424 Debugger: Record breakpoint hit count
Looks like the field was spelt 'times', not 'hitcount'.

Change-Id: I7226747ba7d41e9600cb66e95e7c59c6a226151b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 11:44:05 +00:00
Leena Miettinen
431dd18bc5 Doc: Describe managing stacked containers
Change-Id: Iee2c24067928e20abbaee3e8b3eff2b2106ba384
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:47 +00:00
Leena Miettinen
4fb3cd36eb Doc: Describe Edit Color context menu command in Qt Quick Designer
Change-Id: Icd792f3de1872e6d3f1fe50608b2f81189174bb5
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:32 +00:00
Leena Miettinen
97d517b116 Doc: Edit info about managing states in Qt Quick Designer
- Describe expanding the State pane.
- The empty slot has been replaced with a + button.
- Do not call the circle menu a "context menu", because there
  is a separate context menu.

Change-Id: I4bc689fd6490bc171891135b2c9f5bd67f9931ba
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:21 +00:00
Leena Miettinen
b1a7731c46 Doc: Describe the qsTranslate() option (Qt Quick Designer)
Change-Id: I7033f683f86157830addf1b403baab0379f631c7
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-02-21 11:36:05 +00:00
hjk
1336826460 Debugger: Make "Add Expression Evaluator" available in QmlJS editor
Task-number: QTCREATORBUG-17754
Change-Id: I249e904634edbfd30bd11a4402470c3d5586478c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 11:20:09 +00:00
Robert Loehning
062678a937 Squish: Add some debug logging to openDocument()
Change-Id: If34eaad1bd04a7d2409f0e00c217c7bd12add106
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-21 10:49:37 +00:00
Ulf Hermann
9f0a51a0d1 QmlProfiler: Change total time and recursion display in statistics
The total time taken for a program should be the sum of durations of
events on the bottom of the stack. This is also what the flame graph
model does, and it results in useful percentages for total and self
times.

Recursion still has to be accounted for when showing the total time of
a specific event type, but we mark events with recursive calls and
show the time and percentage of recursion in the tooltip. As we already
showed binding loops on bindings and signal handlers before, this
integrates nicely.

Change-Id: Id4654e314bf86ce8bd06ceaaf93a67187c629adc
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-21 10:43:53 +00:00
Ulf Hermann
548a86f577 QmlProfiler: Add text marks for QML/JS types into documents
The text marks are little labels next to the lines in the editor
that tell you how much of total run time was spent in the
respective QML/JS construct during the last profiling session.
This is similar to what the valgrind profiler does.

We add the text marks only when the documents are loaded into an
editor. This keeps the number of text marks manageable. Multiple
events on a single line are shown using a tooltip.

Task-number: QTCREATORBUG-17757
Change-Id: Ie38b8ab880a718a1ef72ef343d84070ab34bc5bc
Reviewed-by: hjk <hjk@qt.io>
2017-02-21 10:43:47 +00:00
Montel Laurent
8d7feb4bc7 Delete dialogbox => avoid memory leak
Change-Id: I0f6eba4366f7760bfafd201e6ac22b23b11ce61c
Reviewed-by: hjk <hjk@qt.io>
2017-02-21 10:19:55 +00:00