Commit Graph

144 Commits

Author SHA1 Message Date
Christian Kandeler
8d3aa026e0 Utils: Rename PathChooser::changed() signal.
The name is overly generic, particularly with a pathChanged() signal
also present. Rename to "rawPathChanged", which adequately describes the
semantics.

Change-Id: Ia62b8b0a97a794cb6d5ad6b8ce0abcd36b5f5cdb
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-09-03 11:12:57 +00:00
Daniel Teske
c9a9f08d0a Cmake Open Project: Allow opening projects that have cmake errors
Change-Id: I3779fbe3f6409139b3d027f96ad390a174c0ff7f
Task-number: QTCREATORBUG-6903
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-08-31 10:19:45 +00:00
Daniel Teske
ebf051be27 CMakeRunPage: Fix appending of error messages
Change-Id: I2b1c54bbe948ca8b3ba5384a2e97e29b2fd878c9
Task-number: QTCREATORBUG-14439
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-05-18 10:51:02 +00:00
Benjamin Zeller
1e2d266541 Make CMakeTool known to the Kits
This patch adds support for binding a specific CMakeTool to a Kit.
When creating a new Kit or loading a existing one without a valid
CMakeTool, the default CMakeTool will be set.

Change-Id: I28d0843a01c583c4b31fc680a0ec556b40cd9c0d
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-03-03 12:47:36 +00:00
Eike Ziller
9e9755310b Merge remote-tracking branch 'origin/3.4' 2015-02-25 10:16:16 +01:00
hjk
592ffe7377 SettingsDialog: Remove CategoryId parameter from callers
PageIds are supposed to be unique, so the CategoryId can be determined
from the PageId. Look for PageIds in the already expanded categories
first before searching through expensive categories.

Change-Id: I006beb0df6183453163ac1810fe59a306a0f52b1
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
2015-02-24 13:52:00 +00:00
Benjamin Zeller
99e9643dea Make it possible to register multiple cmake instances
This patch add the CMakeToolManager, a central repository for cmake instances.
One instance is always the currently used "default". By that its possible to
switch between different cmake installations. The next step will be adding
it to the Kits.

Change-Id: I310fdd805e0ed239077a5632303e891dbd1d9ea1
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
2015-02-24 09:54:43 +00:00
Eike Ziller
3c85058694 Update License
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2015-01-16 12:37:56 +01:00
hjk
a439483d70 Use QFileInfo::exist(f) instead of QFileInfo(f).exists() if possible
Faster.

Change-Id: I91aa67462e11ff3258600d7f158de79942d0dc81
Reviewed-by: Marc Reilly <marc.reilly@gmail.com>
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
2014-11-03 09:31:28 +01:00
Eike Ziller
8295b503be License update
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-10-09 11:41:44 +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
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
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
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
Daniel Teske
f5705459d1 CMake: Offer Nmake generator for VS 2013
Task-number: QTCREATORBUG-11855
Change-Id: Ieba3c61d292831662184517c55f081792e2381bb
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2014-03-27 14:18:42 +01:00
Daniel Teske
5a6d5d6649 CMakeOpenProjectWizard: Set a parent
Task-number: QTCREATORBUG-11856
Change-Id: Ie80352683e2a8276f70191db2a3b333275e2648f
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
2014-03-26 17:53:07 +01:00
Benjamin Zeller
3b786e7faf cmakeprojectmanager: Move SettingsPage and GeneratorInfo in extra files
Move CMakeSettingsPage and GeneratorInfo into extra files
to prepare for refactoring

Change-Id: Idee2e9f807a961c0eee9c15198ee0966ecc16e83
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2014-03-12 16:55:17 +01:00
Sergio Ahumada
c375436847 Fix some typos
Change-Id: I3be73c2a4d256a0d28e863fd2517a4d7442b34d8
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-03-05 09:39:42 +01:00
Eike Ziller
4251265a63 Unify text on buttons that open the options dialog
We have many buttons that open the options dialog, and many of these use
different terms.

Change-Id: I073fe2a23569c6f4174a2fb6567359c89cb2427c
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2014-02-25 16:55:25 +01:00
Tobias Hunger
5559e64c7e Cmake: Add history completer to path chooser
Change-Id: Ib747ce4903668799a47011ae7cddfd898aaf722b
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2014-02-10 10:25:44 +01:00
Robert Loehning
746c5d8863 Incremented year in copyright info
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2014-01-08 08:29:47 +01:00
Friedemann Kleint
119548a0ff Remove most leading/trailing blanks from translated messages.
They are a hassle for translators and reviewers alike.

Change-Id: I363138212b692cf75fe1605df8af3721315d37e1
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-10-24 10:50:56 +02:00
Eike Ziller
56c3d8ffab Unify wizards with TOC and cancel button.
QTBUG-28385 is biting us over and over (QWizard doesn't have close
button nor cancel button on Mac in Qt 5), and actually there's no reason
for us having a wizard without the features from Utils::Wizard.

Task-number: QTCREATORBUG-10346
Task-number: QTBUG-28385
Change-Id: I80c0d82fe6738496c2ac03c31a1c2757ade8e266
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-10-09 14:31:14 +02:00
Tobias Hunger
d2adc30335 BuildConfigurationFactory: Refactor code
Refactor the code of the build configuration factories. The idea is to
generalize the code so much that we can allow plugins to install
custom build configuration factories for the platforms they support.

To support this use case the following changes where done here:
 * BuildInfo class was introduced to describe one build configuration that
   can be created by a factory.
 * Factories report a list of BuildInfo to describe what they can produce.
   This fixes the need for factories to implicitly create one buildconfiguration
   and then create another one 'officially' to support debug and release build
   configurations to be set up for projects.
 * Do no longer work around factories to create build configurations.

Change-Id: Ic372e4a9b5c582633b467d130538948472b89d91
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-17 12:00:01 +02:00
Oleksii Serdiuk
328a24edee CMake: Make CMake plugin work with RemoteLinux plugin.
Modified CMake plugin to work correctly with RemoteLinux plugin.
Because of not being able to extract files to be installed from CMake
project, only executable targets are automatically added to deployment
files. All other files have to be specified in CMakeDeployment.txt file
which should be placed into root of CMake project. The file format is:
> deployment/prefix
> relative/source/file1:relative/destination/dir1
> ...
> relative/source/filen:relative/destination/dirn

Where:
- deployment/prefix is (absolute) path prefix to which files will be
  deployed on the remote machine.
- relative/source/file is file path relative to CMake project root.
  Plain files - no directories or wildcards supported.
- relative/destination/dir is destination directory path relative to
  deployment/prefix.

Change-Id: I0831636c1b9aac3ff16bb6293104c512d2abfb5a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-09-16 13:30:54 +02:00
Nikolai Kosjar
69fc3cf03f Kill ";;" at end of statement
Change-Id: I177094f19978e07f85e42b34701d8f03cd26665e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-09-04 09:19:10 +02:00
Tobias Hunger
95859289b8 KitManager: Use static API as other singletons do
Change-Id: Ia49c6552a5aae72870687ef9c64f2642fbe24155
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-08-21 16:55:16 +02:00
Daniel Teske
ac93e9734d CMakeProjectManager: Only supports desktop kits
Task-number: QTCREATORBUG-9340

Change-Id: I1e209cc96bf415fe065520caa51f90d4f5ecf134
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-05-24 14:24:10 +02:00
Daniel Teske
5d993c3f76 CMakeOpenProjectWizard: Explicitly add a "cancel" button.
Task-number: QTCREATORBUG-9264
Change-Id: I7c726177ff855da41d1971245655e8dc24740430
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2013-05-08 13:22:40 +02:00
Yuchen Deng
e8aebf9f10 CMake: Make the default kit as the current generator
Change-Id: Id8b42469fc7fdc22278bcaf4f5cb60f42d8f6c53
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-01 12:21:13 +01:00
Yuchen Deng
04e267b482 CMake: Don't save entry if CMake exited with errors
Change-Id: Ife98b33c3269a452187c957bd5579722b3ae4018
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-01 12:19:25 +01:00
Yuchen Deng
75d1c3035a CMake: Add option for preferred Ninja user
Change-Id: I5a3aa31db7fa37f31a4b557eb5b09b7987169265
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-28 16:14:01 +01:00
Daniel Teske
fc867d5daf CMakeOpenProjectWizard: Warn the user if no kit is available
And allow the user to configure kits before proceding.

Change-Id: I6acf2bcc05d53b0ac9d448599d29d2fe02ae1349
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-21 13:33:26 +01:00
Daniel Teske
5c653f40a3 CMakeOpenProjectWizard: The user needs to always select a kit
So check that in isComplete() and prevent a crash.

Task-number: QTCREATORBUG-8717
Change-Id: Ib485941534a4f0f3aa4e791fdb655eb9061ba9fa
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 14:47:52 +01:00
Daniel Teske
ca8df404d9 CMakeOpenProjectWizard: Rename misnamed variable
Change-Id: Ib8836483fa1f7fdf3af4063b25a7940ae07080a8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-14 14:47:44 +01:00
Leena Miettinen
1bfe9488f0 UI text: fix capitalization of CMake
Change-Id: I2d45f123936bb53a2659b6e96afc9073ab2b140c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-12 16:37:32 +01:00
Robert Loehning
b31432ea08 String fix
Change-Id: I1e735c3caa617e5255caa55c2dab2ade61ec5989
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
2013-02-11 14:33:19 +01:00
Yuchen Deng
bc1977d238 CMake: Select arguments text for easy editing
Change-Id: I416a35a773792a1aee17811c022820262eb7f23e
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-04 11:24:04 +01:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/qmldesigner/components/integration/designdocumentcontroller.cpp
	src/plugins/qmldesigner/designercore/include/widgetqueryview.h
	src/plugins/qmldesigner/designercore/metainfo/metainfoparser.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.cpp
	src/plugins/qmldesigner/designercore/model/modelnodecontextmenu.h
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qnx/bardescriptormagicmatcher.h
	src/plugins/qt4projectmanager/profilekeywords.cpp
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h

Change-Id: Ie465a578446a089e1c502d1cb1096e84ca058104
2013-01-31 16:25:33 +01:00
Robert Loehning
298531e370 Incremented year in copyright info
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2013-01-29 16:27:03 +01:00
Friedemann Kleint
8bb0134c50 tr()-Fixes: Fix translation contexts.
Change-Id: Ic043a097947a80e2fb5cb381c585375c4e5f5eef
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
2013-01-29 13:58:36 +01:00
Orgad Shaneh
f8645bb6c7 Translate some strings
Change-Id: I5eab1edbca591cc36813cd862d6ad93875b51a3c
Reviewed-by: hjk <qthjk@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-26 09:47:14 +01:00
Orgad Shaneh
862629c57a CMake: Compile with QT_NO_CAST_FROM_ASCII
Change-Id: I23134b7eef222dcdb3425e2f2f6d62ab863009fe
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-23 11:52:11 +01:00
Eike Ziller
fe74a9a722 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70
2012-11-09 11:20:10 +01:00
Daniel Teske
8be5ac0ebc CMake: Fix crash in CMakeOpenProjectWizard
Change-Id: Icb78bb7c1a652913852a77a59cd729c4d8745d4d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-11-07 15:41:03 +01:00
Daniel Teske
da7d0f6957 CMakeOpenProjectWizard: Fix indentation
Change-Id: I892e3e2f34ef5acafe9ffe89eb85187047aaa32e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-07 13:24:09 +01:00
Eike Ziller
70b5e1f64d Merge remote-tracking branch 'origin/2.6'
Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d
2012-10-16 17:42:10 +02:00
Daniel Teske
03a68e38b6 CMakeOpenProjectWizard: Add page asking for cmake executable
We used to do that on the cmake run page, but given it's own page is
certainly better.

Task-number: QTCREATORBUG-7971
Change-Id: Id38690a750e99dbccfd9f17f64423033891b0d78
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-16 16:45:51 +02:00
Daniel Teske
c2d20b7ddb CMakeOpenProjectWizard: Simplfy constructor
We can simply call addPage and create a linear wizard instead of
manually setting up a linear structure via setPage + wizard progress

Change-Id: If4524ac235f4d1b0e6ed6d1b322b5ecac5966e2c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-16 16:45:47 +02:00