Commit Graph

55184 Commits

Author SHA1 Message Date
Oswald Buddenhagen
0c621d2af5 qmake: fix conditionals on the spec after assigning QMAKESPEC
Change-Id: Ibdd9a9c85067623f0f1f064d139d23b4e6b0677d
(cherry picked from qtbase/d88ff29c57b5407339da00389c522e5f1d4e3398)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:31:57 +00:00
Oswald Buddenhagen
a8a2424a7f qmake: make QMAKE_DIR_SEP magic on writing
Change-Id: I45ab3156b8e040f683328ac46e48b09c2eb94ef7
(cherry picked from qtbase/f2b31fdb6bb357c0c5c97d4fabd2561da3ba2093)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:31:51 +00:00
Oswald Buddenhagen
94957d6f4e qmake: introduce magic bypassNesting() scope
Task-number: QTCREATORBUG-18220
Change-Id: If14e6944fe84767bd67604ecde98076f873749ef
(cherry picked from qtbase/b6b44b368c6fc2df168195eaee57a2f925a29646)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:31:26 +00:00
Oswald Buddenhagen
5e2b4c37f9 qmake: introduce reload_properties() function
Task-number: QTCREATORBUG-18220
Change-Id: I4526ef64b3c89d9851e10f83965fe479ed7f39f6
(cherry picked from qtbase/169a40d511165f6c3c9a71cd5c079786c22d2aca)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:30:53 +00:00
Oswald Buddenhagen
f7669c82ff qmake: abort when $$prompt() gets EOF
sync-up with qmake; no effect on creator.

Change-Id: I51ca7df8d694c6ffe9d9899cba414b1b46f5ce95
(cherry picked from qtbase/80e63223f80643a93255cde9e0a4e82c705b2262)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:30:44 +00:00
Oliver Wolff
21b8eb121c qmake: Add support for Visual Studio 2017
Change-Id: I21f56edca3852b52edd2c5fdcce76817141e8d4a
(cherry picked from qtbase/38675e18fcc841228141568a2ecfafdeb99eba2a)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:30:34 +00:00
Oswald Buddenhagen
ab23dce95f qmake: make discard_from() patch up QMAKE_INTERNAL_INCLUDED_FILES as well
when the file's effects are discarded, the mention of the file should be
as well.

Change-Id: I894b7e2b887dd34d18533b197bfa9d0d84d647e7
(cherry picked from qtbase/c05f0a83fdb4823604d76f61bb884e206887e704)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:30:28 +00:00
Oswald Buddenhagen
ad478db4e4 qmake: let discard_from() discard function definitions as well
for completeness.

Change-Id: I3ffc14e041408c773e277442828170e3df04ec8d
(cherry picked from qtbase/965e861e61ec56c91216d483987d33fb5a508b85)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:30:17 +00:00
Oswald Buddenhagen
9d9bef2e2f qmake: add "undecorated" mode to $$prompt()
sync-up with qmake; no effect on creator.

Change-Id: I01689c7a6573415801862348b32bafc6a609ed4a
(cherry picked from qtbase/cff05b398cb767af7fddae6a617f26f998c7a781)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:30:09 +00:00
Allan Sandfeld Jensen
9edc24133a Improve QMake JSON error
We can not improve the result from JSON parsing without changing API,
so instead recalculate the line and column based on input and offset.

Change-Id: I54149233f71023aa5d30deff854d6f3406c5c48c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
(cherry picked from qtbase/887e260a9370dfd8061754ed47cda7d9e4621711)
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:29:59 +00:00
Oswald Buddenhagen
24a687c641 fix $$section()'s bad argument count error message
Change-Id: I02b8663b96c7d96cdb3c19639e2213e49fd2bcec
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from qtbase/8db556d29919fd0c0ddb23b743cb5e6c218b1ae2)
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:29:46 +00:00
Oswald Buddenhagen
99f0237c80 qmake: restore coding style
this reverts 2631ffabd5 for qmake*.cpp.

i refuse to deal with the merging hell this introduced, thank you very
much.

Change-Id: I3e3a11fc0ad73c600976da0f3a13c8791250eb09
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 15:29:37 +00:00
Eike Ziller
4385d4fb55 Update 4.6 changes file
Change-Id: I53ce5cdba0291002e58d75bdb3cb12989ec7df4b
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-03-14 14:27:59 +00:00
Christian Stenger
e42ff6399e Fix build with namespaced Qt
Change-Id: If5675920a5e4020a8a21e103eed6613475f709b5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-03-14 12:49:03 +00:00
Leena Miettinen
e4bdf0ee89 Doc: Add link to Qt Quick Designer tutorial video from Tutorials
Change-Id: I17c4188e828295549c3c741ec4c8ab95c5bb5a3e
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2018-03-14 12:33:43 +00:00
Robert Loehning
139d64615e Squish: Revert workarounds for fixed bug
This reverts commits 47355608db
and 6cc61be23b.

Task-number: QTCREATORBUG-19717
Change-Id: I052ff84ab33a5c483c11b66eaf55a175cc34c28d
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-14 10:47:03 +00:00
Robert Loehning
38326b1811 Squish: Skip tst_opencreator_qbs
Change-Id: I0935a52f5b58c444bd6dd66cc9d93301444f0157
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-14 10:46:42 +00:00
hjk
9f81129417 CMake: Restrict CMakeRunConfigurationFactory to local setups
Anything remote is being taken care of by the target specific factories,
having CMakeRunConfigurationFactory accept everything too leads to
unhelpful duplicated entries.

Change-Id: I7e509593f6eaed8ee75ef0acef1703a877b1f011
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-14 09:38:14 +00:00
Eike Ziller
a6e073beb6 Add changes file for 4.5.2
Change-Id: I66fd1f5b1ece8ea7c1dc0f8f14d36d5f77b69f8c
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2018-03-14 09:10:50 +00:00
hjk
89371d9c17 Debugger: Add a "Leave Debug Mode" button to the toolbar
Arguably wrong as a concept, but the issue keeps coming back.

Change-Id: Id0b084999884c1f018e3de60bb04c5288f7031ad
Task-number: QTCREATORBUG-1214
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-14 08:04:36 +00:00
Tobias Hunger
37b86c89d1 Utils: Introduce case friendly comparison function to stringutils
Use this operator in the miniprojecttargetselector as well as the
projectconfigurationmodel. This should unify the sorting of
build-/deploy- and runconfigurations in various places in Creator.

Task-number: QTCREATORBUG-20023
Change-Id: I7aed2ebcb9d65244395d68b7dc5da599d6503962
Reviewed-by: hjk <hjk@qt.io>
2018-03-13 15:22:20 +00:00
hjk
a5d6fe33cb Partially decouple local CMakeRunConfiguration from CMakeProject
Funnel all relevant data through target.applicationTargets() as
done for the non-local CMake-supporting setups and QBS already.

There is cleanup potential left for later changes.

Change-Id: I49ed6abd98c058a7fd1545e41b3bcd6ecb758a8b
Task-number: QTCREATORBUG-19985
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-13 15:02:54 +00:00
Christian Stenger
e7f611cc67 Wizards: Fix Qt Unit test wizard
Remove unused define which lead to build errors if the build
directory contained white spaces.

Task-number: QTCREATORBUG-20047
Change-Id: Ieea4b61d6936479dfcd87714baed0854d4b4ced1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-13 14:57:15 +00:00
hjk
3f86d55587 BareMetalRunConfigurationFactory: remove availableCreators reimp
The base version adds "(on $devicename)" which is even more information
than the generic "(on GDB server or hardware debugger)" here.

If the  bti.projectFilePath extra path bits are needed, the feature
could be made generally available in the base implementation.

Also fix a typo in the BareMetalCustomRunConfiguration title

Change-Id: I293e36c7edd2a9459e29a7025ca5bb19fb39b4b0
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-13 12:49:46 +00:00
hjk
eece1be316 CMake: Re-add RunConfiguration display name
Amends 6f04ca646 for QTCREATORBUG-19762?

Task-number: QTCREATORBUG-19954
Change-Id: I5da8bf15b5b62500fd0936d15451dfefd878b57b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-13 12:12:03 +00:00
Robert Loehning
36132751ff Update German translation
Change-Id: I8960605dbf5a06ae4cce0e965103e67505e0434b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-13 12:09:07 +00:00
Vikas Pachdha
1fae424f83 Android: Pull linker from device/emulator
Task-number: QTCREATORBUG-19931
Change-Id: If8f0b5fe767f9e816ac5163142d4fa38e0f6540f
Reviewed-by: hjk <hjk@qt.io>
2018-03-13 11:40:52 +00:00
Eike Ziller
c26767e73c Merge "Merge remote-tracking branch 'origin/4.6'" 2018-03-13 10:50:38 +00:00
Eike Ziller
0b10ecc718 Merge remote-tracking branch 'origin/4.6'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/ios/iosrunfactories.cpp
	src/plugins/nim/project/nimproject.h
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
	src/plugins/qnx/qnxrunconfigurationfactory.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/winrt/winrtrunfactories.cpp

Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539
2018-03-13 11:25:38 +01:00
David Schulz
61e93a0524 Snippets: Add snippet for namespace with closing comment
Change-Id: Id0f0110ac427b3a6460eeae2891cd1c5c65fc6a3
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-13 10:17:12 +00:00
Eike Ziller
1d2b476320 BinEditor: Do now show tool tip if mouse is not over data
Task-number: QTCREATORBUG-17573
Change-Id: Ida0497006e702dfafe70f434373088325bbc6db7
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-13 10:11:16 +00:00
Eike Ziller
0bcc983cdb BinEditor: Fix that posAt could be larger than available bytes
Task-number: QTCREATORBUG-17573
Change-Id: Ia34bb9b6765850937793d6481bb1e6404319d510
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-13 08:54:07 +00:00
Eike Ziller
7ac1b852b7 Fix binary editor tool tip
It should show up also over the last column, it should also show up if
the selection spans multiple lines, and if the mouse is not over the
selection it show up with information about the single byte under
cursor. If the mouse is over a selection that is longer than 8 bytes,
the tool tip is restricted to the first 8 bytes of the selection.

Task-number: QTCREATORBUG-17573
Change-Id: Ie7aaf1e52ceadd6be815d4ce3386a60df1418297
Reviewed-by: David Schulz <david.schulz@qt.io>
2018-03-13 08:53:57 +00:00
Christian Stenger
f1985df55d Tests: Fix compile for older compiler / Qt
Change-Id: I96e48c446ebd397c75dc0b47f9aaef1717b5e5af
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-13 07:43:32 +00:00
hjk
f99944b617 QbsRunConfiguration: Consistently use 'final'
Two missing after 9541aa777, some inconsistent before.

Change-Id: I2ee330fb099cf8b8060fbbe3f375e77d4d9ff420
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-13 07:16:37 +00:00
hjk
ae560fcc49 FakeVim: Implement :<range>sor[t][!]
None of the other options yet.

Change-Id: Iabf18c1be4d228c97d2de9cb17e71c307e9ec5a2
Task-number: QTCREATORBUG-20022
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2018-03-13 06:48:42 +00:00
David Schulz
84e0573cad ProjectExplorer: fix gcc toolchain abi detection
This updates the selected abi in the toolchain widget
when editing the binary path to the compiler.

Task-number: QTCREATORBUG-19673
Change-Id: I8df69af207360364fb6f75e94a3aa26f84fd13d9
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-03-12 16:21:12 +00:00
Tobias Hunger
0bc100911d Utils: Add pointeralgorithm.h
Change-Id: I3e81bdbf22808efbe1fb5fab13bef24c8f73f404
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-12 14:14:10 +00:00
Tobias Hunger
831b84a6fd Utils: Add take
Add a new algorithmn to take the first match in a container out of the container.

It takes a pointer to something and will try to match against a smart pointer
stored in the container. Besides that it also accepts the usual like a predicate,
member variable or member function.

Change-Id: I4aabd4d43aa076a534da6488d0f9c3695ba79c09
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-12 14:14:01 +00:00
hjk
f873ad54e1 RemoteLinux: Use Argument and Working directory aspects in run config
Also some cosmetics in the run config widget setup.

Change-Id: I02503d808b5ee7f81f46520f9e6d1750c2cd5de9
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-03-12 13:25:24 +00:00
hjk
7e90aba530 QbsProjectManager: Move QbsRunConfigurationWidget to .cpp
Change-Id: I4fd99a2e0a82911bd849879f50ebff24bb4d8be8
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2018-03-12 13:24:45 +00:00
Leena Miettinen
f37982d859 Doc: Add a link to a new Qt Creator and Qt video
Change-Id: I3ea8c67e5cb967fc5c963b96c30a4de1ff1baa63
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-03-12 10:44:44 +00:00
hjk
9541aa7772 QbsRunConfiguration: Re-model based on RemoteLinux precedence
Task-number: QTCREATORBUG-19985
Change-Id: Ifd95187b72fed3565552ecd14f3353b7e7df0069
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2018-03-12 09:38:27 +00:00
Christian Kandeler
6d3f2e4317 qbs build: Suppress vcs header file creation
The repository state is only used on the project file level at the
moment.

Change-Id: I8f6ff587785d4fbc5586836a31c256a2e114cdb6
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2018-03-12 09:32:43 +00:00
Eike Ziller
64fe131c14 Fix ordering of items without file name in open documents popup
An item that has no file name (like Git Commit, Diff etc.) was always
last in the list.

Broke by 324de13b4e.

Change-Id: Ied3add2a372b4b176ee800e8c023c3cef5495488
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-12 09:09:47 +00:00
Christian Kandeler
102a058c25 QbsProjectManager: Fix "equivalent command line" contents
- We forgot to adapt to the introduction of the "config" key.
- The space character was missing before the QML debugging property.

Task-number: QTCREATORBUG-20024
Change-Id: Ie4a94a04989caa14b1ddc11c8595d679d1871625
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2018-03-12 08:12:17 +00:00
hjk
7bbe5979a1 KitChooser: Change kit pre-selection strategy
In case there is a startup project, it will be listed in
an additional entry at the top of the kit list, followed
by a separator.

Kits are remembered by Id now, not by index anymore
*unless* it's the startup kit entry, i.e. if the startup
entry is selected and the project is changed, it will
again select the startup entry, possibly indicatin another
kit.

In case a non-startup entry is selected, the kit will be
remembered by id, changing projects will try to re-select
*that* kit.

Change-Id: I827d2670d9a8681570d9c67405cd662cf6a01b4c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-12 07:34:32 +00:00
Orgad Shaneh
27063168ad QmlDesigner: void static -> static void
That's the order everywhere in the codebase.

Change-Id: I62e57f2ddddd6e4fac0dc26d81b05839cf80a9db
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2018-03-12 06:35:58 +00:00
Christian Stenger
a998202acf QmlDesigner: Fix compile for Qt5.6
Change-Id: I25cdf8874c03865400a3a1bc451c6c58e9294ab0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2018-03-12 06:35:36 +00:00
Alessandro Portale
7d83472906 QtSupport/Welcome: Refresh the tutorials/examples/videos thumbnails
And adjust the drawing code to support the HighDPI variants.

Task-number: QTCREATORBUG-19942
Change-Id: I77b07674305b29680de27714fc56f1ad25f5346d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2018-03-11 10:49:33 +00:00