Commit Graph

45705 Commits

Author SHA1 Message Date
Christian Stenger e564abdd9a Squish: Use more stable subprocess code
Change-Id: I9a895831f9d57562a9eeb8491cc7f46c1da2eba1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-27 04:35:49 +00:00
Christian Stenger a00a73a74d Squish: Fix expected failure in tst_SCOM04
Change-Id: If09e33b616356e0f0eb5aa37c035acaf2c2adaac
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:54:44 +00:00
Christian Stenger 2b57a1afa6 Squish: Fix handling of context menu on OSX
Change-Id: I6f5d50eca0199826e8af0f11016a1dfeb924f046
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:31:25 +00:00
Christian Stenger 1f1a9e5870 Squish: Fix expected sort order
Change-Id: I882ad3633f7cf827aea086b5f5fd2a9204eeb482
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:07:47 +00:00
Christian Stenger 3b820cc9a4 Squish: Fix tst_installed_languages on OSX
Change-Id: I470047d663ec4c2bfebaa17baf67bc811d9c0c65
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 13:06:15 +00:00
Robert Loehning b2f869c411 Squish: Test code model's reaction to decimal separator in float
Must not be interpreted as member access operator.

Task-number: QTCREATORBUG-16188
Change-Id: Iec252fbc63899cef5b004a5770e3ebee5af7188e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-26 11:48:03 +00:00
Christian Stenger 91d7886313 Squish: Fix tst_designer_edit on OSX
Change-Id: Idabdd1577373636d9b39c83447febdf4da7b04f1
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 11:31:15 +00:00
Leena Miettinen 32ff202a79 Doc: Describe Qt Quick Controls 2 Application wizard
Update screenshots.

Change-Id: I6069e08113cae83142d249e3f331586acce63ca9
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-26 09:56:50 +00:00
Christian Stenger b1e9290b73 Squish: Raise some timeouts a bit...
...as these frequently fail on OSX.

Change-Id: I200fa1e57e8ec98221c9a82177565d9e60b79356
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-26 05:08:23 +00:00
Robert Loehning 80ef8d11f9 Squish: Handle failing startApplication() without ClangCodeModel
Change-Id: Ic50939219c8dcf2b04423d99d0d5021de8f26afc
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-25 15:34:38 +00:00
Robert Loehning 0e299cbd0b Squish: Expect failures in tst_memberoperator on Windows
Change-Id: I582109d104816545c804340c7e0d4dbe343d55f3
Task-number: QTCREATORBUG-16336
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-25 15:30:57 +00:00
Christian Kandeler 5378b8ceb9 QbsProjectManager: Fix task emission from build step.
The connect() call was not updated after new default parameters had been
added to the slot, so the additional parameters emitted via the signal
never reached the slot. Fixed by converting to new connect style.

Task-number: QTCREATORBUG-16334
Change-Id: Ia418c2980e85fa41353e23f654587aac85462469
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-25 14:32:41 +00:00
David Schulz 527a3d06a4 Fix hiding tooltips on windows.
basically an rewrite of commit c47e52c97b.

Task-number: QTCREATORBUG-15882
Change-Id: I711f99ed0ae1d1859d5ef5cbd2128215a10b7ed4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-25 06:29:18 +00:00
Eike Ziller 0944382239 Add change log for 4.0.1
Change-Id: I33faed2649ce85aa687c360454fb2c360b79d9e2
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-05-25 05:55:32 +00:00
Christian Stenger 0aff733a91 Squish: Stabilize clickOnTab() on OSX
Change-Id: I984a6a2012668e0b0095b2118b9d7001c7cda616
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-25 04:41:31 +00:00
hjk fbc82d3f88 Debugger: Fix dumping of numeric QJsonValue inside arrays
Task-number: QTCREATORBUG-16313
Change-Id: I544e89fc964cd404652d8ea0c8df127e51235292
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-24 13:09:19 +00:00
hjk 98214c5a0f Debugger: Robustify disabling of system pretty printers
There seems to be systems producing non-ASCII error messages when
running this in directories with non-ASCII characters. Since we
won't be able to workaround, silence the error to not disturb
further operation.

Change-Id: I527ce10c062273d2f4928f2a8fab79b704de067b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-24 11:50:45 +00:00
Robert Loehning 6a74d8cad1 Squish: Fix suite_SCOM for Qt 5.5
Change-Id: Iea47ca2c74a6ac2287aee26418636abcb748a5d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-24 11:36:17 +00:00
Christian Stenger 13954bc523 AutoTest: Avoid nullptr access
Change-Id: I6be5d02a14fc921f189d7817da8ebb6284973858
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-24 11:24:00 +00:00
Christian Stenger c9dac0fa61 Squish: Raise waiting time when using FileDialog on OSX
Necessary especially when trying to open big files for which the
system file dialog of OSX is creating a preview.

Change-Id: I6d352b78f76571fbb7224902b05e228d584c443a
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-05-24 09:59:13 +00:00
Stanislav Ionascu c1d735503b CMake: make it possible to insert new vars in project settings
Task-number: QTCREATORBUG-16238
Change-Id: If98acc4f27cabbb606b2fc1017096da626ba1144
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-05-24 08:44:57 +00:00
Ulf Hermann e6e2c1771b Debugger: Restore expression evaluation through QML inspector
You can now interact with QML objects selected with the "select" tool
again, when unpausedEvaluate is off.

Change-Id: If6b4a55193a8949b2e3048fe78443c5df6710885
Task-number: QTCREATORBUG-16300
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-23 14:40:20 +00:00
Tobias Hunger 278819f8fd CMake: WS-only fix
Change-Id: If1dcc869560b526d8750195f90b2b94b928eb918
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:19:05 +00:00
Tobias Hunger d5a1eff8ee CMake: Fix warning about empty filename after persisting cmake config
Change-Id: I2639059055cc42cf6ab9431f4885a01970980fca
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:19:01 +00:00
Tobias Hunger 1f7582e86e CMake: Fix race between persisting cmake configuration and parsing
First make sure the configuration is reset: This makes sure the correct
branch is taken in parse().

Then trigger parsing through the event loop so that its signals will
definitely arrive after persistCMakeState has returned.

Task-number: QTCREATORBUG-16258
Change-Id: I103ca6b6119ec70c99828d883d728a8bb97fd6bf
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:18:54 +00:00
Tobias Hunger 5bc0d12c6d CMake: Check CMakeCache.txt for changes
Check CMakeCache.txt for changes and ask whether to apply these to the
project going forward.

This will only consider settings that were previously changed by Qt Creator
and will not pick up on newly changed settings.

Change-Id: Ia20c67bc2a5e9965243f08003c10ec684875387f
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:18:47 +00:00
Tobias Hunger 8c316aa1c1 CMake: Do not parse that often
Wait longer before triggering a reparse.

Change-Id: I02ed83b0e9a3be7de5f720f9a9595e6a886d1ab0
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:03:32 +00:00
Tobias Hunger 0695384b12 CMake: Show INTERNAL settings as advanced
Sometimes cmake changes the type of random settings to INTERNAL.
This change keeps them visible even then.

Change-Id: Icd6bf26b8e2cb031b76bbba8bf0aac70c349fb7b
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:03:27 +00:00
Tobias Hunger 5d69bdfde7 CMake: Cache CMakeCache.txt
Change-Id: Ib3e7a9943d15a2e90afd29642b666892ba7b0613
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-23 13:03:20 +00:00
Christian Kandeler 6456cc35b0 Update qbs submodule.
To HEAD of 1.5 branch.

Change-Id: Id07efe74e38dc3b871bec78c28b41035414cf978
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2016-05-23 10:41:38 +00:00
Christian Stenger c2a7ad6b41 AutoTest: Fix creation of target file path for Qbs projects
Task-number: QTCREATORBUG-16323
Change-Id: I3ac59d830c098e9e7fe0d6f7dc75078f339adb6d
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-23 07:11:45 +00:00
Victor Heng a4e96636e3 Doc: Fix indentation in JSON wizard 'Label' example
Change-Id: I306fa9a6e973260a65947cd5d78aed1e48ad1030
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-05-22 21:35:43 +00:00
Christian Stenger 5ec1faa64f AutoTest: Provide additional test project...
...to also test combination of Qbs using Google Test.

Change-Id: I4a5d32a32bfaadd0dfaaa4884b58d2ac1a952bd3
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-20 19:23:07 +00:00
Tobias Hunger f6bf3344d6 CMake: Do not store kit cmake configuration in BuildConfiguration
Change-Id: Ia45c03f42083af0871b12351c98092a2e7887158
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-20 13:05:35 +00:00
Tobias Hunger 0d262e3a6b CMake: Do leave the project configuration alone on reparses
This keeps user-overrides made via other tools visible in Creator.

Change-Id: Ice07bebb2b82f29ecae83e442bc2090af7f2ee06
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-20 13:05:27 +00:00
Tobias Hunger b910b36458 CMake: Also treat "yes" as true for boolean settings
Change-Id: I78426ec5b6b2cf0a1d4cca26202632b27e2036e9
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-20 11:55:19 +00:00
Tobias Hunger fd761cd790 CMake: Warn if kit settings are overridden by the project
Change-Id: I8f01b267f27617d6561124d173ac2e5ae5b9f4d6
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-20 11:52:17 +00:00
Tobias Hunger 5100454222 CMake: Make it easier to get the expanded value of a CMake configuration
Change-Id: If289c48ef4ec2815e8bd12e08b990d1dc809c524
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-20 11:51:23 +00:00
Orgad Shaneh a16bee8bc2 QmlPuppet: Add missing braces
Detected by GCC6

Change-Id: I62ad2da87477251b6abbf8f5c33c6a392787fb41
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
2016-05-20 09:06:47 +00:00
Tobias Hunger 2be4d2643a MSVC: Fix Microsoft Visual Cpp Build Tools
Backport of bc4a24db00
from master branch for 4.0.1

Change-Id: I5db3d0dda0b92c1ed26655f39df05d9667bfbd04
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2016-05-19 13:38:32 +00:00
Alessandro Portale 646bf84c60 Wizards: Add an application wizard for QtQuick.Controls.2
Change-Id: I516a0b016d57d997624a449ec58e56e3af3f265f
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2016-05-19 10:59:17 +00:00
Victor Heng 11ef0db2fd QmlJS: Keep pragma directive when reformatting QML files
Change-Id: I1f11e95565a90e4fc7b908c03d49f6abbd37b8be
Reviewed-by: Marco Benelli <marco.benelli@qt.io>
2016-05-19 09:55:11 +00:00
Jonathan Liu 52b34611dd Debugger: Remove unreferenced QString arg
Change-Id: I6c7fd01d6bc8cee526fe1f566f9fae551246af80
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-19 08:15:19 +00:00
David Schulz 0aca5808cb Debugger: Fix creator crash on spontanous debugger exit.
Task-number: QTCREATORBUG-16233
Change-Id: I27b9ab17243463924dc410b3b5ffb0795ef3e33c
Reviewed-by: hjk <hjk@theqtcompany.com>
2016-05-19 05:00:07 +00:00
Jake Petroules 1c04cce4d7 Remove unnecessary /FS flag in qbs property provider.
The current version of qbs handles this automatically.

Change-Id: I81905335fd3366198164436e7125944ad8a3d304
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-18 15:31:59 +00:00
Nikolai Kosjar a592f9b37a Clang: Fix accepting absolute path clang executable
Commit 506fc40a31 broke running the analyzer with
absolute paths.

If the clang executable name is provided, the ".exe" suffix is not needed since
we get the absolute path with Utils::Environment::searchInPath(). However, for
absolute path we need to ensure the presence of the suffix in order to point to
an actually existing file.

Also, compare case insensitive.

Task-number: QTCREATORBUG-16234
Change-Id: I9f39386c099cc544297239eca56a95c2e7430555
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
2016-05-18 12:07:45 +00:00
hjk bebdad0df1 Utils: Adapt to QChar changes.
Less warnings.

Change-Id: I435abb1f39d179be10e4d0446b352f2ff7636437
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-05-18 11:13:30 +00:00
Jake Petroules ac9360a2c1 qbs: apply compiler and linker flags from GCC toolchains.
Change-Id: I27ce0b11238a2a0c9e5f2f1f8d9e5ecfa3cc51f9
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2016-05-18 09:17:33 +00:00
Robert Loehning 8c8ed3294f Squish: Raise timeout for help content
Change-Id: Idc53e974a271d0c833ca8371c9a65b0c6d98c45c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-05-18 08:43:45 +00:00
Orgad Shaneh 906c7c1727 ClangStaticAnalyzer: Use native separators in exe placeholder
Change-Id: I49399d4d1b8c35332e223abd77886de60d155c28
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-05-18 08:30:28 +00:00