Commit Graph

40996 Commits

Author SHA1 Message Date
Daniel Teske
ed986f73d3 Remove Qt Quick 1 Template
Since this was the only template using the qt quick application viewer,
remove all traces of that too.

And this was also the only "upgradeable" template, so remove all traces
of the upgrade code too.

Change-Id: I68989dc5a87621593f3b5dd8c4979bb59f137200
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-28 09:32:30 +00:00
Daniel Teske
3f183b7ee0 Purge deployment.pri
It was only used by the plain C and plain C++ templates. Given how ugly
and unmaintained deployment.pri is that is probably not a smart choice.

Change-Id: Idfdd4ec2b8e353d39505b603c3f4ca92bb34efcf
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-28 09:32:07 +00:00
Daniel Teske
e6881bd6d6 QrcDeployment.pri: Remove unneeded android scopes
- andorid-no-sdk should not be used for new projects anymore.
- The android scope is handled in android.prf in qt, and there the
  handling is better, so removing this actually fixes a bug.

Change-Id: I2b901e0cb1fd4bc0d00fbcd3c8ea08b22e4bca49
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
2015-04-28 09:31:45 +00:00
David Schulz
e75620c60d Editor: Limit size of generic proposal widget.
Task-number: QTCREATORBUG-14331
Change-Id: I3a120c82628e3cd43f9abc3c97021a3674300fbc
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-28 08:44:55 +00:00
David Schulz
e4e9983622 CDB: Unify handling of stopped debugger process.
Task-number: QTCREATORBUG-14344
Change-Id: Id05b16e649d39e354e6fda9ede9aa44984f3f429
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-28 07:00:52 +00:00
David Schulz
583b8dbefd Editor: Fix hihglighting current line in read only editors.
Task-number: QTCREATORBUG-10104
Change-Id: I3c4adb62c1cae61e9eb409a58359a687852023a1
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-28 07:00:15 +00:00
hjk
c1410878cf Remove unused Utils::NetworkAccessManager::getUrl
Change-Id: I445be50bd9460a5adad1bb7fb99479096d2d2fb4
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-28 06:10:00 +00:00
Eike Ziller
9ced13f209 Add some changes-3.5.0
Change-Id: I482a2af6723460b1950fdd86ea373c7e759f6ba5
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-27 15:00:32 +00:00
Daniel Teske
62d36ac9a9 ProjectTree: Improve save/load of expand data
So far the code only saved the path of the expanded nodes, which always
created problems for nodes that had the same path. This broke for the
virtual folders SOURCES, FORMS, HEADERS recently because they have
nowadys the same path. They used to have different paths.

This new code saves both the path and the displayname and compares that,
this fixes the expanding for those folders.

Obviously there is no sure way to indetify the right nodes to expand,
and this isn't backwards compatible.

Change-Id: I9854f90ca942f92420970765b0cc19138ad5d63d
Task-number: QTCREATORBUG-14304
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-27 13:43:32 +00:00
Daniel Teske
557bac136b Android: Don't remove all kits on changing the ndk
Instead compare the toolchain version (and abi) and replace the old
toolchain with the new toolchain.

This requires splitting up the updating into two parts, registering
the new toolchains first, then updating the kits and last removing
old toolchains.

Change-Id: Ida6aa27e84f683ef7a3159b69bb12f93cee4ec67
Task-number: QTCREATORBUG-14243
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2015-04-27 13:42:01 +00:00
Orgad Shaneh
548ec9c099 C++: Deduplicate enclosing and nested instantiation
Change-Id: Ib75e2d67acdf1fdbeb30b7c9689134f6ccf34063
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-27 09:49:12 +00:00
Orgad Shaneh
00845c0503 C++: Remove unused var in LookupScopePrivate
Was readded by mistake when the type was pimpled.

Change-Id: I4150b783a1b54dda6070a49f78bcb8b0fcb9f414
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-27 09:08:12 +00:00
hjk
2847a02fec BareMetal: Modernize
C++11, Utils::TreeModel.

Change-Id: I0746693436c41fa6b0f02cb61a9cc99d4e6e3e64
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-27 08:42:28 +00:00
Christian Stenger
6368f8f645 Fix compile with gcc 4.7.3
Change-Id: I3e3e9c4038b95aacabb8425297524b5ede86376f
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-27 08:40:04 +00:00
Orgad Shaneh
e2fd350f02 BareMetal: Support seamless 3.3 -> 3.4 upgrade
Change-Id: I49caf77ee5e9f08fdede9d6881a4da717c5da057
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-27 08:26:56 +00:00
David Schulz
f5ba484fbe Debugger: Fix Step into for unreachable frame source.
Hitting a frame without source code information when stepping inside
functions results in a step out. Same is now applied to frames with
unreachable source code.

Task-number: QTCREATORBUG-9677
Change-Id: If7f7b417d98e8ab058fc98cef3041cb616579619
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-27 08:04:30 +00:00
Kai Koehne
ec7a949416 QmlDebug: Remove unused code
Remove code related to the nuked 'Apply on Save' functionality,
and older cruft.

Change-Id: I5e7acf11ded95a46977a1c28ee77c713e94b73c3
GPush-Base: 3606f8b02a65f0080e7e93ff27e79d7c34118c6c
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-27 07:58:47 +00:00
hjk
64016e3732 ProjectExplorer: Introduce a "TerminalAspect"
To be used in RunConfigurations that have a 'Run in Terminal' option.

Change-Id: Iea29a0d44e15e70c994e0e993a7e69133ae89fbf
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-27 07:50:31 +00:00
hjk
eea8e932f3 Debugger: Fix jump to file/line breakpoint from disassembler
Triggered by double-clicking a normal source file+line breakpoint
while looking at some disassembly: We want to jump to the original
source file in that case.

Change-Id: Ia6eddcaf27e4160c7a989ab757315f5314f65d1e
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-27 07:30:12 +00:00
Tobias Hunger
ad9dc94eae DiffEditor: Parse git diffs properly
Do not put filenames into a regular expression and then hope for
the best... any file with any character in its name that has a
special meaning for a regexp will break the parsing.

Task-number: QTCREATORBUG-14322
Change-Id: Ifab513d675168aff041f20d2b3f06a8d27919aa7
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-27 07:26:18 +00:00
Eike Ziller
f60780881b MimeDatabase: Avoid parsing the mime xml files multiple times
At the moment we need to throw the parsed information away and reparse
everything if we add another mime xml file (*), so make sure that we do
not use mime information (which triggers a first parse) before we added
all mime xml files.

(*) we do that because the data for a mime type is distributed through a
whole range of classes which do not easily allow to remove an already
registered mime type, but we must be able to overwrite mime types from
freedesktop.org.xml.

Change-Id: I5e532875cc750af1da3e0139397279d7be203c27
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-27 07:03:48 +00:00
Orgad Shaneh
3b0a75c9e0 Dumper: Fix internal dumpers with Python 3
Change-Id: Ic38a827ce32e17fc7038ea974e05c77959367342
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-27 06:17:20 +00:00
Christian Kandeler
f765676171 Update qbs submodule.
To HEAD of 1.4 branch.

Change-Id: Id69fc79579068f3a940d467a2d800d5f091cf6df
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
2015-04-24 14:54:19 +00:00
Nikita Baryshnikov
9f15f30da4 Revert qbs submodule
from 40dc289360

Change-Id: I357e64d609c42f1a8446f8faf30fe84746106294
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-24 13:56:56 +00:00
hjk
d972b3b091 QtSupport: Remove SimulatorQt
Unused for years.

Change-Id: I721068ecf18afb09fb928a348cbb5e8127a3dfc2
Reviewed-by: Rainer Keller <rainer.keller@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-24 13:45:08 +00:00
Kai Koehne
40dc289360 Remove QmLJSDelta class
The class was only used for the Apply on Save functionality in the
QML Debugger, which got nuked in 3bf81efbe7.

Change-Id: I1842cc07d61fe84f8da23210ebac04dd4d567fce
Reviewed-by: Marco Benelli <marco.benelli@theqtcompany.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-24 13:26:37 +00:00
Sune Vuorela
7b0c8b160a Gather Qt versions from qtchooser on first run
Change-Id: I33ae062c3225fb3d7b7d1a62e0e287d326bb4276
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Adam Majer <adamm@zombino.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-24 11:35:06 +00:00
Viktor Ostashevskyi
3a25e53267 Ukrainian translation update for 3.4
Change-Id: I3c8b0af8f204cf7c31f1452cf43bea82788e7cb2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Viktor Ostashevskyi <ostash@ostash.kiev.ua>
2015-04-24 11:23:43 +00:00
Eike Ziller
3b545319b7 About Plugins: Fix that disabling plugin could disable too many others
Only disable plugin rows with disabled *Required* plugin dependencies.

Change 044eeacde5 introduces another
dependency type "Test", which are actually not dependencies in a strict
sense and even can be cyclic, which makes this bug especially obvious.

Change-Id: Ie504b4dd52670d838b712e88ae2e42123975b1d5
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk@theqtcompany.com>
2015-04-24 10:28:01 +00:00
Eike Ziller
681c5177f9 Fix that CSS files where opened in C++ editor
For some reason freedesktop.org claims that CSS files
are text/x-csrc, so we explicitly make plain text editor
the handler for text/css.

Change-Id: I9685706523fff450ab10d1d0eb1850090e55c51a
Task-number: QTCREATORBUG-14334
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
2015-04-24 10:26:05 +00:00
Daniel Teske
7bc1af275d Debugger/Android: Add the Qt's qml directory as a search path
Change-Id: I5244eda989220aa2e2f8a225294d3c1dd0d97a2a
Task-number: QTCREATORBUG-13245
Reviewed-by: hjk <hjk@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-24 09:49:04 +00:00
Orgad Shaneh
77070f59a4 C++: Remove unused variable
Change-Id: Idc7bbce90ebfb3a62594d5121c04dc265a2e583a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2015-04-24 09:48:21 +00:00
Claus Steuer
81f64f85a0 CMakeProject: Fix CXX Flags parsing for ninja projects
For ninja projects the "build.ninja" file is parsed to extract the cxx
flags for each target. This file is located in the working directory
of the "all" target, however since commit "65c113bc" qtcreator searches
in the build directory of the current target. I have restored the
search behavior to the previous state and added some code to ensure
that the parsed flags really belong to the target

Change-Id: I7cc7f6dbd4f12aec698133206da889037131bb13
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-24 09:36:52 +00:00
Orgad Shaneh
d9eab81cbb C++: Avoid duplicate entries in TypeResolver
Change-Id: I094dc04a14c05b17815d53bf0170926cc0c0d2a5
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>
2015-04-24 08:50:59 +00:00
Nikolai Kosjar
d4bb5033b2 CppTools: Remove separate indexing revision
For indexing we used a custom revision that was updated on each
modelManager BuiltinIndexingSupport::refreshSourceFiles() call. This
could lead to rejection of updated documents triggered by refactoring
actions, like for the following case:

 1. Open a project containing a.h and a.cpp
 2. Open a.cpp, insert some new lines, save and close the document
 3. Open a.h and rename a function that is defined in a.cpp
    --> The refactoring action modifies a.h and a.cpp, so re-indexing
        of those is triggered. Since a.cpp has already a higher revision
        (step 2) than the updated document, the updated document is
        discarded. As a consequence find usages and follow symbol fails
        for the renamed function.

Now the document call back provided to CppSourceProcessor is responsible
for updating the document revision based on the latest revision in the
global snapshot.

Change-Id: I4dfa0a4d34991655acfa749109f00c47b0fbfdbe
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-24 08:35:13 +00:00
Nikolai Kosjar
f878da0ea8 CppTools: Offer "override" and "final" as completion items
These are special identifiers and were thus not included in the 'add all
keywords' handling.

Change-Id: I7f65df5711193e945bfa955dcb70a6ab454606b5
Task-number: QTCREATORBUG-11341
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-24 08:33:56 +00:00
Eike Ziller
5e0f0268ae Help: Do not save settings in help database
Using the help database is not necessary, does not follow our style,
and is less reliable (with all the setupEngine mess).

Change-Id: Icb7f63a6b349458011e1b068bdf0954b78d3281f
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-24 08:32:38 +00:00
Nikolai Kosjar
cea5d886d8 CppTools: Fix global completion after "/// text."
Like for other comments, don't try member completion if the doxygen
comment ends with a dot.

Task-number: QTCREATORBUG-8597
Change-Id: I2d5204ba8f45fc9ee94e285a907364cc722e62c7
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-24 08:30:51 +00:00
Tobias Hunger
94af581dd8 Git: Make git show a bit more robust
Change-Id: I5d0dc3bb43753f7b2ac9c308944f327537547d76
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-23 15:52:00 +00:00
Tobias Hunger
bd1ee39991 Git: Remove duplicate arguments
BaseController already adds -M and -C for us.

Change-Id: Ifb64e78a4eba5f43b6fbe2a701f087ebf38db45a
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-23 15:51:46 +00:00
Tobias Hunger
35aafdcdd9 JsonWizard: Add a polish phase
Add a signal/method to polish the generated files: This phase happens after all files
are written to disk and are ready. It is intended for tasks not directly related to
the project setup: E.g. generation of config files, etc.

Use this to generate our config files.

Change-Id: I9bb5d296bec19f163b70c5ec8d43d5b8e3a52d79
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-04-23 15:51:33 +00:00
hjk
ad49b68605 TreeModel: Some extra checking
Change-Id: I75751c792b22998990ef453d51b9586fdaf31f50
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-23 13:35:15 +00:00
hjk
7697bd4b6f Debugger: Remove broken old LLDB QSet dumper workaround
Task-number: QTCREATORBUG-13153
Change-Id: Ifc1393a9bedd0be793d752ad6af85221f5f8d247
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-23 12:09:07 +00:00
David Schulz
f02e09f60e Editor: Adding QFontComboBox to texteditor font settings.
Replacing the QComboBox with a combo box that is capable of
previewing the fonts.

Change-Id: Iff70e4464a99bfa07b0bcf333c2aff402ef5ce28
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
2015-04-23 11:39:32 +00:00
Daniel Teske
7195bf8559 Fix crash on creating qrc files
And probably others

Change-Id: Ic4d0928184e68ee058cf6991c5bdf13774e86dae
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-23 11:21:57 +00:00
Daniel Teske
f53d37d488 QMakePM: Less output from exact parser of cumulatively found SUBDIRS
Change-Id: I58766cc9e1916741dc0a33fc69e4e58470241073
Task-number: QTCREATORBUG-10779
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-04-23 10:32:38 +00:00
Eike Ziller
6c4d4d96fa More changes 3.5.0
Change-Id: I186a3f8d96b30f58870f11ce82fcb3020d0aaf5e
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
2015-04-23 10:14:58 +00:00
hjk
69de1da74c RemoteLinux: Use base RunConfiguration if possible
Change-Id: I500faf9846f610f224808a4664d43d50cc5ad870
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
2015-04-23 09:32:44 +00:00
Daniel Teske
8247a0b4d7 SessionManager::projects() return a copy instead of a const&
Fixes a crash on session restore for Eike. Iterating over
a const & of the list is dangerous while projects are
added to the list.

Change-Id: I1861b7f1875420769c2493fb0b4012728380efd2
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-04-23 09:19:12 +00:00
Orgad Shaneh
8be26d070e C++: Improve template argument detection for nested types
Change-Id: I7dd3f552f0e85413de8e58047d1fba39c7237182
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>
2015-04-23 08:19:10 +00:00