Commit Graph

54723 Commits

Author SHA1 Message Date
Tobias Hunger
72f769c9ba Qbs: Make QbsNodeTreeBuilder handled uninitialized project
Make QbsNodeTreeBuilder handle uninitialized projects more gracefully.

Return a nullptr, so that the ContainerNode with the main project file
is used in that case.

Change-Id: I7ab90231c3fc24b7b676326f98f79c4b79018327
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-28 14:17:03 +00:00
Christian Kandeler
b5c3bd7a64 Update qbs submodule
To HEAD of 1.8 branch.

Change-Id: I519b9035bfe460a0b9369fdf208a04d8665f9d0d
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
2017-04-28 14:16:15 +00:00
hjk
6e990f96c6 Debugger: Remove DebuggerRunControl
Use plain RunControl + DebuggerRunTool combo instead.

Change-Id: Ib71b5eab50da667b9d71dcc6689d2643ad8ecdee
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-28 12:42:29 +00:00
Tim Jenssen
6e2756244d QmlDesigner: add init root element size settings
Task-number: QTCREATORBUG-17965
Change-Id: Id2a3bef8d4becdecc9f358021a18feb2353743b5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-28 08:58:27 +00:00
Tim Jenssen
a991ecec95 QmlDesigner: use initilizer_lists for pairs
Change-Id: I3a1ef67d8af255604494695807331576540b8afa
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-28 08:58:19 +00:00
Christian Stenger
10c285db86 CMakePM: Fix compile using Qt5.6 and gcc4.9
Change-Id: I192a213a8825c636dc42702a32a065ad541bd2af
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
2017-04-28 06:30:29 +00:00
Tobias Hunger
f0d14da7b9 Revert "CMake: Use canonical source directory when talking to cmake server-mode"
This reverts commit b2fe7c9ad1.

QTCREATORBUG-18105 reports that this makes cmake work, but then in later stages files get filtered from the project tree as paths no longer match up.

Change-Id: I9484c7311a15a0397d9078ed60c8a65ef82f8449
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-27 09:51:45 +00:00
Tobias Hunger
11c87bd918 CMake: Unify setup of default build target in CMakeBuildStep
Change-Id: I3d087356a4dd5a3b8ab07d5b64cd5aeb93ae0f47
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-27 09:51:16 +00:00
Tobias Hunger
10d6a3bc3d CMake: Fix signal emission from CMakeBuildStep
This fixes the summary in the UI.

Change-Id: I8eb93a1785d8788d9021e06b75a10cb36f119f0f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-27 09:51:10 +00:00
Tobias Hunger
d8d2dc6adb CMake: Report special utility targets in BuildDirManager::buildTargets
Report special utility targets like "all", "clean" and "install" from
the BuildDirManager and update UI accordingly.

Change-Id: I01d0dcfa23d5bddc124c8f9ee1040475184c9c1e
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-27 09:51:01 +00:00
Tobias Hunger
e7b4e91fec CMake: Define an "install" target
Change-Id: I036ddc3bfb91fc3a5a9e8923db2befbf60e89a77
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-27 09:50:54 +00:00
Tobias Hunger
1829eb6915 Qmake: Update QmakeRunConfiguration in constructor
Update QmakeRunConfiguration's aspects in the constructor. This is necessary
since this RC is only created after the project was parsed for the first time,
so the logic tied to the pro-file parsing updates did not work the first time
round.

Also move the logic from the UI into the RC itself.

Task-number: QTCREATORBUG-18059
Change-Id: Ifa6eeade549ef33aae5c825238fc8a1d76604195
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-27 09:50:13 +00:00
Orgad Shaneh
edbaea4f60 C++: Use Utils::FileName for Usage::path
Change-Id: I1d22333ad60d229202db5d372d00019b5870e60f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-27 08:34:59 +00:00
Orgad Shaneh
2f7384dd27 C++: Use direct member initialization in FindUsages
Change-Id: Ibe717dc587d817d53356771507b4aa3072554cb1
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-27 08:34:51 +00:00
hjk
cd7ab5d3ed WinRt: Remove direct debugger dependency in WinRtRunner
Not needed anymore after d049a5be19.

Change-Id: If968ac763863b94274629fbfbbfe5c91b32d1488
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-27 08:12:12 +00:00
Tim Jenssen
19239e3770 QmlJs: use initilizer_lists for pairs
Change-Id: I0386d57ad3549814ab197c4e24549705e061c95a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-27 07:45:06 +00:00
hjk
c2ebce6849 Debugger: Reduce explicit DebuggerRunControl use
Aim is to replace it with its ProjectExplorer::RunControl base.

Change-Id: I30f837050e7c016887dc4b6cfef10b947f4f88ed
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-27 07:43:30 +00:00
Tobias Hunger
25a507d12f CurrentProjectFind: Forward displayNameChanged() signals from project
Forward the displayNameChanged() signals from the current project so
that the project name gets updated in the Advanced Find pane.

Change-Id: I3ed77b7f8e6f2796b890f2de52cf9665404aeecf
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Florian Apolloner <florian@apolloner.eu>
2017-04-26 14:22:46 +00:00
Tim Jenssen
0de18abbc2 QmlDesigner: use initializer lists
Change-Id: Ibdc46d30ad3f2b703d4cbdd796a1032030bd17cd
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-26 14:18:48 +00:00
Tim Jenssen
5ca34bd3f3 CppDocument: use initializer_list for keys
Change-Id: Ib2c407b642599cbe9da416647188e2457ec16906
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-26 14:16:50 +00:00
Tim Jenssen
7ed0385e1b QmlDesigner: fix pathes -> paths and use initializer_lists
Change-Id: Ifa155bebd982e798d3ac576cd07ee54d816f5aae
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-26 14:16:23 +00:00
hjk
5953507828 RemoteLinux: Base AbstractRemotetLinuxRunSupport on PE::TargetSupport
This essentially just puts the data members and most of the original
interface on the proper, i.e. the 'target', side of the tool/target
divide. Since the SimpleTargetRunner base already has an
ApplicationLauncher member, this can be used directly.

State handling and coordination between tool and target runner parts
stays as before for now, with unchanged 'custom' transition logic.
The plan here is to remove the custom state handling later, including
the two remaining cases of direct targetRunner->toolRunner calling
(startExecution, and adapterSetupFailed) for which this patch here
temporarily uses signal/slot connections.

Change-Id: I664f2e333b48b582befd0531a17d4008acac7c4c
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-04-26 12:02:03 +00:00
Nikolai Kosjar
dce9aa217c Sqlite: Fix build on macOS
Change-Id: Ib0f98e528ecb619066e48cd75ee92de7cb61b74e
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-04-26 11:50:38 +00:00
Tim Jenssen
2c3dbabb91 QmlDesigner: improve locateQmlFile()
- use const and static where it is possible
 - use arg() to merge the file name string (shorter)
 - introduce  possiblePaths list to get it while debugging

Change-Id: I64858540c5d9d9cfde3094de8e07dda744d0f43d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-26 11:22:40 +00:00
Nikolai Kosjar
53b80e9b51 Clang: Check for nullptr
Task-number: QTCREATORBUG-18087
Change-Id: Icf8100d84a415995a8d913bc776699c895882e97
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-26 10:56:36 +00:00
hjk
f38f120031 Debugger: Add a dumper for QLazilyAllocated
Task-number: QTCREATORBUG-18060
Change-Id: I5eec7bd10f54278a1d40cf9fce97fba56f4aa2e4
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-26 10:51:39 +00:00
Leandro T. C. Melo
227d39685a C++: Fix broken lexing for floating-points
Now, I can have my Pi (3.14) typed as double.

Change-Id: I33ee579e56d3c735f88278f1868d8739ef277ad6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-26 10:30:46 +00:00
David Schulz
0ecc044478 TextEditor: Add delete(Start/End)OfLine actions
Task-number: QTCREATORBUG-18095
Change-Id: I75e6141687ba5e96ef59384b302357700f79dd55
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-26 09:48:43 +00:00
hjk
81d9315587 Debugger: Add a boost::variant dumper
This requires making template argument extraction a bit more robust

GCC 5.4.1 created debug info only reports the first argument for
boost::variant<int, bool>:

    #include <boost/variant/variant.hpp
    int main() { boost::variant<int, float> v = 1; return 0; }

    py print(gdb.parse_and_eval('v').type)

      -> boost::variant<int, float>

    py print(gdb.parse_and_eval('v').type.template_argument(0))

      -> int

    py print(gdb.parse_and_eval('v').type.template_argument(1))

       -> Traceback (most recent call last):
          File \"<string>\", line 1, in <module>
          RuntimeError: No argument 1 in template.
          Error while executing Python code.

Change-Id: Iedca8b073078c93449ab61bb2cab05d6cd9803ba
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-26 09:23:18 +00:00
Tim Jenssen
12c65d2650 QmlDesigner: improve fixResourcePath()
Change-Id: I675dfe507dbe2989b0a015baf75d0423ba088993
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-26 09:22:25 +00:00
Robert Loehning
1ee59f1879 GccToolChain: Fix detection of 32 bit MinGW on 64 bit system
Change-Id: Ic5f8651c8e0f9fb61c3ba94aa88309af2c585ca4
Done-by: Tobias Hunger
Task-number: QTCREATORBUG-17989
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-26 09:21:51 +00:00
Orgad Shaneh
83b7469932 SmallString: Enable alignas(16) on MSVC-64
Change-Id: I2af5a7ff26a80167d7cb95daf1d7fa5963e9097b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-26 09:17:13 +00:00
Orgad Shaneh
2129ffc954 Clang: Fix MSVC64 warnings
size_t -> uint conversion

Change-Id: Id86168a9e2b9b7f9793cedccc41a6d15c0a8dfd4
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-26 09:03:47 +00:00
Orgad Shaneh
e1660a18cf Remove workarounds for unsupported compilers
Change-Id: Ie28ff761b0bae13c6ebdf7dd649cfbba28e0fc2c
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-04-26 08:27:31 +00:00
Eike Ziller
531fba61f0 Merge remote-tracking branch 'origin/4.3'
Change-Id: Ie18d823d0940113e8a78c81204b7a7ca07a060ba
2017-04-26 10:16:38 +02:00
Eike Ziller
73f2c0f4e8 Allow giving TextEditorFactory custom CommentDefinition
It was not possible to set custom comment styles.
Also simplifies the code for the predefined styles.

Change-Id: Id7f345d65b747bfac5a15e3eb15cd2beb106b281
Reviewed-by: David Schulz <david.schulz@qt.io>
2017-04-26 07:34:29 +00:00
Leena Miettinen
b6bf1fdf38 Doc: Describe adding and resetting CMake build steps
Also update the screenshot.

Change-Id: Ic717b01baf46bc83b0a1abe3002a3eb487fb68e3
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-26 07:28:53 +00:00
Eike Ziller
57b3f7debb Fix version information
master will become 4.4

Change-Id: I2c32496cdf9bad1c46d89e71145034e248e78171
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-04-25 15:43:11 +00:00
Tobias Hunger
b2fe7c9ad1 CMake: Use canonical source directory when talking to cmake server-mode
Use the canonical form of the source directory when talking to cmake.

Cmake will save the canonical source directory in its settings and will
fail if that is not passed in again.

Change-Id: I1ea578053c8d5136d09b3f503443bd0188ebca4f
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 15:31:21 +00:00
Tobias Hunger
b913e9d548 ProjectExplorer: Make imported buildconfiguration active
Make the new buildconfiguration active after it was imported via
Project Mode. Before the buildconfiguration was added but the
current one was still set, which lead people to believe that the
build directory was wrong.

Task-number: QTCREATORBUG-18082
Change-Id: I10412d94326d9e21820dfcac89adbe2c5da948ae
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 15:31:14 +00:00
Tobias Hunger
eb8075f569 CMake: Compare canonical paths when checking source directory
Compare the CMAKE_HOME_DIRECTORY to the canonical project paths during
cmake project import. CMake makes sure to store the canonical path
there.

Change-Id: I4ae3ad1f8fab66a50ba98d4266c78cdb4d21f2ea
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 15:31:06 +00:00
hjk
77f8a4168f ProjectExplorer: Try harder to sort ProjectTree entries
Task-number: QTCREATORBUG-18081
Change-Id: Ie924a5969ee38b1a634fcd7cbbc46c0540f9d8a4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-04-25 15:25:35 +00:00
Tim Jenssen
6a6dffb9c6 QmlDesigner: improve check class hierarchy code
- improve existing superClasses() via using transform (internal it uses
   reserve, shorter, ...)
 - remove unused superClassNames() if necessary it can be done by a
   simple transform call
 - introduce and use classHierarchy() and fix foreach loop which was using
   wrong "modelNode" instead of "superClass"

Change-Id: Ia52bcbd322f3a047a020faf4a67aca2a1b8fd19a
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2017-04-25 15:14:23 +00:00
hjk
c5d37af0e0 Debugger: Some support for 'long double'
Task-number: QTCREATORBUG-18023
Change-Id: I06783541668b95711cb5a45bf689c43b348ff624
Reviewed-by: hjk <hjk@qt.io>
2017-04-25 15:00:59 +00:00
Eike Ziller
56233f67e1 Merge remote-tracking branch 'origin/4.3'
Change-Id: I01d7d8aa282f2bca94f85f55c832c76672e229f7
2017-04-25 16:15:04 +02:00
Eike Ziller
e574860cf0 Show "display" version number in documentation
I.e. 4.3.0-rc1 instead of 4.2.83

Change-Id: I67feebc9071a8a08b5ac4c701017095e28deaa13
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
2017-04-25 13:58:53 +00:00
Eike Ziller
f901cbffba Merge remote-tracking branch 'origin/4.2' into 4.3
Change-Id: If2076ea858d166093c37e9cf52d38f3ad9115012
2017-04-25 15:33:59 +02:00
hjk
1a4531dffd Debugger: Split a long line
Change-Id: If791d45c59e4aadce0c46886e238955891b27a49
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-04-25 13:26:51 +00:00
Thomas Hartmann
56e1749599 QmlDesigner: Do not override home and end keys
Those are not used and will not be used by the designer
and user reconfigure them e.g. on macOS.

Task-number: QTCREATORBUG-17968
Change-Id: I39d679cbce60de4c6951a82fa12d3c7c4fc630f3
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 12:57:12 +00:00
Thomas Hartmann
2ad7b7bfcc QmlDesigner: Fix glitch in Add TabBar
With Qt 5.9 we have to first anchor the TabBar.
Otherwise the tab buttons are not layouted properly.

Change-Id: Ia20f2f6bbe8659f3b0be36ae3b56e8ce07b2dca1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-04-25 12:48:23 +00:00