Commit Graph

43591 Commits

Author SHA1 Message Date
Tobias Hunger
5c4bd99715 Qmake: Remove PROFILE_BUILD_KEY from QmakeBuildConfiguration
It is unused.

Change-Id: I29ae0927a74b8f1ee6a66bf4ad99ac73e43e7170
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-10-23 07:59:45 +00:00
Tobias Hunger
66efe78b2b BuildConfiguration: Add static helper to turn buildtype into a string
Use that helper in the projectexplorer instead of hardcoding a mapping
there.

Change-Id: I8720607a869c086569661fc9e9326ed6e0f85bb3
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-10-23 07:59:37 +00:00
Tobias Hunger
ea128cd8fc CurrentBuild:Type: Do not mark these strings as translatable
They are constants that should not change based on locale. We
have the CurrentBuild:Name for something that is localized.

Change-Id: Ied7c123e0cdeee3f98ac6ea28e19137b9e70a9a8
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
2015-10-23 07:59:32 +00:00
Leena Miettinen
b0cd8f14bc Clear Case: fix UI text
Change-Id: Ic9b0481287a30312209bc84c1190e97087495e0f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-22 15:07:34 +00:00
Tim Jenssen
e6d038364f add projectNameValidator to JsonProjectPage
Change-Id: Ie9851a8f16d494ef2a6fafdcc83b5b47bcd0e021
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-22 13:53:30 +00:00
Robert Loehning
85992f823e Squish: Update tst_qml_editor for fixed editor
In 3.5, the QML editor showed two empty lines at the end of
the file. Now it's only one line so only one must be unmarked.

Change-Id: I831002e5ab9d14570d2a788010806c0b3de5614c
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-22 12:09:33 +00:00
Leena Miettinen
c4872962cd Doc: add docs for model editor
Change-Id: I6bae6dc22de170c9f43cefe474e9b684675e4ff6
Reviewed-by: Jochen Becher <jochen_becher@gmx.de>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-22 11:49:19 +00:00
Tobias Hunger
25e3d88834 JsonWizard: Keep "options" optional
Do not report an error if "options" are unset.

Change-Id: I53f12624275be2d8af8d38da8dfe6bfa6603b948
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-22 11:32:58 +00:00
Jochen Becher
f9a064da6a ModelEditor: Fix incomplete assignment of diagram's elements
Change-Id: I81bbb05316a57c9c8c961f2d21c6604cbc9c6b2e
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-21 20:54:54 +00:00
Jake Petroules
59ac67c0bb Qbs: properly install Info.plist, PkgInfo, and app icon.
The icns files have also been moved into an asset catalog because
"source code" as a rule should be stored in the preferred form of
modification.

Change-Id: I883db5704a46d8d7cf601f7fb4471619ebbc34bf
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-21 16:18:51 +00:00
Tobias Hunger
287f66c47f Kits: Fix corner-case where default kit changed needlessly
Make sure we add Kits (and update the default kit) before removing
existing kits. This prevents us from losing the information on which
kit is the default one for some random kit selected when the previous
default kit gets deleted.

Task-number: QTCREATORBUG-15209
Change-Id: Ieee3b9fdbcbb4eec524103e4b871287c4de02fc7
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-21 15:15:33 +00:00
Tobias Hunger
1ffd78bbf5 Algorithm: Make transform work with simple iterators
Do not require containers to provide a size() method. This
makes for a less optimized insertion into the target container,
but most Qt classes should still handle this ok.

The upside is that e.g. the treemodel iterators can now be
transformed.

Change-Id: I4f149720631d9efb7b787332f039074b4c796965
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-21 14:07:46 +00:00
Tobias Hunger
a0269d8b27 Algorithm: Mark output of filtered as Q_REQUIRED_RESULT
Change-Id: I0518ed3c649efc8854cb5ef63c02e4def984cdd2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-21 14:07:41 +00:00
Tobias Hunger
9035e77800 Wizard: Add a wizard for item models
Task-number: QTCREATORBUG-7
Change-Id: Ibc06eda1b6596b08dd2e3be4e426c8b89be31064
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-21 13:57:24 +00:00
Nikolai Kosjar
114261dc84 Doc: Clarify the setup of Clang Static Analyzer
* Do not invoke the impression that the user has to download/configure a
  clang.
* State explicitly that only the shipped version is known to work.

Change-Id: I89ad346c2228ac6990a1932586ef2ad556f49379
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-10-21 08:46:30 +00:00
Eike Ziller
9c72a34556 Add change log for 3.6
Change-Id: I616e6133ee1b1b7dc952cf7f83054b5ef0d0b534
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-10-21 07:13:00 +00:00
Ulf Hermann
5bc6bf03e1 QmlProfiler: Don't update the time display during state transitions
Previously, the display would show 0.0 while the profiler was waiting
for the application to send data. That is somewhat confusing.

Change-Id: I3ad85e5479c2cf3a65e6c4b411d959a5b15baae8
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-20 16:15:32 +00:00
Ulf Hermann
69377f0de4 Introduce Profile build mode
We define a Profile build to be a Release build with separate debug
info. You can thus change a given build from Release to Profile of vice
versa by toggling the separate debug info checkbox. The messaging for
future user interaction about Profile builds has to take this into
account.

Task-number: QTCREATORBUG-14009
Change-Id: I62a5b13993b20bf36329b1eefa8b1b6096f31644
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-20 16:15:18 +00:00
Ulf Hermann
703ce02d4c Detach QML debugging option from qmakes build mode
The coupling of qml_debug to qmake's Debug profile is both brittle and
wrong. There are good reasons to also enable qml debugging in certain
Release builds and changing the build type of a specific build often
leaves the UI in an inconsistent state.

Change-Id: I89cb86849c984278ebfc54f66f139ec482b18d9a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-20 16:15:10 +00:00
Tobias Hunger
14eafd5dca Wizards: Use C++11 in all qmake projects created by the JSON wizard
Change-Id: Idbe9053514ec94880df2d89a10ebe9bd4d9393b6
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-10-20 15:46:48 +00:00
Jake Petroules
3fbd210b2a Make iostool arguments closer to phonegap ios-deploy.
phonegap's ios-deploy tool is probably the most widely known command
line tool for deploying and debugging iOS applications. Make several
arguments identical to theirs with the eventual goal of making iostool
and ios-deploy command lines interchangeable.

This is a libexec (private) tool only used internally by Qt Creator,
so the changes should not impact anyone.

Change-Id: I51f25f9c466570ca65b415d4ea94c78285cff1c2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@theqtcompany.com>
2015-10-20 15:41:39 +00:00
Ulf Hermann
bd22de47e7 QmlProfiler: Prevent interaction with buttons while loading data
You could trigger invalid states by pressing the recording button
while the profiler was waiting for data to be loaded from the
application or by pressing the "stop" button twice. Now the buttons
are disabled when they don't make any sense. In particular you cannot
clear, change features, filter the display while recording and you
cannot toggle the recording while loading. Pressing the "stop" button
twice will cancel the loading now, similar to what happens if you
first disable recording and then stop while the data is loaded.

Change-Id: Ie5133f4bed76593dedc9763b778a2c5c17187543
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-20 11:43:14 +00:00
Orgad Shaneh
88c5b47e53 CppTools: Minor cleanup in completion tests
* Remove superfluous dot from test file name
* Reuse an existing member

Change-Id: I735dee09ae7ceef4509a4bda87118baaf4d11b01
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-10-20 08:52:20 +00:00
Eike Ziller
7fa6d51942 Fix deployment of qml2puppet
The move to LIBEXEC_PATH broke running the puppet from the packages on
Linux and OS X, because there it cannot find the platform plugin
anymore.
We need to add a qt.conf for it, and because Qt Creator.app/Contents/
Resources already contains the qt.conf for Qt Creator itself, the puppet
must also move to its own subdirectory on OS X.

Change-Id: I8e8cc48c49a01e10c7d7d3cc4c73020195cd5ca9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
2015-10-19 15:07:36 +00:00
Marco Bubke
51ed0da5a9 TextEditor: Add fine control over the color scheme settings
You have seen always all setting but some settings had no meaning
because
only the foreground color is used. Now you can disable this settings so
it
is more clear what you can change.

Change-Id: I0fdd2ac6f40e27b5160a2c54a512289457674dae
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-19 13:10:44 +00:00
hjk
b8ae9fd46d Debugger: Adjust native mixed debugging after upstream changes
Change-Id: I4d137fadd0de2aa346f2f49932faac4ee9ed41e7
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-19 12:40:29 +00:00
Nikolai Kosjar
be1e0f7ec0 Clang: De-duplicate in Messages::registerMessages()
Change-Id: Id3c73249f562abd89de8e76290ea712c2fe7fae1
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-19 09:21:21 +00:00
Nikolai Kosjar
ebce521ef9 Clang: Polish tool tip text for diagnostic
* Set the category apart.
* Show only the disable option and only in debug mode.

Change-Id: If5f65f9bd04c8e37e376a9862035005f4456394a
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-19 09:21:13 +00:00
Davide Pesavento
d3583883a8 Tests: add missing column to tst_fileutils::parentDir testcase
The third column was accidentally removed from one data row in
commit 271794fbc9

Fixes the following fatal error:
QFETCH: Requested testdata 'expectFailMessage' not available, check your _data function.

Change-Id: I4a09df2e044b4dcee1ed2ffc589082a3e2601232
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-10-19 09:00:31 +00:00
Orgad Shaneh
5f0e4e4f76 ProjectExplorer: Remove unused local variable
Change-Id: Ic098ba98864cc1211358d975e4d14829d92d2ac0
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-19 08:44:13 +00:00
Tobias Hunger
0cda81a99c Snippets: Add license snippets
Change-Id: If3b3d9b4f602848ffe39c72a90d4b0f1275eb828
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-10-19 08:43:27 +00:00
Eike Ziller
e3f770a50c iOS: Refactor iOS tool chain and kit auto detection
It was all done in one huge, unreadable method.
The refactoring along-side fixes the following:

- iOS tool chains were demoted to manual at start up because there
  was no tool chain factory that would auto detect them
- a QTC_CHECK failed because single Qt Versions could appear multiple
  times in the architecture->Qt version map, because each architecture
  is present in two abis (32-bit and 64-bit)

The refactoring also removes unneeded automatic conversion
from non-iOS Qt version to iOS Qt version, and removes considering GCC
toolchains (which were not handled anyhow, because only Clang
"platforms" were considered).

Change-Id: Ic9ae797646f159ed45959fc797990aa98f2136fb
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-19 07:20:53 +00:00
Tobias Hunger
09bc8af645 ToolChainManager: Fix autodetected toolchains going manual
The recent optimization to avoid running toolchains during startup
has broken the registration of tool chains with the manager, resulting
in auto-detected toolchains being demoted to manual in one run and
then getting removed in the next (at which point a new set of toolchains
got auto-detected).

Change-Id: I175c7344238df1bcb36a8b4949f0f0faf8828116
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-16 14:20:40 +00:00
Niels Weber
52e35e7e9d Fix compilation
Was broken after bdb0f264d2

Change-Id: I3581da9d27f9609c2b3e4f74443ee59feef739dc
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-16 11:17:20 +00:00
Montel Laurent
bdb0f264d2 Allow to clear search string
Change-Id: If88d74755e9f95d2aabd2aa770c9bdbb5bd98309
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-16 10:41:17 +00:00
Orgad Shaneh
72246866c3 SearchResultWidget: Style cleanup
* Use Qt5-style connect
* Fix spacing around braces
* Remove empty destructor

Change-Id: I38373aaa45e84e8d8219aea2d672df0f817d8d65
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-16 08:26:48 +00:00
Nikita Baryshnikov
bab7c80976 SearchResultWidget: unclutter namespaces
replace Q_ASSERT with QTC_ASSERT and be more consistent with asserts

Change-Id: I81161a1ee82218ef23f62cc90e52587c342e2e22
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-16 08:26:42 +00:00
Niels Weber
9dd457a678 Debugger: Fix a warning
Followup to 01006580c1

Change-Id: I4acd54472df03c019493426303d5a52a9902f9fd
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-16 08:17:49 +00:00
Tobias Hunger
92b34380fb ToolChainManager: Use Qt5-style connects
Change-Id: I68bebe6f1554e48513f130537434a1f7e22a0197
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-10-16 07:16:58 +00:00
David Schulz
3f181280ed cdbext: adjust GDMI item names according to the ...
change 525c33f999

Change-Id: I778ef6893de24748d1d515e43937368cbe033683
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-16 07:03:50 +00:00
hjk
e696b6af08 Debugger: Work around libstd++ crash
Task-number: QTCREATORBUG-15183
Change-Id: I7f0d00c984bb19f025b5e2f576017e0a982ed79a
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-16 05:59:26 +00:00
hjk
01006580c1 Debugger: Go back to QVector in GdbMi
We are overstretching std::vector implementations in some
cases of partial self-assignment.

Task-number: QTCREATORBUG-15183
Change-Id: I144e9e34df117286a7eef6403e29054d530cacbe
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-10-16 05:59:04 +00:00
Nikolai Kosjar
a065f45664 Clang: Process diagnostics as soon as possible
...on editor open.

Change-Id: I02eb7092facedef9be5bf7b523ad840ebf1ecca9
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-14 16:28:32 +00:00
Daniel Teske
a027cbcd70 Fix infinite QWaitCondition:wait() in discardFile*()
The original idea was that we would passively wait for another thread to
clean up the locker, hence the check-sleep-loop. This was all dandy,
except for *also* using the wait condition: this was a) mostly pointless
(it would just avoid a few iterations of the wait loop) and b) buggy (if
there were no other waiting threads, the actual reader thread wouldn't
know that it needs to wake somebody up).
As the passive waiting is ugly, we instead fix the use of the wait
condition, and do away with the loop.

Task-number: QTCREATORBUG-15181
Change-Id: I477dbe7cda49ceca9aa387910d94ad763a43012b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-14 16:00:21 +00:00
Eike Ziller
7c2761f1f0 Windows: Also deploy clang.exe
We need both clang.exe and clang-cl.exe for mingw and msvc

Change-Id: I2f8883f2ac42636699d4326d4d5f044b34b7d9ba
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-10-14 15:47:21 +00:00
Orgad Shaneh
63d543055e MingwToolChain: Avoid double call of hostAbi()
Change-Id: Ie10bf134841b747b219756f6b986fe49eb443f52
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-14 14:22:32 +00:00
Nikolai Kosjar
f18bc981d5 Clang: Fix reloading documents
Fix the following use case:
 * Open foo.h
 * Open foo.cpp
 * Change both files externally (e.g. git checkout) e.g. by adding a
   function (declaration + definition)
 * Confirm the reload dialog in Qt Creator
 * The added function in foo.cpp gets a diagnostic that it's out of line
   although foo.h is also reloaded.

TextDocument::contentsChangedWithPosition() is also emitted during a
reload. However, the revision of the document at that point is not yet
updated. This led to an out-dated copy of the unsaved files in the clang
backend.

Change-Id: I70580d32bb7a34dc43356dc05019cc18addf950e
Reviewed-by: Marco Bubke <marco.bubke@theqtcompany.com>
2015-10-14 13:30:11 +00:00
Tobias Hunger
48e4b82e1a MingwToolChain: Do not use uninitialized value
Change-Id: I0b57382e75b5cc71018009907e1b8e9bfdd5e238
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-10-14 13:12:06 +00:00
Tobias Hunger
18c8fefc8d MiniProjectTargetSelector: Merge palette setup code
Change-Id: I899ba5e7b7d2a128580f302937274e617c084cf6
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-14 12:44:10 +00:00
Tobias Hunger
23ab77bfa8 KitInformation: Improve handling of styling
Make the styling work better, especially when the kit information
is displayed in the MiniProjectTargetSelector.

Change-Id: I562c1c92942afbfec1b960740a326c4dd002864f
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-10-14 12:44:06 +00:00