Commit Graph

3443 Commits

Author SHA1 Message Date
Daniel Teske
92cdd7045b CmakeProject: Don't crash on addKit + cancel
This was introduced by adding the remote linux support for 3.0 in
328a24edee. If the user cancels the
run cmake dialog, no buildconfiguration is created. The adding of kit
should then not happen. A target without a buildconfiguration should
not happen.

Task-number: QTCREATORBUG-12773
Change-Id: Ic43c5cc13f9e114ea24cc97154a6c084125f6318
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-08-01 07:40:09 +02:00
Daniel Teske
79202f98c3 CMake: Remove pointless comment
This was implemented aeons ago.

Change-Id: I4bfe5c6c5734c4267715c237810996bb0a65ad92
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-31 18:24:48 +02:00
hjk
9fd2fe5a9a TextEditor: Make completion assist provider a data member
In case of the CppEditor a direct member is not possible due
to setup restrictions inside the CppEditor machinery. I'd expect
that to be fixable when the editor base system is in good shape.

Change-Id: I184e219ca2dff6f67c9b58c182212eb12972cc84
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-07-31 12:40:52 +02:00
hjk
f6b48950ed TextEditor: Re-work comment definition handling
No need for most of the machinery.

Change-Id: I9078174582d83da94c6c7f20282fd3a5f1742911
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-31 10:54:49 +02:00
hjk
adfb30743d TextEditor: Merge BaseTextEditorDocument into BaseTextDocument
That was the only user of that layer of abstraction.

Change-Id: I2bdc4abb8b2b33bfb70398dd11f7ecc4745ddc43
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-28 12:33:47 +02:00
hjk
bf5e43be94 TextEditor: Merge ITextEditor and BaseTextEditor
Adjust all callers, de-export BaseTextEditorAnimator

Change-Id: I2329d976c1398e2449844bb480a4d4ed29859506
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-25 13:45:55 +02:00
Alessandro Portale
35d6394523 "foreach (QString" -> "foreach (const QString &"
Change-Id: Idb866407347722766edbc85ce20799b088ce36dd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-24 12:15:49 +02:00
Daniel Teske
3d4caa3908 ProjectExplorer: Fix Project::displayName changes
The only project manager that actually sometimes changes the displayname
is the cmake project manager. And that one failed to emit the right
signal. And since the signal was never emitted a few places handled the
signal wrongly.

Change-Id: I4aa75dc3032efe49263143dbadb7585a378b9be9
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-07-22 16:51:47 +02:00
BogDan Vatra
d9516fb9a0 BuildConfiguration: Introduce signal buildTypeChanged()
Needed by android plugin.

Change-Id: I46543d4889e0e740697439e18e9c1ea0d3fef222
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>
2014-07-21 11:31:47 +02:00
Tobias Hunger
8f1ca2216a IWizardFactory: Add a feature for all running plugins
Get rid of IFeatureProviders that are only telling the wizard factory
that a plugin was loaded.

Change-Id: Id12c669974a6ab98036f070e1adcae35b34ca376
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-21 09:52:13 +02:00
Eike Ziller
c571ecbd51 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/changeselectiondialog.cpp
	src/plugins/git/changeselectiondialog.h
	src/plugins/git/gerrit/gerritplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/git/gitclient.h
	src/plugins/git/gitsettings.cpp
	src/plugins/git/gitsettings.h
	src/plugins/git/mergetool.cpp

Change-Id: Icd1b2741da96395ed1b41903f453049a303e4791
2014-07-18 14:04:51 +02:00
Daniel Teske
65c113bcbc CMakeProject: Handle subdirectories with different defines/include paths
While we do know all the parts, we don't know to which part each file
belongs. So we guess that based on file system proximity.

Task-number: QTCREATORBUG-12359
Change-Id: I9d2a2ca0171b4e43f4a65d2f4b7b318f4e8b451c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-17 19:13:54 +02:00
Daniel Teske
b0af82ebc9 CMakeProject: Make CMakeLists.txt and *.cmake use different mime types
Since we want to treat them differently.

Task-number: QTCREATORBUG-12461
Change-Id: Ia72b8045390ceec693fa416f65010a4c4dbecce1
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-17 16:38:30 +02:00
Leena Miettinen
7203eb46e5 CMake: fix capitalization of the "Run CMake..." button
Change-Id: I5402d29e6916110934411848542b1776178615e1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-17 15:40:17 +02:00
Eike Ziller
e7ea94b688 Merge remote-tracking branch 'origin/3.2'
Conflicts:
	src/plugins/git/gerrit/gerritparameters.cpp
	src/plugins/git/gerrit/gerritplugin.h
	src/plugins/git/gitclient.cpp

Change-Id: Ie7719cfe45489b72d64260e729dcce3760f33bec
2014-07-17 12:42:04 +02:00
Orgad Shaneh
71b56d2b9c Some QString -> FileName transformation
Change-Id: I4a8a8f68bb1e52750380218793ec3029b488c01f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-16 12:44:01 +02:00
Eike Ziller
bef7181ed0 Set parent for options dialog where appropriate.
Otherwise the options dialog might appear behind the current "dialog"
(for example the "new" wizards).
Also, take ICore::dialogParent as default.

Change-Id: I4578e269db5763842a942549a45ec8cdd6b28b5d
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-14 16:24:26 +02:00
Joerg Bornemann
7e9489db37 remove duplicate file from project file
This fixes the build with qbs 1.3.

Change-Id: Ie4cb9cf96ab25fda0033eb80b00b59d03f89b755
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2014-07-11 15:04:34 +02:00
Erik Verbruggen
3d33886e53 C++: fix include/framework path handling.
Instead of having two lists of paths, now only one list is used where
both include paths and framework paths can be mixed. This reflects the
way the compiler is invoked, and retains the (correct) search order.

Task-number: QTCREATORBUG-11599
Change-Id: I373953e3e305df5b7a0d10920e12d146584adf9f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-07-04 13:51:36 +02:00
Christian Kandeler
93304df038 Always pass Core::Id by value.
Currently we pass in some places by value, elsewhere by const ref and
for some weird reason also by const value in a lot of places. The latter
is particularly annoying, as it is also used in interfaces and therefore
forces all implementors to do the same, since leaving the "const" off is
causing compiler warnings with MSVC.

Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-07-01 11:52:08 +02:00
Nikita Baryshnikov
b204c4dba2 CMake fix deployment data
Fix potential index out of range assertion in QStringList if contents of
QtCreatorDeployment.txt would be unexpected(will not contain ':')

Change-Id: Ia6ae282ef450e7c56a512b13da801854caec0dfb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-07-01 11:30:51 +02:00
hjk
93ccf4f266 IDocument: Make mimeType a value member
Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-07-01 10:54:55 +02:00
Nikita Baryshnikov
24d82a86ab Cmake fix warning
QTextStream: No device

Change-Id: I059f163d82bea0719b9781d0e20c691606047326
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-30 10:28:43 +02:00
hjk
62a870a14f TextEditor: Simplify HighlighterFactory hierarchy
Change-Id: I555639a9137dcb8ccb471e1615823870c8158b3c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-26 15:54:12 +02:00
Tobias Hunger
4eb2908c44 Unify "missing compiler" and "missing build configuration" tasks
Everybody used to do their own thing...

Also unify the "Configuration is faulty" message we write into the
Application output window.

Change-Id: I0e5c4ec68155d66aa1d0ea53134b98917869e5c6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-06-23 15:04:04 +02:00
Nikita Baryshnikov
12103e0f67 Reinvent deprecated qSort as Utils::sort
Change-Id: I4f6011cc2b6127037249aabc2426a88ad7108ebf
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-06-19 14:00:32 +02:00
Stephen Kelly
d70485180a CMake: Load context-sensitive help.
CMake 3 uses reStructuredText and Sphinx for documentation. Those
tools can generate Qt qch files, which makes it possible to load
the documentation in QtCreator and to enable context-sensitive
help when editing a cmake language file.

Add a simple parser to process commands. This may be extended in the
future to process variables and properties too.

Change-Id: Ic5a49a9ce828ad9a9e8ff4805b48302ee73bcc71
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
2014-06-17 16:06:01 +02:00
Daniel Teske
c78258cd57 Allow the user to restrict rc creation to certain .pro
Task-number: QTCREATORBUG-10953
Change-Id: Iff1a31c007ac777bfa390d48237480ef56ffc0e4
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-06-16 13:04:23 +02:00
Orgad Shaneh
0f759ed5e3 CMake: Pass some values by reference
Change-Id: Ie232a4312a783f41cb719e6a69cd2e3006caf84c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-02 11:42:28 +02:00
Orgad Shaneh
a5334956a8 CMake: Remove statement that has no effect
Change-Id: I3e1494165a77ea76c83d45f2bb08f2a87cd68436
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-06-02 11:41:56 +02:00
Orgad Shaneh
af5b3246cf ProjectExplorer: Get rid of LocalApplicationRunConfiguration::RunMode
Change-Id: I132eb2615842ad7fdf6d7fa0f87d8c2c0c77203e
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-28 13:22:11 +02:00
Orgad Shaneh
1bacbb943f De-noise RunConfigurations
Change-Id: I9def38768c0243358022f56bba80af2080ac8d05
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-05-28 09:38:47 +02:00
hjk
3462c5ef42 IEditor: Make duplicatesSupported a value member
Change-Id: Iee75dd4155d5074bb319df79d006b6d5e2989e14
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-21 14:29:00 +02:00
Eike Ziller
6d1cc58697 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/clangcodemodel/test/clangcompletion_test.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/projectexplorer/projectexplorer.pro
	src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
	src/plugins/vcsbase/vcsplugin.cpp
	src/shared/qbs

Change-Id: I9e5882be79ac5e8c7dfab4a57f16509d7569636a
2014-05-16 16:54:50 +02:00
hjk
6e584b5b49 DocumentModel: Make interface static
Move item model implementation to private, adjust user code.

Change-Id: Ifbe94e7c7b9b1e8be1b4c531958dbd7a9413af13
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-05-13 11:48:30 +02:00
El Mehdi Fekari
761c412181 CMake: Provide generators for Qnx/BB kits
Task-number: QTCREATORBUG-12210
Change-Id: Ie7cd3e9f95b823d166ad83018ec3199068132e5e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-09 13:06:06 +02:00
Tobias Hunger
dc61b989ac Project: Use Utils::FileName as return type for projectDirectory(...)
Change-Id: I3ea10aa204b1ea41702edab09884b416cd6d9e06
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-06 11:48:10 +02:00
Tobias Hunger
8d5e4b32a8 Project: Use Utils::FileName as return type for projectFilePath()
Change-Id: If304d5e95cd9ac714100abaae35d60e3e1050eb2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-06 11:30:45 +02:00
Daniel Teske
faab380cc1 CMake: Show a error if the cached generator is incompatible
Task-number: QTCREATORBUG-8594
Change-Id: I20b2ed5b82f5003315e6f72346a11980ce0929ef
Reviewed-by: Matt McLin <matt.mclin@barco.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-05-06 11:16:07 +02:00
hjk
2e757deab4 ProjectNodes: Refactor runConfigurationsFor()
Rename to runConfigurations() and remove the node argument which is
available as 'this'. Adjust const-ness of node argument in
RunConfigurationFactory::runConfigurationsForNode

Change-Id: Icb63e96a305152f90135a2656536de2581faafaf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-29 12:35:29 +02:00
Christian Kandeler
eccc1198d6 Use double quotes instead of single quotes as per our guidelines.
Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-04-22 10:06:40 +02:00
Daniel Teske
6f5a5a989f CMakeProjectManager: Remove outdated comment
There are no plans to create our own generator anymore.

Change-Id: I1e74f6ed90ccffbc3837574637ba42c40f375118
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-17 15:17:20 +02:00
Tobias Hunger
8b1728d89a CMake: Fix build warning
Change-Id: I934622c2cf993255d92550731a2cd186943d697b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-11 13:19:54 +02:00
Daniel Teske
ebb38289e8 CMakeProject: Fix useNinja handling in MakeStep
m_useNinja is now only used to store the value at init() time, thus
it's only use is to know while running, whether ninja is in use.

Otherwise whether ninja is used or not, is stored in the
buildconfiguration.

Change-Id: Icda933807ac2f8e5fad32fd124a37bb694bf6e97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-07 10:49:35 +02:00
Daniel Teske
d5f2dc0df4 CMake: MakeStep consistently check that we have a buildconfiguration
Technically the user can only get into a no buildconfiguration state
with broken settings. But we should either check everywhere or nowhere.

Change-Id: Ibdc831b66e6cf141c8d25bafed7e568e3cff2ab1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-07 10:49:22 +02:00
Daniel Teske
11d238649d CMake: MakeStep: Simplfy code
Change-Id: I4de1ceecc1f0602d0c58ee3e411d43b15437dffb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-04-04 12:02:45 +02:00
Eike Ziller
cab8e4aa03 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/qtsupport/qtversionmanager.cpp
	src/shared/qbs

Change-Id: If7a93fb018799fe6ada76e79c24ab5b43dfa6fc2
2014-04-02 13:24:34 +02:00
Daniel Teske
fc2fad44e0 CMakeProjectManager: Ensure that toolchain paths are last
Task-number: QTCREATORBUG-3959
Change-Id: I93a19af8309933a51d26f94980088c0f244cc84f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2014-04-01 16:25:05 +02:00
Oswald Buddenhagen
f013c41d05 Merge remote-tracking branch 'origin/3.1'
Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d
2014-03-27 18:20:00 +01:00
Daniel Teske
8b90474104 CMake: Fix GeneratorInfo to include Msvc2013 everywhere
Change-Id: I8192d194ac20d8082ebf1cc034e8b84e25e66d90
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-03-27 17:56:31 +01:00