Commit Graph

49417 Commits

Author SHA1 Message Date
Tobias Hunger
ebf6acadbc Android: WS-only change
Change-Id: Id34bc1bb8a4d75fe53d10c7bc1ba22b6bd5c2011
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-13 12:36:51 +00:00
Thomas Hartmann
7dc1c39ea0 QmlDesigner: Disable style combobox if config file is missing
Change-Id: I57c0cd0a6b686a6cc79ffff0fa7cf40648cefce8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-13 08:13:59 +00:00
Thomas Hartmann
bcc1b56187 QmlDesigner: Move states view to the bottom
Change-Id: I9c46c41d1ac42377c7b552cb8b518ed277e28a0b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 17:42:31 +00:00
Thomas Hartmann
a3cebc0b87 QmlDesigner: Adding warning if kit for puppet is invalid
Change-Id: I104975e01346d08de07cb00083566c1e79ccd9e3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 17:42:24 +00:00
Thomas Hartmann
ee53ca016c QmlDesigner: Parse style config file in PuppetCreator
Since QT_QUICK_CONTROLS_CONF is not supported for older Qt
version we manually parse the file and set QT_QUICK_CONTROLS_STYLE.

Change-Id: I2f1e4a857adaf80975726af69f136748a3f18930
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 17:42:16 +00:00
Tim Jenssen
b452660d42 QmlDesigner: Implementing action for changing controls 2 styles
This patch implements a combobox that allows to set a
style for Qt Quick Controls 2 and changes the .conf file
accordingly.

Change-Id: Ief33404f3b9eaedc49fec3efefaf7d8d26288287
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 16:42:09 +00:00
Christian Kandeler
182c56b64f Nim: Fix usage of Buildstep::Outputformat
Change-Id: I2b017e6a14509fe61114929c4ac889c032f8c271
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-12 16:20:49 +00:00
Alexandru Croitor
079a5c3cc3 Debugger: Fix type lookup for lldb
In certain cases FindFirstType can fail to find a type due to bugs
in lldb. The workaround consists in using FindTypes, and iterating
over the results to find the searched for type.

Change-Id: I1fee3f774d0cf02842f6b55419142af5e9780992
Reviewed-by: hjk <hjk@qt.io>
2017-01-12 12:48:54 +00:00
Alexandru Croitor
2085dd9e96 Debugger: Fix QFlags dumper to work with lldb
Lldb fails to find types if they are prefixed with enum.
Therefore don't prepend enum when looking up the type
for QFlags.

Change-Id: If2109f68677c1b9ec48a05d61cad2d6590f375dc
Reviewed-by: hjk <hjk@qt.io>
2017-01-12 12:43:33 +00:00
Tobias Hunger
13bede733d QtVersionManager: Use nullptr
Change-Id: Ib660f5a3c612f233013e42194055913a7fd74935
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 10:18:38 +00:00
Ulf Hermann
abc4e96886 Debugger: Don't fetch more data for console after engine shutdown
The engine might not exist anymore.

Change-Id: I7a542de7fb8b160d71a1650d37263e4433f97003
Reviewed-by: hjk <hjk@qt.io>
2017-01-12 10:17:48 +00:00
Eike Ziller
8d08c601d5 Merge remote-tracking branch 'origin/4.2'
Change-Id: If9b3a860d7efb561bb710d49396d6bbe13809aa1
2017-01-12 10:54:48 +01:00
Tobias Hunger
0cdd267260 QtSupport: Use binary string from Qt's libraryLoader to refine ABI
Use binary string from Qt's library loader class to refine ABI if that
is not complete yet. This is necessary to reliably find the compiler
used in static Qt builds on windows (using MSVC compilers). Before we
were able to rely on the mkspec to pick a working compiler, that does no
longer work with Qt 5.8.

Task-number: QTCREATORBUG-17534
Change-Id: I50c428cbaa986a26ba165cff499f9e0be3937ea2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 09:51:51 +00:00
Thomas Hartmann
f94a55ee4e QmlDesigner: Some changes to DesignerActionManager
* Adding ToolBarAction as a new type for pure toolbar action
* Adjusting handling of separators
* Do not show an empty menu. This allows grouping just for the toolbar.

Change-Id: I0ff59473ea5d3a798ec963ac0984f20e7e857c56
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-12 09:42:18 +00:00
Ulf Hermann
dcf19a10c6 Debugger: Shut down QML engine on QmlCppEngine::shutdownEngine()
Otherwise the console's script evaluator is not removed.

Change-Id: I0092e8571d6d44b208167a7bf6bc2a929055e09c
Reviewed-by: hjk <hjk@qt.io>
2017-01-12 09:18:17 +00:00
David Schulz
9ef6cb1a34 Debugger: Generate cdb comprehensible qtDeclarativeHookData symbol name
Change-Id: Ibbdd6204b3a8806057fc16de18462c96840e340c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-12 09:07:11 +00:00
David Schulz
ff9366dc51 Debugger: Disable logging debug message by default
Change-Id: Ifb3fd8a6ac17b09ab760da46f555f3345206285a
Reviewed-by: hjk <hjk@qt.io>
2017-01-12 09:07:04 +00:00
David Schulz
0279e1c3a6 Debugger: Add guard to fromNativeValue
Change-Id: I733ad57e562034d7056aa13402cd000a7a1ae8b9
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-12 09:06:56 +00:00
David Schulz
b98825592f Debugger: Restructure cdb python interface
Add C++ classes for value, type and field. Also provide
some macros that generate the C functions for the python
interface.

Change-Id: I717a7988a421bc3e3379e279eda551c349ee4175
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-12 09:06:46 +00:00
Christian Stenger
40174187cb AutoTest: Remove unnecessary indirection when creating test tree items
Change-Id: Id4648196011b6769a2cd51b4daee146068272f00
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-12 05:50:32 +00:00
Eike Ziller
13a22f7ef3 TreeModel: Remove unreachable code
Change-Id: Ic9be1fb41a698d91fa4adc37fa21dd8277180118
Reviewed-by: hjk <hjk@qt.io>
2017-01-11 15:16:27 +00:00
Thomas Hartmann
07911f50bb QmlDesigner: Polish expression editor for when condition
The editor is taking the complete states editor now.
This avoids certain issues with the scrollbar.

Change-Id: Idfa53a4751ccff10449001fd7a47acb4fc2f6fce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 13:51:15 +00:00
Eike Ziller
1c5e771bd7 Help: Fix crash when using drag&drop with bookmarks
On Windows the combination drag&drop, proxy model and header section
resize mode ResizeToContents leads to a crash in Qt.

Task-number: QTCREATORBUG-17547
Change-Id: I3a763c22b83e43d1c1a222cefb4fbbc56b9082c4
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-11 13:46:20 +00:00
Tim Jenssen
f7170e3c53 MSVC: add stderr report from call vcvars.bat
Change-Id: I58e6f877d94dffa4d7a57c3bc289005abf2938bb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-11 12:59:10 +00:00
Tobias Hunger
41c1abab7e MSVC: Improve error handling
By not silently failing when the vcvars.bat file is not found. Instead attempt
to run it and report the error message when it fails.

Change-Id: Ib97dbe17f8fb5529e549ef6c5d132a8571c10c33
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 12:40:53 +00:00
Tobias Hunger
c318f7b2a0 MSVC: Replace while loop with for loop
This is easier to read.

Change-Id: I2c116951fbb232b0d3493fc2190f783081c8f42b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 12:40:36 +00:00
Tobias Hunger
471373d1a7 MSVC: WS only change
Change-Id: I11d72a83b27c03977975c3f74ec57995610ded13
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 12:40:21 +00:00
Tobias Hunger
5c0430bbb7 MSVC: Use more const for method parameters
Make it clearer what can actually change when calling methods.

Change-Id: I801344cfc7b0a85918ef61e19a72eb31ba090736
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 12:40:11 +00:00
BogDan Vatra
3080d0d9e7 Make the output window readonly, but still keyboard friendly
There is no point to change the application output content most
probably it was enable to allow text selection using the keyboard.

  This change is needed to enable output filters, which can't use the
existing content from the output windows because they might be already
filtered.

Change-Id: Ia272143a3a0b085544ee9cd550a4ad4800e3f4dd
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-01-11 12:27:06 +00:00
hjk
b15a0eb93a Nim: Move icon overlay registration to extensionInitialized()
Change-Id: Ie6149805fb8258bbe55a162a3ee4bbfbbc442c77
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-11 10:39:55 +00:00
hjk
0b36c75ee0 MimeDatabase: Add some startup phase tracking
... to warn about situations where Mime types are registered too
late (i.e. after Plugin::initialize() or used too early (i.e. before
Plugin::extensionsInitialized())

Change-Id: I22681e94bfdd508e954bb3457b834ec3ad1f0fee
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-11 10:39:36 +00:00
Tobias Hunger
a0125a6e6d Qbs: Fix warning about unused variables
Change-Id: If0659e83a188b4b76d3ae80bcbd4319c02b655da
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-01-11 10:15:34 +00:00
Christian Kandeler
4dfbcecaa2 QmlDesigner: Fix qbs build
Change-Id: Ia074ac698dc116b7c7e2e2f8523c224d492cd6e3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 10:08:01 +00:00
Christian Stenger
0161b3238e AutoTest: Fix sweepChildren()
Introducing support for inheritance broke some old functionality
which in fact was just over engineered.
Remove additional code which will be automatically handled and does
not need to get handled by special logic which could be now wrong.

Change-Id: I05a063c41dc0f8f644d0807fc5497de9c4461246
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-11 09:47:57 +00:00
Tobias Hunger
3c41e2c09b QtSupport: Convert to QRegularExpression
Change-Id: If9d407eb189c45ee81e6c73f37a93df6218c791a
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 09:27:11 +00:00
Thomas Hartmann
1770438732 QmlDesigner: Reserve enough space for scrollbar if states are collapsed
Change-Id: I7bccb4328a846516fbe841e3f57e18fb967f6d2d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-11 09:10:31 +00:00
Friedemann Kleint
664195c1ec QtVersionItem: Remove unused field toolchainId
Saves some iterations over the toolchains when opening
the QtOptionsPage.

Change-Id: I0d5d0fc7f501b201d6baacdbfc330c1287c4bc5c
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-11 09:10:20 +00:00
Christian Stenger
f375f197d1 AutoTest: Add test for derived Qt tests
Change-Id: I8c61c08ff9b0653c02d262fb9010940e41e178af
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-11 09:02:09 +00:00
Tobias Hunger
ae0e15fad0 ProjectExplorer: Do not leak targetsetuppages
Leaving these around can lead to a crash when updating a kit after the
project has been closed.

Task-number: QTCREATORBUG-17571
Change-Id: Ie4be99a665b072f3c920e3f365f5b20949436850
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-11 08:36:06 +00:00
Eike Ziller
b1f1ccb32e Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
2017-01-11 09:29:37 +01:00
Kimmo Ollila
b76af11d80 Fix 'SFTP upload hangs' issue with Dropbear
This happens at least on Boot2Qt devices with Dropbear SSH.
Handling readChannelFinished() signal fixes the issue.

Task-number: QTCREATORBUG-16158
Change-Id: I7c6660ce3a1bfe6eeb868da5a818c0b92307eda0
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-11 08:08:35 +00:00
Tim Jenssen
fa84524c0c QmlDesigner: rename RewriterError -> DocumentMessage
Change-Id: I8cbb1b8b83ec10c33e416de96a09281208be8773
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-10 16:22:23 +00:00
Thomas Hartmann
759db2b7b6 QmlDesigner: Polish error handling for integrated text editor
The integrated text editor requires a couple of fixes and features
in the error handling.

The errors are now handled by the model and not the document management
anymore.
The text editor does not get disabled if there is an error. Instead
we show the error in a status bar.
The form editor is blocked if there is a QML an error and we show the
error message inside the form editor.

Change-Id: I4bfb9b33b09e444ec1de31dd531ce83b32cbcf88
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-10 15:58:36 +00:00
Jarek Kobus
8b67458a95 Prefix editor's uniqueId with plugin name
In this way we minimize the chance of
generating non-unique id.

Change-Id: Idd177c5a4b44b17a58c2a944ec77b9517e91964e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 15:14:19 +00:00
Oswald Buddenhagen
a8230eb6c1 do not report the .pro file itself in ProFileReader::includeFiles()
it's pointless, as no consumer has a legitimate need for it - the
project file is the root of all traversals, and is known by other means.

amends 4148b05e0.

Change-Id: I4df69727e37151b0ecbcd88b2f5ef6e55712172f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 14:49:33 +00:00
Tobias Hunger
624339ea70 qmake: fix missing OTHER_FILES in project tree
... in subdirs projects which actually have any subdirs.

that would happen via this mechanism in QmakeProFileNode::evaluate():
first, IncludedPriFile nodes with proFile = null are created for the
subdirs. subsequently, this tree is enriched by transforming the
reader's included files. that loop iterates over all already created
nodes and tries to match them against included files. at nesting level
one, this would now run into the nodes created for the subdirs. the code
failed to skip over these nodes, and would thus create a bogus node for
the .pro file (as it has the parent null in the mapping of included
files). this node would not be included into the tree due to the loop
prevention in QmakeProFileNode::applyEvaluate() (it obviously had the
same file path as its parent), but at the same time it would catch the
files meant for the root node due to defeating the fallback in
QmakePriFileNode::extractSources().

Task-number: QTCREATORBUG-17473
Change-Id: Ice9f667345148be42297cc21ff0a73058f27cc38
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 14:49:07 +00:00
Vikas Pachdha
acb07875b7 Android: Fix workflow issues in package signing password dialogs
Task-number: QTCREATORBUG-17545
Change-Id: Ide0c322a50455997c7b8fb2350dbdef1d76257c9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-10 11:30:47 +00:00
Vikas Pachdha
1e73c52dd5 Fix compile warning
COMMAND_TIMEOUT is not needed and will not be emitted

Change-Id: Id89aaa8c0b774a962e7a4e813a5b3d3e6a37524d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 11:30:16 +00:00
Vikas Pachdha
6c83981ee6 iOS: Use kill system call instead of shell command
Change-Id: Ic1d327ca2ed83ee91f78434cc1974ec247751483
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 11:30:06 +00:00
Ulf Hermann
eaba6ff660 QmlProfiler: Fix pixmapcachemodel test
Since the cache size is not given for individual file events anymore,
the test should only check it for the events in row 1.

Change-Id: Idfc7ec90ab8da214f4eedce36dd3b84fb00ed553
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-10 10:09:01 +00:00