Commit Graph

50929 Commits

Author SHA1 Message Date
Christian Stenger
e03132f517 Squish: Adapt tst_WELP03 to latest Welcome page changes
Change-Id: Ia62813cf94b31a82fedb191eaf11f752d1d30bf0
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-13 11:58:37 +00:00
Christian Stenger
9f6f5bfee2 Squish: Adapt tst_WELP02 to latest Welcome page changes
Additionally move common used code for interacting with the
Welcome page into separate file.

Change-Id: If863ae529c7c81d095f310f0a34926b324c77fa8
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-13 11:58:30 +00:00
Nikolai Kosjar
c0f2bc254e C++: Sort source files in *.qbs
This makes the diff smaller when adding new files with the wizards.

Change-Id: Iabd35afc32f363c465c8d9b36c45d480ea666627
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2017-02-13 11:13:11 +00:00
Leena Miettinen
c3608ec7e0 Doc: State that Qt Quick Projects cannot be deployed to mobile
...or embedded. Suggest creating an application, instead.

Task-number: QTCREATORBUG-17708
Change-Id: I6b5b1f26bde0d281f162bc68d5cb9088e8fc79cd
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
2017-02-13 10:11:00 +00:00
Christian Kandeler
55a1440afd Update qbs submodule
To HEAD of 1.7 branch.

Change-Id: Iaa54df19b7d636fcb497265c9b2063e52110b232
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 09:14:16 +00:00
Leena Miettinen
11047ad4fb Welcome: Update the Tutorials tab contents
Remove obsolete icons and add an icon for Qt World Summit 2016.

Change-Id: Id87b8b4d3992d4efa50fe4180d3640397cb26ebc
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2017-02-13 08:54:15 +00:00
hjk
cbe30a1cca CMakeProjectManager: Add some soft asserts
The actual problem is fixed by 1f540c6c9, this is to make sure we
don't crash if this regresses again.

Change-Id: Id081ce9a9c3602c3a90216f53d63535097fabd2d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-13 08:47:51 +00:00
hjk
1400522408 ResourceEditor: Simplify Resource tree construction
Instead of keeping track which nodes need to be created, create
the tree on-the-fly directly.

Change-Id: Iebb00c385f2abe42c7fd04547a7af85ad8f8f87b
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-13 08:46:58 +00:00
Leena Miettinen
3858d4c363 Doc: Add licenses to .qdocinc files
Change-Id: Ia20fe2605a6255af24d4334d8289531aaa262511
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-02-13 08:14:53 +00:00
Orgad Shaneh
0c9f23db96 GDB: Fix printing of flag enums
It worked with plain GDB (parse_and_eval), and was broken by
696b2d4261.

Change-Id: Ibc143efdbd90681a2f9f4d84b75063eb98078f2b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-13 08:08:41 +00:00
Orgad Shaneh
ba058f3a29 GerritDialog: Use member initialization
Change-Id: Ic7e4987f1eb14280293d4af4da10dfc4b3efbbf3
Reviewed-by: André Hartmann <aha_1980@gmx.de>
2017-02-13 07:18:18 +00:00
Orgad Shaneh
9c820101cc Debugger: Fix dumper tests
1f29242276 used the correct form for
CONFIG -= qt.

This revealed several cases that are missing CoreProfile configuration.

Change-Id: I8bb6d5156eb6beba91a8df7b948832f1e043d64f
Reviewed-by: hjk <hjk@qt.io>
2017-02-13 07:08:48 +00:00
Filippo Cucchetto
22f5f94ba3 TextEditor: Added missing override in createEditor()
Change-Id: I3b223d13c2a8ec1e278552031ca89432bb1de663
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2017-02-12 21:17:35 +00:00
Filippo Cucchetto
59e27e8ce4 ProjectExplorer: Little cleanup by using Id::withPrefix
Change-Id: I7e42685789e29d795fda23453ca0b047f5b77245
Reviewed-by: hjk <hjk@qt.io>
2017-02-11 16:15:52 +00:00
Filippo Cucchetto
562f2a3fa5 ProjectExplorer: Expose ToolChain type ids as kit features
This should allow wizards to restrict the list of kits based
on a required toolchain

Change-Id: Ic2b76c9146ce65f197f2bacb41138a2bf9815e65
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-11 16:15:03 +00:00
Jake Petroules
b0229acd54 Clean up projects wizards and support for Qbs+CMake+qmake to all
Task-number: QTCREATORBUG-17308
Change-Id: I5d320a52f2cc5c0adbaf513985e4be0d75219a7d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 18:19:57 +00:00
hjk
ee5d15a0b5 ProjectExplorer: Clean up projectnodes.h
Remove unneeded declarations, sort includes.

Change-Id: I38f26366ada48cd99d551dc0283fb1f1e834db12
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 17:26:35 +00:00
Tim Jenssen
42061e8cdc ProjectExplorer: fix possible crashes
Change-Id: I0b06e31f07ddf9c052f360bb66ac2330cc21d7b6
Reviewed-by: hjk <hjk@qt.io>
2017-02-10 16:26:25 +00:00
hjk
a2c6e28478 ProjectManager: Show .qrc contents again
This fixes the second regression introduced by 04a525877b.

Change-Id: I5c5c72a036f139fa564c40e95ebf6acafc99792c
Reviewed-by: Mathias Hasselmann <mathias.hasselmann@kdab.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 15:31:00 +00:00
Konstantin Podsvirov
1f540c6c9d CMakeProjectManager: Fix findCMakeNode function
Via CMake project we can add subdirectory like:

> add_subdirectory("subdir/subsubdir" "enotherdir")

Where "subdir" my not contain "CMakeLists.txt" file.

And intermediate directory can contain CMakeLists.txt file
that is not a part of the root node.

This change fix it.

Task-number: QTCREATORBUG-17721
Change-Id: Ice9fba1ca5a979955ec8f44324f75f3bc16ee198
Reviewed-by: hjk <hjk@qt.io>
2017-02-10 14:50:41 +00:00
James McDonnell
f163cdc9fe Switch QNX tool chains from hard-coded to detected ABIs
Move the target detection code from the QnxConfiguration class into a
separate function that can be used by the QnxConfiguration code and
the QnxToolChain code.

Move some resetToolChain calls after setSdpPath calls.  QNX ABI
detection depends on the SDP path.

Change-Id: I7417a5a1064a77edfb113d9d0010f1e061b81ca6
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 13:46:14 +00:00
hjk
46e4ecbd44 Make Creator compile without Qt tools in some configuration
Needing to compile Qt tools is a bit of a chore (and at some point a
diskspace issue) when building/starting Creator as sanity check for
comparing different compiler optimization settings.

This is not an officially supported configuration.

Change-Id: I628e33eb7137f09ecfebbd27453de548bac2fde5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-10 13:30:53 +00:00
Christian Stenger
eb4b4d7be2 Squish: Fix iterating over debuggers
Change-Id: I6648e74f8f8e0c581a4bd4ba4b3606e3f18a5af5
Reviewed-by: Robert Loehning <robert.loehning@qt.io>
2017-02-10 12:16:24 +00:00
Tim Jenssen
d864bfc529 ResourceEditor: use const reference for QMap argument
Change-Id: I04d2c7de47bc91fd8f6fa355a03fc0d19681f451
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 12:05:57 +00:00
hjk
54248a92e7 QmakeProjectManager: Add .pro files to tree unconditionally
This fixes a regression introduced by 04a525877b.

Change-Id: I19467bf802b020fedd48df85051aa3944fd9a329
Reviewed-by: Mathias Hasselmann <mathias.hasselmann@kdab.com>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-10 11:24:46 +00:00
Tobias Hunger
4f40d7778d CMake: Introduce project importer for cmake projects
Change-Id: Ie215e1c3f0286f6d98d10865e2b0a16b01391cd5
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 10:34:07 +00:00
Tobias Hunger
c09b3709b9 CMake: Reimplement CMakeCache.txt parsing in BuildDirManager
The CMakeProjectImporter will need that in addition to the tealeafreader.

Change-Id: I453a7a124b5303e163e9c85bc3fc215215617119
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 10:33:56 +00:00
Tobias Hunger
87504eac2d ProjectExplorer: Handle toolchains at the ProjectImporter level
Change-Id: I941d2eaa6fdd6135b49b51e8f685fb1d0d8b652c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-10 10:33:45 +00:00
Tim Jenssen
587b2cbe0f ProjectExplorer: fix crash while canceling a process
m_process was nullptr at this moment

Change-Id: If990eb7034c3bacc1ace7fd607d0247aec8aeb68
Task-number: QTCREATORBUG-17698
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-10 10:02:06 +00:00
Eike Ziller
2b94bdaa2e Tests: Fix build on macOS without command line tools installed
Overwriting QMAKE_CXXFLAGS will remove the needed isysroot flag
for finding the standard headers.
Explicitly settings the standard lib on macOS is also no longer
necessary.

Change-Id: I8a5ae5df485785b473a435c7feb9f8fb3295952b
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-10 07:59:40 +00:00
Thomas Hartmann
eaedebb7f1 Fix linkage on msvc2015
This does not link without this explicit compare
function after the QLatin1Strings have been removed.

Change-Id: I09cd323f850954eedefed6ee58597cb0ef3ab026
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 15:18:48 +00:00
Thomas Hartmann
b8f4445ea1 QmlDesigner: Adding logging to form editor
These logs are useful to debug hints and form editor
behavivour. Adding more if required.
I cleaned up the include order.

Change-Id: I39b8c4e215ba4e6a524f4b00828156d6e56d8eb7
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:35 +00:00
Thomas Hartmann
c18186275a QmlDesigner: Adding QmlItemNode::isInStackedContainer
Change-Id: I8a24185e71cf92635bc10876f8cf59240e1b309b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:19 +00:00
Thomas Hartmann
3b0a99362d QmlDesigner: Adding hints for StackLayout
Change-Id: I3885662bf50a10321cc756a9acd8dada4bfa7b73
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:09 +00:00
Thomas Hartmann
74a63be6d0 QmlDesigner: Do not return invisible items as containers
If an item is invisible then it is not an intuitive container.

Change-Id: I1f978be98b7330848e19192843188331438b98ba
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:05:01 +00:00
Thomas Hartmann
94c3473fe7 QmlDesigner: Adding missing const
Change-Id: I3c1b05da5c6a66f8f5b87dc2525f66ce85442d3b
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 14:04:51 +00:00
Christian Stenger
fe16f0b38e Valgrind: Modernize code
* QLatin1String
* initializer list

Change-Id: I6654fcd8b8ec513d1802a4ba3fe3f5833a29136b
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 13:55:00 +00:00
Christian Stenger
e952b9d4f3 Replace occurrences of QStringList() << pattern
Change-Id: I598d8c06193c2e72435a76165d1afc9ee3465b48
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 13:17:49 +00:00
Marco Bubke
7f8e60b289 UnitTest: Improve linking time under linux
Change-Id: Ia1f90d0ec208535a75d187875f0969bfca65b318
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2017-02-09 12:34:51 +00:00
hjk
04a525877b ProjectExplorer: Merge FolderNode's m_{file,folder}Node fields
One step closer to direct use of Utils::TreeNode.

Change-Id: Icd0dfd2fa4d12c2572a68f61ae43c5e906956a0e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-09 12:15:23 +00:00
Thomas Hartmann
719ff7047b QmlDesigner: Allow property name "type"
There is no reason to not allow "type".
This was a leftover we store the type/className in
"className".

Change-Id: I6a760e9df522fcda42fc2d18c06aaaac15523cd6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 11:45:52 +00:00
Andre Hartmann
95e6dfe8e0 Git: BranchDialog: Disable buttons when selection disappears
Steps to reproduce the old and wrong behavior:
1. Open branch dialog
2. Select a branch
3. Select checkout
4. Branch is checked out, but no longer selected
5. Buttons like "Log" stay enabled, but don't serve
   any purpose

Change-Id: I3974b7cb87553d1ff57fd5578b908f02c949a509
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-09 11:26:39 +00:00
Vikas Pachdha
c97a54cebf Android: Fix crash on using Re-run app
Collaterally busybox detection(dead code) is removed

Task-number: QTCREATORBUG-17691
Change-Id: I50de3e4ad299c741c9b1afaddb22209b409acccf
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
2017-02-09 11:22:48 +00:00
Tobias Hunger
35118db5be TerminalAspect: Initialize bools
This fixes the problem where sometimes you need to visit the project
page to make run in terminal work.

Task-number: QTCREATORBUG-17608
Change-Id: I681378cdaa19becf532666401e8695c246e1f5bd
Reviewed-by: hjk <hjk@qt.io>
2017-02-09 10:10:10 +00:00
Tobias Hunger
0e25c08942 CMake server-mode: Use more robust logic
Use a more robust logic to find existing CMakeListsNodes again.

Change-Id: Id26031c1164eb6271b74ccf39071219938b285fc
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 10:08:13 +00:00
Tobias Hunger
c20ae42e20 CMake: Show all headers below an included directory in server-mode
Change-Id: I2ff0018a3c92ccb55eca957624cc44f941ec866c
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 10:08:07 +00:00
Tobias Hunger
bc598ec480 CMake: Fix project name selection
Change-Id: I03740045d817762ef91cf6399ac449c5af67b278
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 10:07:57 +00:00
Tobias Hunger
a9947c24a9 ProjectImporter: Add helper method
Add a simple helper method to extract the project directory.

Change-Id: Iafb9e8f5611a6fc5941c9bb3005a265e785138a2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:55:08 +00:00
Tobias Hunger
4bbac74a9d CMakeBuildConfiguration: Add helpers to deal with CMakeBuildTypes
Add helpers to deal with CMakeBuildTypes and to map them to
BuildConfiguration::BuildTypes.

Change-Id: I03ce9e83b5d044c3d94d29c44cc0a28560b206f6
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:54:57 +00:00
Tobias Hunger
fe695bd2ba ToolChains: Implement detection of toolchains based on compiler path
Do not bother to implement this functionality for toolchains that are
assumed to be completely auto-detected (e.g. MSVC) or require
infrastructure around the toolchains to be useful (e.g. embedded platforms).

Change-Id: I3e7dfe2f3c30a0d2d2bb16364895151f95b16423
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-09 09:53:45 +00:00