Commit Graph

901 Commits

Author SHA1 Message Date
hjk
6fc03ac621 QMake: Simplify QmakeProject::creationIds use further
We always operate on specific types of proFiles, knowing the types
suffices as interface.

Change-Id: I5ffe8862ae31234843a71bdae537825b37ccd311
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-02-28 16:14:50 +00:00
hjk
b45c709dff QMake: Centralize determination of available creationIds
No need for each target to do essentially the same.

Change-Id: I76b6a0f2d064d7721f4ebe676f6efe12d3b5f87c
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2017-02-28 12:19:11 +00:00
Tim Jenssen
2631ffabd5 Remove spaces in initializer lists
Format initializer lists code style like.

Change-Id: Ib82c235e4ba7dc75ee96a7abc0c47eff7b0a9013
Reviewed-by: hjk <hjk@qt.io>
2017-02-22 16:25:09 +00:00
Tobias Hunger
f9eab73dad qmake: move over from QmakeProjectNodes to QmakeParserNodes
Change-Id: Iab87e0c248b0f651a1774336c3bddf83baa9d057
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-22 16:00:49 +00:00
Tobias Hunger
8f0697e33d qmake: Unify TargetInformation and TargetParserInformation again
Change-Id: I00fc6e99e55684e67e5240c539002b13f4541286
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-22 13:19:20 +00:00
Vikas Pachdha
00d424eadb iOS: Extend SimulatorControl
Add new API's to extend iOS simulator support in Qt Creator

Task-number: QTCREATORBUG-17602
Change-Id: I7e949762a7740f2ffb927f25f327b3e82cd8e180
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-15 12:23:41 +00:00
Tobias Hunger
086733a2c9 qmake: Use ProjectType enum consistently
Change-Id: I633a7150202fcbf420a33b4173d2b4451f46eb11
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-02-14 15:40:11 +00:00
Vikas Pachdha
b2a33d3118 iOS: Extend the information cached for simulator
Change-Id: Ia2bc421b2af7d1e82d48bbd9d7914f177fef30d0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-14 14:57:20 +00:00
Christian Stenger
2475da1bb5 Replace some more occurrences of QStringList() << pattern
Change-Id: Ic7193ac3a741763479a9ef129ed05cb7ca64f1e9
Reviewed-by: hjk <hjk@qt.io>
2017-02-08 14:27:48 +00:00
hjk
56409f5afa Replace a few occurrences of QStringList() << ...
... by something shorter.

Change-Id: I363b4e509adb07997517b2d233246a333aea4aea
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2017-02-08 11:21:45 +00:00
Vikas Pachdha
dfbe52efe3 iOS: Use command's exit code to check for failure
Change-Id: I8a565cab51b22bdf0d7d2ba274306479dc0397b1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-02-06 11:17:13 +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
Oswald Buddenhagen
60fa441959 make BaseQtVersion::qtCorePaths() non-static
simplifies the call sites.

Change-Id: I651644c641e9763a2c5f41a5644d8c2cf44469fb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-23 17:26:01 +00:00
Vikas Pachdha
7beb5d5c24 iOS: Reverting Utils::TemporaryFile changes
Temporary files are created to redirect the console output of the
running app and the files must be created in the simulator's file
system

Change-Id: Ib0f1d8366ca1606b2988b028b0aac944e0fe3432
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-23 14:37:17 +00:00
Filippo Cucchetto
4b1f8f3609 ProjectExplorer: Added support for registering custom languages
Change-Id: I728a2ed1ef7d9f44d7c2b59d27d6e23444cd3bb5
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-23 11:19:11 +00:00
Tobias Hunger
c6f90e575e Utils: Introduce a TemporaryDirectory and TemporaryFile class
Both wrap the corresponding Qt class, but make sure all temporary files
or directories are created inside a "master temporary directory".

Change-Id: I55461be507c828c965224c02863ea5ed9bbf9498
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-20 12:17:10 +00:00
Christian Kandeler
c05a3fdb3d Give the values of BuildStep::OutputFormat better names
The old ones did not convey their meaning very well. In particular,
NormalOutput and MessageOutput were easily confused.

Change-Id: Ia0a8c1b1c366ab3f5c59f751b37b8b1f68f6831d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2017-01-19 16:08:57 +00:00
Tobias Hunger
96c6033d39 QtVersionManager: Rename QtVersionManager::unsortedVersions(...)
Rename QtVersionManager::unsortedVersions(...) to QtVersionManager::versions(...).

This is what you should use, so make that the obvious choice.

Change-Id: Ice6e195d9aad7968ce87d378323627347b22bc74
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2017-01-18 10:40:12 +00:00
Tobias Hunger
6553c3c99e BaseQtVersion: Allow for a predicate when retrieving Qt versions
Make methods used to retrieve Qt versions from the Qt versions manager
take a predicate to select the interesting version.

Change-Id: I9218c57bae6d5033d49d618dfc0da41fe578444d
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-17 13:13:48 +00:00
Eike Ziller
dd438a3445 Merge remote-tracking branch 'origin/4.2'
Change-Id: If7e8fbfeae064c95e412b4cfa4804f7aa732be67
2017-01-17 14:03:37 +01:00
Thomas Hartmann
824fc105c5 Fixing warning
Change-Id: I92236680f34b6620c2371a1d9f1d1dcde8ba9282
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-13 13:43:35 +00:00
Eike Ziller
b1f1ccb32e Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/android/androidbuildapkstep.cpp
	src/plugins/genericprojectmanager/genericproject.cpp

Change-Id: I3484b668f9323ed0c05de99f8dfed07c9e65ab98
2017-01-11 09:29:37 +01:00
Vikas Pachdha
1e73c52dd5 Fix compile warning
COMMAND_TIMEOUT is not needed and will not be emitted

Change-Id: Id89aaa8c0b774a962e7a4e813a5b3d3e6a37524d
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 11:30:16 +00:00
Vikas Pachdha
6c83981ee6 iOS: Use kill system call instead of shell command
Change-Id: Ic1d327ca2ed83ee91f78434cc1974ec247751483
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 11:30:06 +00:00
Vikas Pachdha
54677f4985 iOS: Capture console output of launched app on iOS simulator
Task-number: QTCREATORBUG-17483
Change-Id: Id18c51e20cf8b396fc610918610f04d39ead28b0
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2017-01-10 09:34:31 +00:00
Vikas Pachdha
1e8c0c3632 iOS: Find Xcode version
To enable/disable the version specific features

Change-Id: Ia4cbe83f0aae366f517d8b46f322d8202dbbe3c8
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Jake Petroules <jake.petroules@qt.io>
2017-01-04 09:51:44 +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
Tobias Hunger
43c6e97529 ToolChainKitInformation: Remove setToolChain(kit, language, toolchain)
Replace that with clearToolChain(kit, languguage). The only use-case
for that method was to unset toolchains in a kit.

Change-Id: I8cffe39393281f424fa8e044e6b90c5cea17ac90
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-13 14:34:16 +00:00
Eike Ziller
c175f1e62f Merge remote-tracking branch 'origin/4.2'
Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2
2016-12-09 12:42:01 +01:00
Eike Ziller
5f054990d6 iOSSimulator: Try to avoid flakiness of starting in simulator
Put in some delays between executing the various simulator commands,
so whatever might need to startup internally has time to do so.

Task-number: QTCREATORBUG-17336
Change-Id: I1d4fbbc14c8583fce1b72ee31d5fd4824f377efb
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-12-08 15:29:11 +00:00
Alessandro Portale
572396773b ios: Fix the default device icons
In 4.2 the IDevice constructors need to set the device icon, and I
missed a few constructors. This should fix it.

This patch will not apply to master, and should be skipped when merging.

Change-Id: I66cf529dfe539a90a753dd15e8f069e1f11e8176
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-12-07 12:14:25 +00:00
Alessandro Portale
a00ee753fe ProjectExplorer: Introduce IDeviceFactory::iconForId()
This adds the possibility to have an icon for a device type. Now,
a Kit can have a proper icon if just the device type but not device
is selected.

Change-Id: I2a382ffd5b46cbbf74cdd0b934b3d450d300bfff
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
2016-11-30 13:55:38 +00:00
Orgad Shaneh
7b3642cce4 Merge remote-tracking branch 'origin/4.2'
Change-Id: I259a402bc896fc2e359cc96b7510453ac9a9a552
2016-11-28 15:27:51 +02:00
Vikas Pachdha
9f0bb3c93a iOS: Add C toolchain
To fix kits complaining about incorrect C compiler and ABI
incompatibility

Task-number: QTCREATORBUG-17135
Change-Id: I69ece613453463b97d193bb1740044d16f62172f
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-25 12:37:53 +00:00
Tobias Hunger
e6bfa27614 Ios: Do not pollute the global/Qt namespace with widgets
Change-Id: Iccaaff6bff386b8d2513ca79daa581d29b3c6fb2
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
2016-11-25 10:25:41 +00:00
Nikolai Kosjar
569f4499c0 iOS: Fix build
Include <memory> for std::shared_ptr.

Change-Id: I549eef8e8dc42b58b07e3528d55193ed8c54dd7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit 6614b7a276)
2016-11-16 08:51:05 +00:00
Vikas Pachdha
f28cefce8c iOS: Make iOS simulator usage asynchronous
Change-Id: I5770b372542690560680ef3208a284c7f0cf6670
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
(cherry picked from commit aa355b4f70)
2016-11-16 08:50:45 +00:00
Nikolai Kosjar
6614b7a276 iOS: Fix build
Include <memory> for std::shared_ptr.

Change-Id: I549eef8e8dc42b58b07e3528d55193ed8c54dd7e
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-16 08:47:14 +00:00
Vikas Pachdha
aa355b4f70 iOS: Make iOS simulator usage asynchronous
Change-Id: I5770b372542690560680ef3208a284c7f0cf6670
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2016-11-16 06:54:26 +00:00
Ulf Hermann
2acedc82c5 iOS: Don't initialize invalid ports with 0
The invalid port is -1, and Utils::Port does not need an explicit
initialization.

Change-Id: Id545fb98677d26541aa89611ddd50b735e08530a
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
Reviewed-by: hjk <hjk@qt.io>
2016-11-03 08:31:35 +00:00
Eike Ziller
644756d80a iOS: Make updating available simulators asynchronous
Also remove unneeded lock

Change-Id: I8db798bd0b8790ced198cf57e30e22a96a0eb0a2
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 11:54:43 +00:00
Eike Ziller
85e8bdb3ba iOS: Remove unused signal
Change-Id: I1d949b01f93485a12bd37142cea02f5b96b7acbb
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2016-11-01 11:54:19 +00:00
Eike Ziller
ff21689487 iOS: Make runSimCtlCommand static
Doesn't depend on state.

Change-Id: I6c0004bf6b6d1e30171b08e1b404d82242c42d99
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Vikas Pachdha <vikas.pachdha@qt.io>
2016-10-28 10:06:23 +00:00
Ulf Hermann
10ddde4125 iOS: also process stderr to look for QML debug port
This is where the "Waiting for connection ..." message usually appears.

In general this mechanism of first replacing the port in the message
and then parsing the message to figure out that the iostool (not the
application) is actually listening is very confusing and backwards,
but fixing this is material for the master branch.

Change-Id: I73d3c5a34482403d275e6ea7a9ad59996121b02e
Task-number: QTCREATORBUG-17141
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-27 14:08:35 +00:00
Eike Ziller
c4f92146be Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	src/plugins/ios/iostoolhandler.cpp

Change-Id: Iff2a56e8d74ffdb4342ef75020099cced297a0bc
2016-10-18 08:02:35 +02:00
Christian Stenger
993c18197b iOS: Fix invalid static_cast
Change-Id: I44184a8054ff0a80b9f65c3ccc227b4a6453ba8b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-10-18 05:53:47 +00:00
Christian Kandeler
bd07b29b7b iOS: Fix build with namespaced Qt
Change-Id: I09f07ed853e0c9fba8b856d1851b5994f4318945
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2016-10-18 04:37:45 +00:00
Vikas Pachdha
a9f00a2da3 iOS: Replaced deprecated signal QProcess::error. Fixes compilation issues with GCC
Change-Id: I4945b345032023c3c2e8d1fa7f51dadbbb0bc9d9
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@qt.io>
2016-10-17 15:47:36 +00:00
Eike Ziller
02a39c013f Merge remote-tracking branch 'origin/4.1' into 4.2
Conflicts:
	src/plugins/ios/iostoolhandler.cpp
	src/shared/qbs
	src/tools/3rdparty/iossim/iossim.qbs
	src/tools/3rdparty/iossim_1_8_2/main.mm

Change-Id: Ied9cafec4f1ee93d9e524f095f5c6b1480b2f054
2016-10-17 16:16:07 +02:00