Commit Graph

48736 Commits

Author SHA1 Message Date
Christian Kandeler
353d6b2513 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: I8233e58ce52f62b2dcdd89fa5eea3792318ac0f4
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-01-06 10:49:37 +00:00
Robert Loehning
611a970819 Squish: Configure C-toolchains for Windows
Task-number: QTCREATORBUG-17406
Change-Id: Iafa1b38f75fa56691e646aaf2fad61504f0706e8
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-06 10:23:12 +00:00
Tobias Hunger
ca0a8a6cf7 Qmake: Initialize ExtraRunConfigurationAspects after initial parsing
Task-number: QTCREATORBUG-17462
Task-number: QTCREATORBUG-17477
Change-Id: Ie74455362d7e7ddc0cbd9296a3e2438e7195b00b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2017-01-06 10:19:13 +00:00
Christian Stenger
9d328ef1a9 Squish: Fix adding new kit
Projects view has changed and so has functionality of adding a new kit.

Change-Id: I44377822b8b850fd17be24e12f7e5d0104be568d
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-01-06 05:51:59 +00:00
BogDan Vatra
c4afe5d79b Android: Fix keytool result handling
keytool return code != 0 if the password is incorrect.

Task-number: QTCREATORBUG-17317
Change-Id: I248b4a687ef48a849d42a70940009738d29a609c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-05 09:07:20 +00:00
Friedemann Kleint
9ceb1b504a MSVC toolchain: Add common mkspec added in Qt 5.8.1
Prepend "win32-msvc" to the result list. Projects based
on Qt 5.8.1 will then no longer be misconfigured with ARM
toolchains.

Change-Id: I734ee530e4fe2c5253f946568c2ab973e51d3cae
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-05 07:24:06 +00:00
Tobias Hunger
be4d1093b4 ProjectExplorer: Do not crash when setting custom executable
Do not crash when setting custom executable without ever visiting
the runconfiguration before.

At that point the chooser is still a nullptr.

Task-number: QTCREATORBUG-17505
Change-Id: I27fb19845adf9c7ec0ad5a9435c8d86a573a2532
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-04 16:20:42 +00:00
Orgad Shaneh
86af16725d Revert "SDKtool: Warn if file is not found"
It is not an error. SDKTool can be used to create new files.

This reverts commit 274d3a8c79.

Change-Id: I4af46b4deb5fe356a9c1050cc9557d43f3a91a6e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 15:14:57 +00:00
Robert Loehning
7746c31774 Squish: Use different function name in tst_CSUP01
realloc is not being listed by Clang Code Model

Task-number: QTCREATORBUG-17490
Change-Id: I006fee04579706fbf5edf8b890bd7be8e090d01f
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 14:43:32 +00:00
Robert Loehning
2a6c315fbb Squish: Workaround unexpected error message
Task-number: QTCREATORBUG-17492
Change-Id: Icda68a756b3420baa494e90c41dbefc656ae6327
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 14:42:18 +00:00
Robert Loehning
ae0ea76f07 Squish: Fix timing issue in tst_HELP06
Change-Id: Ic88207d86cf3f926fc4df681be4cfaa1a62ba763
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-04 14:41:54 +00:00
Konstantin Podsvirov
ec6587ceb6 CMake: Allow CodeBlocks for NMake Makefiles JOM
Change-Id: I280deb2131959cc538c4af4b7e9b9e07b4f41b80
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
2017-01-04 10:09:57 +00:00
Vikas Pachdha
1e8c0c3632 iOS: Find Xcode version
To enable/disable the version specific features

Change-Id: Ia4cbe83f0aae366f517d8b46f322d8202dbbe3c8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-01-04 09:51:44 +00:00
Orgad Shaneh
ffabc5dff1 QmakePM: Fix false positive warning for incompatible compiler
Some users set 'QMAKE_CXX = @echo $< && $$QMAKE_CXX' to prettify the
compiler output.

Another useful case for "incompatible" compiler is ccache, or other
compiler wrappers.

To eliminate warnings for these cases, pick the last value of QMAKE_CC/
QMAKE_CXX, excluding flags, and compare it against the configured toolchain.

Change-Id: Idc3b9377e6f7c39c09c50f36ec89460756510b97
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-04 09:26:29 +00:00
Nikolai Kosjar
a8f1f758a5 Clang: Fix tagging of slots with CONFIG+=no_keywords
For the CONFIG+=no_keywords case, Q_SLOTS expanded to the undefined
"slots".

Task-number: QTCREATORBUG-17371
Change-Id: I7891e4b0595647aa02c97c9f80d61f3f5459a61a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-03 16:47:12 +00:00
Eike Ziller
1dab84e96e Add change log for 4.2.1
Change-Id: I9161030e01bc89670da1f7122c04d1e0e230c6f3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-01-03 14:21:01 +00:00
David Schulz
e7ffd1eefc Editor: Avoid setting text cursor when clearing block selection
Task-number: QTCREATORBUG-17475
Change-Id: I0266530c8c2ba10bd14dcb26b946cc51a825600f
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-03 10:06:02 +00:00
Przemyslaw Gorszkowski
3c9c76c6f3 GenericProject: show project files in "Project" tree
This missing project files(*.files, *.includes, *.config) in "Project"
tree is a regression.

Change-Id: Ib7380b1627a0f31045a25bc152352f5d2c82342a
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-01-03 08:29:34 +00:00
Orgad Shaneh
92b49c2eb2 Utils: Fix "Unused result" warning in process stub
Change-Id: If0fbe55106936526ec4993963f2cb0dc4041f937
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
2017-01-02 16:10:44 +00:00
Ulf Hermann
1b46022330 ScxmlEditor: Fix typo
Change-Id: Icd8ff982a3b8808af4798fb9adb5d8ebefd5a9af
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 14:26:10 +00:00
Tobias Hunger
5698736284 CMake: CMakeConfigurationKitInformation::setup fix
CMakeConfigurationKitInformation::setup did override the existing value
when it was called. That is not intended, the setup method should only
set a value if none exists.

Change-Id: I86d386982311020dc3dbb3a705e1ff87ad02e09c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:24:28 +00:00
Tobias Hunger
81b255e960 MSVC: Increase timeout for environment detection
Surprisingly many users apparently do run into the timeout.

Task-number: QTCREATORBUG-17474
Change-Id: I756a5164d52feee1e45bfebacbd45cc232628b79
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:22:58 +00:00
Christian Stenger
3ffec118d0 Squish: Fix switchToBuildOrRunSettingsFor()
Properties of the model indices did change recently and so
checking for enabled does no more work - use its toolTip
content instead to check for the enabled state.

Change-Id: Idc2b5ed1a0a14cfabdbdb4231eab243d28c0aee7
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2016-12-21 10:58:05 +00:00
Vikas Pachdha
ccc5359c42 iOS: Remove the step to spawn the app before launch on iOS
This causes timing issues on certain devices resulting in
app startup failure

Task-number: QTCREATORBUG-17336
Change-Id: I190b5415bdef1fc80a415b0cb872b95b883db5d8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-20 16:09:14 +00:00
Christian Kandeler
8751d46f97 QbsProjectManager: Take the "no OS" case into account
When a toolchain did not specify an operating system, we did not set
qbs.targetOS, which meant it stayed at its default value (qbs.hostOS).
Instead, we correctly set it to an empty list now.

Task-number: QTCREATORBUG-17452
Change-Id: I2c7030013ea7a1f954e8d0f7059b471008a0ed72
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-12-20 14:18:20 +00:00
Eike Ziller
c42c023022 Bump version
Change-Id: Ia998360a90a2decc6a7e81f11b64adb367c217b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-20 09:34:17 +00:00
Eike Ziller
271bc5e818 createDevPackage: Support extra plugins
Change-Id: Ie05b59dc3c17dceeee6bb74d9ae02dd7d29e4d2e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 15:17:17 +00:00
Christian Stenger
e1d339b72c Valgrind: Fix Qbs build
Change-Id: I67e0b3baa68589eec58d407e6886f51866cfa275
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-19 12:30:07 +00:00
Christian Stenger
6c4840a4ff AutoTest: Avoid fetching result for invalid index
Change-Id: If8dc37d20b2b7f684a88bde23f9b1b18144bacdb
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-19 09:22:06 +00:00
Orgad Shaneh
c8c532a0e6 Use shallow clone for binary artifacts
The repo is deleted anyway right after the files are copied.

Change-Id: Iec4ae3ca45e94c95a911f245bded36025d3f799b
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 09:14:11 +00:00
Orgad Shaneh
8728fb078e Project: Clone binary artifacts via http
git port is sometimes blocked by firewalls.

Change-Id: I8e53b119ec3401532a9da578b64d112250962f46
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 08:09:54 +00:00
Orgad Shaneh
6d33f9d72a Support Python3 in deploy scripts
Change-Id: I3a25306ed6babdbae09dcb0f8bc2c5c337d36415
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-19 08:09:46 +00:00
Christian Kandeler
f7712a9c61 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: I77f56ba1b6cf7c23a9cdc3cc2e90cb8a2c6cbeb3
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2016-12-16 11:47:16 +00:00
Friedemann Kleint
467c478dda Abi: Detect MSVC2017RC as MSVC2017
The binaries have a minor linker version >= 10.

Amends change 0a9414d467.

Task-number: QTBUG-57086
Change-Id: Ib9493bc3f87e6100377632b85991ce94f3025f28
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-16 11:02:27 +00:00
hjk
90a4ff723b Debugger: Remove need for debug builds in some dumper tests
Not needed anymore.

Change-Id: I206c2ae4e93306f8dc4fcea0dab727f769ad739c
Task-number: QTCREATORBUG-16908
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-16 10:17:00 +00:00
Christian Stenger
62118e9d78 Valgrind: Move some memcheck auto tests into plugin
Due to changed dependencies it is nowadays necessary to have more
of the plugin infrastructure at hand. Moving memcheck related tests
to be able to execute them as QC plugin unit test.

Change-Id: Iab492b3cb87728425b950ca9387edf292d895350
Reviewed-by: hjk <hjk@qt.io>
2016-12-16 10:04:56 +00:00
hjk
996a697094 Debugger: Fix QObject property extraction in namespaced Qt builds
Bail out on error results as early as possible.

The accessor always exists in libQt5Core, but it can't be found
when using a wrongly mangled name. Use the right one, and add
another sanity check before actually using the function.

Change-Id: I57975be188ca6b03836c0968e59d9603b0eecf27
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-16 09:00:03 +00:00
Ulf Hermann
233880e99d Timeline: Check for validity of vertexData() after allocating geometry
QSGGeometry itself doesn't check the result of allocations.

Change-Id: I4533d9abbb6dd26b8bd97e2c1b3dff089d827023
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-15 10:26:25 +00:00
Tobias Hunger
200e7dd437 QmakeKitInformation: Leave boot2Qt kits alone
HACK! The magic in QmakeKitInformation::setup() should be removed altogether,
but that is something I dare not do in a patch release. HACK!

Change-Id: If3f0ec9976171977c253cee531203ac3ab41c6a7
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:33:19 +00:00
Tobias Hunger
bbf944e373 ToolChainKitInformation: Preserve sticky bit on upgrade
Change-Id: I774fe7acc5c1a820eee4361547c034c9558fcb6d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:33:14 +00:00
Tobias Hunger
e76157d285 Kits: Upgrade SDK-Kits before trying to them up
This makes sure all keys have the expected names.

Change-Id: I063a88c705de44c4ac079d790ad865e222259b53
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:33:07 +00:00
Tobias Hunger
f2cd2ac877 Qmake: Do not consider non C++ toolchains
Do not consider non C++ toolchains when searching for a matching toolchain.

Change-Id: I2b06fd677ec3b89d0c15290ba170344629ded20e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:32:47 +00:00
Tobias Hunger
3840685998 SDKtool: Default to C++ for newly added toolchains without a language
Change-Id: I0002c0e0a81fd44064931a437f5c4b1e3095586c
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:32:40 +00:00
hjk
0e6c9d26f1 Debugger: Fix pointer arithmetic in dumper framework
Task-number: QTCREATORBUG-17428
Change-Id: I1e3a682a6f412af51e191dc783b89ff266020e3b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-14 14:23:37 +00:00
hjk
26331f771a Debugger: Avoid messagesboxes on the same topic at the same time
Task-number: QTCREATORBUG-16971
Change-Id: I625f04cbd8f609c66597450dbad22ebc6eadcfe5
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 14:10:14 +00:00
hjk
c16d350539 Core: Return some handle when creating an AsynchronousMessageBox
User code might want to keep a QPointer around e.g. to prevent
double instantiation of some box, or delete it automatically
after a while.

Change-Id: Iaa994c2abf321c35ffb3bcb0050d72939c55d941
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 13:54:41 +00:00
Aleix Pol
0c20e582e4 [Linux integration] Install desktop and appstream files
Installs the appstream's appdata file into the correct location and with
the correct name. Fixes the contents to conform to the standard.
Installs a desktop file because it's both required by appstream and by
desktop environments. Note this was currently patched in by
distributions.

Task-number: QTCREATORBUG-17335
Change-Id: If1425ec9fbd0c639550852a8d6e1f15a6b9d77ef
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-14 13:31:43 +00:00
Friedemann Kleint
0886860976 Output language in warning about missing toolchains
No tool chain set from kit "Qt 5.8.0 (msvc2015_64)".
becomes:
No toolchain set up in kit "Qt 5.8.0 (qt-58)" for "C".

Change-Id: I21b8f166baba85936a082a8943cc2ae74835771e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2016-12-14 09:45:25 +00:00
Orgad Shaneh
1bbba3b48d TextEditor: Sort input keywords
std::binary_search expects sorted input. Do not trust the caller to pre-
sort the entries.

Change-Id: Ib1586660c52806a6b85dcf1a059297c948e48b7a
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2016-12-13 16:54:55 +00:00
Orgad Shaneh
05d037a71a Dumper: Re-add Dumper.templateArgument()
Removed in 2244e2b26c. Required for
backward compatibility.

Change-Id: I7255002ad1d6e6b4d04f1fb2a8fa96e3eba65d6b
Reviewed-by: hjk <hjk@qt.io>
2016-12-13 13:26:12 +00:00