Commit Graph

50929 Commits

Author SHA1 Message Date
hjk
cbfedd4328 ProjectExplorer: Fix display of .qrc contents
Change-Id: I2779e12daa8a7972380f51b72a56de3466d453a5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 13:43:31 +00:00
Tobias Hunger
e8b4e180cd RunConfiguration: Introduce buildSystemTarget()
Introduce a method that maps a RunConfiguration to the build system target
that created the executable.

Implement the method in all RunConfigurations where that makes sense (e.g.
no CustomExecutables).

Change-Id: Ifaac859c2cd9b2806a0d7c185b2239312a67752a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-30 13:27:16 +00:00
Tobias Hunger
836252990a DiffEditor: Fix warning about unused constant
Change-Id: I5a2fbf4e91319d2da41fb364f60688e81498b708
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 13:17:33 +00:00
Robert Loehning
326d40dde1 Squish: Parse qtcreator.pro with Qt 5.6 to avoid changing results
Change-Id: I47cecb8ac8aaf1d5a845b801ff4038b3f023a220
Task-number: QTCREATORBUG-17577
Task-number: QTCREATORBUG-17609
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-30 12:52:09 +00:00
Tobias Hunger
cccfcfff2f Nim: Finalize toolchain related classes
Change-Id: Ic4fdcdad0f3f886efbf673d0cb4c165cece21a8f
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 12:29:39 +00:00
Kari Oikarinen
1e827206f3 ProjectExplorer: Adapt to ProcessHandle move
ProcessHandle was moved to utils in 3e8a1ea7ad,
but 6bcc657adb which was merged to master still
used it from ProcessExplorer.

Change-Id: Iaef3bf4d9415b0ba7411e00d58a2cc25eae6d2df
Reviewed-by: Filipe Azevedo <filipe.azevedo@kdab.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-30 11:58:31 +00:00
Nikolai Kosjar
dca904e632 Nim: Fix build with qbs
First error is:

    nimtoolchainfactory.cpp:28:26: fatal error: nimconstants.h: No such
    file or directory

Change-Id: I4d440f66dcfe84a492020b5a9ec681de38b050aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Filippo Cucchetto <filippocucchetto@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-30 11:02:31 +00:00
Orgad Shaneh
0aca7561aa ProjectExplorer: Use QEnableSharedFromThis for IDevice
Change-Id: I26d2648f9991fe05f29446ac89109bba3bb77997
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-30 10:52:46 +00:00
Eike Ziller
f840c6ea56 Use std::(make_)index_sequence
Available in C++14 with GCC>=4.9

Change-Id: I2243ebc7ecda172d5b3233fb0346a062f4d6d759
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 10:46:35 +00:00
Eike Ziller
af8812b248 Algorithm: Use decltype(auto)
Avoids some code duplication. Available with C++14 / GCC>=4.9.

Change-Id: Iae90466ec9620ffc84b7a45a55490f5fbc8c5b74
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 10:46:30 +00:00
Eike Ziller
63f66f28ac Use _t versions of various type traits
Available now after switching to C++14 and GCC>=4.9

Change-Id: I44e9859a6abe66db16d77b228466b65eadced8ae
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 10:46:22 +00:00
Eike Ziller
b299ff19ec Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/shared/qbs

Change-Id: Ic39fd1c411632f56312fae31c0c88ebc1098b5a4
2017-01-30 10:55:40 +01:00
Filippo Cucchetto
28d9c305ad Nim: Added support for the Nim compiler inside Kits
Change-Id: I6f9761aac0b0fc02a6974b284a7d600c1ece5b8b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 09:06:49 +00:00
Orgad Shaneh
bb916860ca Gerrit: Outline GerritDialog UI
Change-Id: Iad8d804feb16f8b5318d07f4fdb32d050e0798c0
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 08:59:31 +00:00
Tim Jenssen
000d9cb280 Clang: do not check the order in tests
Change-Id: I6fe93beab931506018f261a8a34fe4c4f51b87e5
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-01-30 08:57:01 +00:00
Orgad Shaneh
b2b1f6bec1 Gerrit: Append " (Draft)" to draft changes
Similar to the web UI.

Change-Id: I596a116a85536c010089afd9c8a0686a75d29dde
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 08:50:01 +00:00
Orgad Shaneh
2def95374d Git: Fix crash on Commit + Push to Gerrit
Task-number: QTCREATORBUG-17634
Change-Id: I60d8067fe9cfc23acb688e06506363bca67ec0a5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 08:41:04 +00:00
Tobias Hunger
af82202274 BareMetal: Simplify RunConfiguration
Change-Id: I73b7e3cb12a884d974719eb762b1542a5bca97cc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-30 08:35:17 +00:00
Tobias Hunger
7649c64ad3 RemoteLinux: Simplify RunConfiguration
Change-Id: I06fad135f77c0d635b9ee98d79ef2bc7f0a27e97
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-30 08:34:29 +00:00
David Schulz
663631f35c Debugger: Replace common qint typedefs before type lookup
Change-Id: Ieba28bab3c603d06caf9abb287189bf87f6dabb0
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-30 08:30:41 +00:00
Eike Ziller
37eddb8ac2 qmake build: Do not require 3rd party plugins to set c++14
Do it in qtcreator.pri instead again, since that is supposed to be
included by projects depending on Qt Creator.
Since we will use C++14 in utils/algorithm.h and other prominent
places, it would be very annoying to require setting C++14 on
all external plugins.

Change-Id: Ie11a30b33c791f3bf6db39fcee454f1e887352c2
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-30 08:21:34 +00:00
Eike Ziller
20670d62ba Update requirements to GCC>=4.9
Change-Id: I34b5dcec552c0af0ce7184a43fa7fba4a75415c4
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-30 08:19:29 +00:00
Nikolai Kosjar
6e06cbd2d6 UnitTests: Silence a warning about empty QTC_REL_TOOLS_PATH
Project WARNING: using utils-lib.pri without IDE_LIBEXEC_PATH or
        IDE_BIN_PATH results in empty QTC_REL_TOOLS_PATH

Change-Id: Ibde3b3810c70dc3ea4f38afa4e9e193e0893c858
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-30 08:14:00 +00:00
Nikolai Kosjar
40f31139e4 CppTools: Remove excess include
Change-Id: Idacd899a206f17f0b023fb7ad0a3b4406d5edbea
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-01-30 08:13:28 +00:00
hjk
30bf801629 ProjectExplorer: Further tree node related simplification
Drop the list sorting and difference generation which is not
needed in the "build from scratch" setup.

This also removes some of the intermediately introduced
convienience functions and fixes a regression that led to
missing project files.

Change-Id: I39d1966324917f466fb347da3a52552393ca4a01
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-01-30 07:56:05 +00:00
Tobias Hunger
468695c30a ProjectExplorer: Add CurrentRun:Env to the MacroExpander
Make RunConfigurations provide %{CurrentRun:Env:VARNAME} via the
macro expander infrastructure.

Change-Id: Ibf2d9d507294f0bc9a51a1521884b364e0c7955d
Reviewed-by: Kari Oikarinen <kari.oikarinen@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-27 15:41:07 +00:00
Tobias Hunger
4672624bdc ProjectExplorer: Add CurrentBuild:Env to the MacroExpander
Make BuildConfigurations provide %{CurrentBuild:Env:VARNAME} via the
macro expander infrastructure.

Change-Id: I1bed8c6aa9003c361a07fa69a5a3840f7a4e0d17
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-27 15:40:56 +00:00
Tobias Hunger
fcc9ccaf6e Report better projectFileName to ProjectPart
Change-Id: I6ebf030869db7b6ce66eecce313524d8c56df259
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-27 14:53:23 +00:00
Tobias Hunger
36a49ed103 CMake: Set project file information (when available)
Change-Id: I854a0207bd8568bc8f324840cba52dfb3ca880e9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-27 14:53:06 +00:00
Tobias Hunger
0656370976 WS-only change
Change-Id: I6140e77735fdb57f6811f73ccf7061eabe7f1d4b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-27 13:38:37 +00:00
Tobias Hunger
eb1748944f CustomexecutableRunConfiguration: Polish a bit
Change-Id: Ia9b365f52c13cbb2654bef8f38162578bcb143ae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-27 13:36:47 +00:00
Tim Jenssen
46f22b58c1 QmlDesigner: remove unnecessary updateActions call
- Core::DesignMode::actionsUpdated comes first

Change-Id: Iaa574872dd75dbbddd9933e496f2b836b782e63e
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-27 13:17:11 +00:00
Tim Jenssen
946d66b500 QmlDesigner: refactor setup/integration code
- moved switchTextFormAction to shortcut manager
 - renamed createDesignModeWidget
 - remove unncessary DesignerSettingsKey::TEXTEDIT_IN_DESIGNMODE
   (supporting it in future would be too much effort)
 - using delayed registration inside QtCreator
   (which does not bring more speed, but more time for the codemodel
    in case of opening a qml.ui file directly)

Change-Id: I1fd05f161e4bf4659c5a2fb09705b1f67d6f8e36
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-27 13:17:05 +00:00
Tim Jenssen
6b3df52690 QmlDesigner: avoid temp QList
Change-Id: I9eb5cc5a3e5527308a4371bc2b6add47d1b3ed7f
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-01-27 13:16:57 +00:00
Tim Jenssen
acbd85388c put debug Context operator where it belongs
Change-Id: I2f38d670a10bbc37c7a62432a1780ede53835160
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-27 13:13:01 +00:00
Robert Loehning
b805639776 Squish: Remove mapping data for outdated versions
Change-Id: I5fc21e9cc4dec44a36b7dc2857423cb8b654bbc6
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-27 13:01:06 +00:00
David Schulz
eaf60c13e8 Debugger: Reset released symbol group to nullptr
Change-Id: I2d70687d35b5beb1954132203ea9826c7943f715
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-27 12:53:51 +00:00
Eike Ziller
c1017b8ad0 README: The required llvm-config is in the llvm-X.Y package
Change-Id: I872a89840aa904c5a4dadd69282f4dd39e320066
Reviewed-by: hjk <hjk@qt.io>
2017-01-27 12:52:35 +00:00
David Schulz
4eb3b3348a Debugger: Unify std::once dumper output
Change-Id: I4bbb14036ce89d8e06b184f33fd2ecfd098f2443
Reviewed-by: hjk <hjk@qt.io>
2017-01-27 12:42:56 +00:00
Christian Kandeler
8d51ba3609 Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: Ia643f577e1a1c00082b57cd7d297f6917910fab5
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-01-27 12:42:38 +00:00
David Schulz
fba8bc25d0 Debugger: Use direct memory access for boost::list items
Change-Id: I1f62581ee752cd4df2e5d1f3e124bf75cbd6a4b6
Reviewed-by: hjk <hjk@qt.io>
2017-01-27 12:32:22 +00:00
David Schulz
52705ad214 Debugger: Default to newer version of boost::unordered::set dumper
Change-Id: I92c14db0b10da8598c80f85525dc641c86689a90
Reviewed-by: hjk <hjk@qt.io>
2017-01-27 12:32:12 +00:00
David Schulz
367bba1897 Debugger: Fix std tree iterator for pairs
Change-Id: Iad39c0c16f642e9126a79d5bdc727620aaaaed2a
Reviewed-by: hjk <hjk@qt.io>
2017-01-27 12:32:03 +00:00
hjk
afceaaef14 Update Russian translation
Task-number: QTCREATORBUG-17647
Change-Id: Ie1fbd67b025ffb8e328ec2db3641ec729e5bc62a
Reviewed-by: Denis Shienkov <denis.shienkov@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-27 12:24:01 +00:00
Robert Loehning
8466f777f5 Squish: Use different function name in tst_CSUP01 on Windows
This reverts 7746c31774 on Windows

Change-Id: I6161320ee97ecfcd2510f73d955346e1bb9ebfc1
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-27 12:14:31 +00:00
Robert Loehning
8681608d8b Squish: Clean up tst_qml_editor
Should have been done in
4b4e5f6990

Change-Id: I0a747ea4bbf0ef02caaf31a14161dced9b4dd806
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-27 12:13:55 +00:00
Robert Loehning
79c91e4c30 Squish: Stabilize tst_HELP06
Change-Id: Id8d642c581b825adc1d958f82280e8bf4f011c41
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-01-27 12:13:42 +00:00
Christian Kandeler
5b67e4de94 QbsProjectManager: Profile some operations
We want to know how much time the various update functions take that run
after a qbs job has finished.

Change-Id: I1bc6d1287108e5d70d15b41f2b544b22e2315a88
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-01-27 12:03:54 +00:00
Christian Kandeler
9d590333df Update qbs submodule
To HEAD of master branch.

Change-Id: Ia5bded717da4154debe4b5e7af916e383ce5a649
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-01-27 12:03:23 +00:00
Alessandro Portale
01ebf1bd7c Icon exporter script: Adapt to Inkscape 0.92's new dpi
Export with 96/192 dpi in order to get expected pixel sizes.

From now on, minimal Inkscape 0.92 is required!

Change-Id: I0cd0548bc64a23c66efe8325cff99a38b55ed90f
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-01-27 09:36:53 +00:00