Commit Graph

50929 Commits

Author SHA1 Message Date
Tobias Hunger
f27b332f9c CMake: Always put in a CMakeLists.txt file
Even if there was none found by the project reader. This can happen
when the cmake binary can not be started at all with the server-mode
reader.

I wanted to avoid just creating this node as that does mess with the
expansion state of the tree. But considering that we know that the
tree is empty otherwise that should actually not be a problem.

Change-Id: I5ae5ed3e2fa7eebdfc1f9b7d55d70417abfcd125
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:25:30 +00:00
Tobias Hunger
8f885a5b2e CMake: Fix WS in servermode reader
Change-Id: I797d3c7025ee43f722ed137d911c58acb4b8e1f0
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:25:23 +00:00
Tobias Hunger
b11726bf05 CMake: Do not list <Build Directory> twice
Do not list <Build Directory> twice when switching from a temporary
build folder to the real one.

Change-Id: Id7d5f4a4b48d6c63dd4c7da2932b6a857ff0c7f7
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-12-21 15:25:19 +00:00
Ulf Hermann
35782c8e9e QmlProfiler: Drop some useless members from statistics view
Change-Id: Ic116ecaa0cb6bf5d17b4351bd751a013cd5b9636
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-21 14:36:30 +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
879aa21063 SessionManager: Make session node a unique_ptr
Change-Id: Ic11679c409305a5f117316114e9ffa3d82475ceb
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:24:55 +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
Tobias Hunger
5d8134f57c ProjectTree: De-duplicate functionality
Change-Id: I465e07c0764ca3dcbf6a6082670b140eb2b01374
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:22:41 +00:00
Tobias Hunger
63cf5b8ad6 ProjectExplorer: Use more const
Clean up action update and use more const variables. Spread some
const over other code, so that const variables can actually be used.

Change-Id: Ia814900ddff294aeafedb2a223d3705990f9b7c1
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:22:26 +00:00
Tobias Hunger
d8dc5fcd8a ProjectExplorer: Disable "Set active project" action for active project
Task-number: QTCREATORBUG-17453
Change-Id: Iddf4f539e69054752521af8fa074c45df17bf194
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:21:50 +00:00
Tobias Hunger
82c1488bcc ToolChains: Make language part of the default toolchain name
Change-Id: I9f8a4ad79316d0cb6e0de40fa4a8b9dd4fa6e33d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:21:39 +00:00
Tobias Hunger
c41404728a CMake: Always list CMakeLists.txt files
Always list CMakeLists.txt files, even if CMake thinks they are part
of its own modules. This unbreaks opening the cmake project with
a cmake built from those sources.

Change-Id: Ia7245aa0fa39854fe228cdff75b2256115545b39
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:21:06 +00:00
Tobias Hunger
1b2fc1c815 CMake: Pass const QList<const FileNode *> to Directory Readers
This makes sure they need to copy whatever they need.

Change-Id: I767ac0c5f54ca1f9f46acdefe4bd7fea35657312
Reviewed-by: Alexander Drozdov <adrozdoff@gmail.com>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 14:19:36 +00:00
Thomas Hartmann
a347768488 QmlDesigner: Remove duplicates from auto completion
Change-Id: Iedc308543a4f5101a82d4924a00b82d0e2070587
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 11:58:57 +00:00
Thomas Hartmann
87eeb72e68 QmlDesigner: Fixing transaction
We have to commit the transaction inside the try block.

Change-Id: I7f25df144fbd4fc6cad81b4fdc96198e40b54b36
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 11:45:11 +00:00
Thomas Hartmann
87ac4cfafe QmlDesigner: Implementing gui for changing type
This implements the gui to change the type of an item.
Double click the type name in the property editor
to change the type.

Change-Id: I071ad203394691cc6b44f4336d483c473366fc72
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 11:45:04 +00:00
Tim Jenssen
75f867b9bf QmlDesigner: Implementing changing the type of a node in the model
The type of a ModelNode can now be changed in the model.
The rewriter can already handle the case and the NodeInstanceView
does a reset.
We still have to expose this new feature in the UI.

Change-Id: I9bc405d40b123f257324ba582a4451fbd395f24f
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-21 11:44:57 +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
Ulf Hermann
31e2fcc893 QmlProfiler: Avoid QHash::equal_range()
It was only introduced in Qt 5.7.

Change-Id: I5f810c7244b8e8551c3249d8a8f7c6625185692e
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-21 09:28:59 +00:00
Filippo Cucchetto
2b159ac9c9 Nim: Fixed missing update of project files on add and remove
Change-Id: Iadbd5b9b04dcb16f53a16263f94f8f44835e5793
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-20 17:04:38 +00:00
Tim Jenssen
6fd185d32d QmlDesigner: remove unnecessary argument
Change-Id: I57bfc67dd7bc5f28b09f9951b188a584a7e9609d
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 16:56:01 +00:00
Tim Jenssen
f8618740a8 QmlDesigner: fix make check at qmldesigner tests
Change-Id: Ibadfb2f37c5b67fd5e12bcad4180e68aa8843aa6
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 16:55:38 +00:00
Tim Jenssen
9de96a9997 QmlDesigner: just skip not working test
Change-Id: I90b279a16a082d4dbb6e5bc45ae1a573d2f85bee
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 16:55:31 +00:00
Nikolai Kosjar
186368c202 UnitTests: Disable known to fail tests for Windows
So we can easily verify if other changes break anything.

The disabled tests should be all related to the by default enabled delayed
template instantiation on Windows, which is necessary to parse windows headers.

The disabled tests can be run with --gtest_also_run_disabled_tests or by
setting the env variable GTEST_ALSO_RUN_DISABLED_TESTS=1.

Change-Id: I040d881ff0a3fbf5fe85c0b3d1b8e7b0959d1b9c
Reviewed-by: Marco Bubke <marco.bubke@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-20 16:29:58 +00:00
Eike Ziller
589fedf455 Merge remote-tracking branch 'origin/4.2'
Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/projectexplorer/kitinformation.cpp

Change-Id: I94299b069418586db97d1d596a252794e4037556
2016-12-20 17:14:19 +01: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
hjk
a66fb3f690 ProjectWindow: Remove one level of layout in build and run settings
This does not make a visual difference.

Change-Id: Ic88dea0e0905be74733603a1ae24caa3afa6113d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-20 15:15:35 +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
Ulf Hermann
fcb38d1443 QmlProfiler: Make various primitive types Q_MOVABLE_TYPE
Change-Id: I08c37b33fcc2ec8c3610d52a55571878ff8bdc7d
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-20 13:36:18 +00:00
Ulf Hermann
5479143bde QmlProfiler: Simplify details rewriter
There is not need to constantly loop all the requests. We can simply
hash them by file name. Also, we only need one container for file names
and requests, and we don't need to construct a QTextStream, just to do
QString::mid(), and the connecting and disconnecting to/from the QML
code model needs to be centralized.

Change-Id: I6a887f3375f0534e4b8fab6613882038ea4ddf43
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-20 13:36:14 +00:00
Ulf Hermann
ee766f6d52 QmlProfiler: Remove pimpl pattern from details rewriter
It's internal, so we don't need to hide it behind a d pointer.

Change-Id: Ib5b7ac790a1c143414a7ed11e06a5d8a9464de55
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-20 13:36:09 +00:00
Tim Jenssen
0a30595107 Wizards: remove qtquick1 extension
Change-Id: I3b730e5ffd398462e6a41e0c0c20ab3506e1745a
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
2016-12-20 09:42:28 +00:00
Thomas Hartmann
26d2f62f7e QmlDesigner: Fixing z-order issue
Even if directUpdates() is true we have to
append the node to the vector and notify, that
the chidlren might have changed.
Otherwise the z-order in the form editor might be updated
incorrectly.

Change-Id: I0697044200c5bb503f8e8d265796a14756305991
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-20 09:41:05 +00:00
Thomas Hartmann
003a8985a2 QmlDesigner: Adjusting tests
We do not allows ids like "text" and "item" anymore,
since they are ambiguous. This patch adjusts a couple of tests.

Change-Id: I93a1404c052a8f1d302c179141c6feb35e83afc8
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-12-20 09:39:56 +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
Ulf Hermann
5ec8cb437a QmlProfiler: Apply some coding style
Change-Id: Id214986aaf6c7b0de50fdba2e45d8d0a309dabc3
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
2016-12-20 09:14:23 +00:00
David Schulz
3c31692669 Debugger: Add a TypeDef construct to dumper test
Reducing the amount of duplicated checks and skip messages.

Change-Id: If7bb2057ef153c3829f28e131a77765fbacccc40
Reviewed-by: hjk <hjk@qt.io>
2016-12-20 06:12:09 +00:00
David Schulz
927df87f32 Debugger: Add engine to context of the dumper test
Change-Id: I52fa0281ef6911aaafbb7622a811fe8a0b78a8ea
Reviewed-by: hjk <hjk@qt.io>
2016-12-19 16:33:54 +00:00
Christian Stenger
c14c1cfc16 Dumper: Fix expected symbol when using procedure linking table
Change-Id: Ib0aee418d515d58e6ad949a7cc86b21edb3bed80
Reviewed-by: hjk <hjk@qt.io>
2016-12-19 16:31:28 +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
David Schulz
f2261e4661 Debugger: Adjust dumper test to cdb python dumper 2
Change-Id: I49f425484f270551ffef4281b70f10c8cad02030
Reviewed-by: hjk <hjk@qt.io>
2016-12-19 13:30:29 +00:00
Ulf Hermann
6fa4722020 Timeline: Use formatTime also from QML
Change-Id: I14c8e8a216008c2dafaa2d42bd3237d33cc2b781
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-19 13:24:23 +00:00
Ulf Hermann
18332d15b5 Timeline: Move printTime() into Timeline and add hours, minutes, nanos
We should use it for all time printing instead of duplicating the code
everywhere.

Change-Id: I530baa31fd7044aefce6201fec0ab27c99a61a1d
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
2016-12-19 13:24:16 +00:00
David Schulz
c2b89ae3b2 Debugger: Workaround missing bitfield cdb api
Change-Id: Ifb34a3e8adaf11c5c82ea822a9a332ca7fb1f15e
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-19 12:41:00 +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
David Schulz
ab1b631d76 Cdb: Use decimal prefix for frame number
Change-Id: Ie6e30a04009db4e75e001d2f0e17a2d2ab10d778
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-19 11:25:58 +00:00
hjk
ffbe6148e8 Debugger: Inline putStringValueByAddress into its only user
Change-Id: I858f113507ad5712962dc6568e28230ff6dc2916
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-19 10:37:32 +00:00
hjk
fb57391767 Debugger: Make gdbbridge fetchVariable output similar to lldbbridge's
Change-Id: I11fc7d163dbd6b7deb5e88cac65dc61df3352411
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-12-19 10:37:16 +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