Commit Graph

62 Commits

Author SHA1 Message Date
David Schulz
d33e66c895 ProjectExplorer: Detect all msvc toolchains.
The host system will not be taken into account, so the cross build
toolchains are also detected.

Task-number: QTCREATORBUG-10998
Change-Id: I04a410bbf368898b70d9560d2c2a4a6c60ed0b61
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2014-04-10 08:02:20 +02: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
1226400af3 Introduce an enumeration for toolchain autodetection.
Replace boolean "autodetect" by an enumeration with a value
AutoDetectionFromSettings indicating whether the Autodetection
originates from a settings file. Enable the "Remove" button for
those cases.

Currently, there is no way to remove toolchains that were once
autodetected and are no longer present. This happens for example
when working in different MinGW environments, which then
clutter up the toolchain options page and dramatically slow
down the options page opening since gcc is launched to query
the flags, etc.

Change-Id: I731168d8694fe56f60d909f9779f83cffa55fd44
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
2013-09-03 11:32:33 +02:00
hjk
e4b2947c6f ProjectExplorer et al: Code cosmetics
Apply static 'pattern' for ToolChainManager, de-noise using code.

Change-Id: I196dc6f39dc2c61b1783aecad3faa0b23849e00a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-08-29 16:45:25 +02:00
Tobias Hunger
0ef3acc9f2 ToolChains: Stop SDK-tool chains from multiplying
Task-number: QTCREATORBUG-9124
Change-Id: I93b43183e217b63179a9813e39c242a459eca842
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-05-07 16:03:38 +02:00
Eike Ziller
46b9c03cbc Clean up where the QSettings is retrieved from.
The settings in the plugin manager (local/global) are where the plugin
manager is supposed to look for its settings, which has per se nothing
to do where Qt Creator wants other settings to be written to.
All Qt Creator code should use ICore::settings() for that instead.

Change-Id: I28bd855ae6cbcdf8d19017eb44f178e4624a1a61
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-04-10 15:30:34 +02:00
Friedemann Kleint
92207c96b7 Clean headers in ProjectExplorer.
Change-Id: If61a8a91d2a39c5c97974a5bfcef91892b68d3f1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-03-26 12:37:29 +01:00
Tobias Hunger
aef18a4bca ToolChainManager: Load tool chains in extensionsInitialized()
Change-Id: Iecbdad090c43fdabfb2d3ceac65fbbb2a72b33c2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-28 18:11:45 +01:00
Daniel Teske
287ba032ab ToolChainManager: Do not try saving in ~ToolChainManager
This is after plugins have been shutdown. The toolchains are saved on
shutdown anyway.

Change-Id: I7d84c3c4538f27aa3f4c7c2677307de49621d641
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-27 15:35:19 +01:00
Tobias Hunger
7ed4f6ec48 ToolChainManager: Do not unregister toolchains on destruction
Change-Id: I9aaa292d4c1b6e7bbccce5ffe4ae780621074c98
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-27 14:23:16 +01:00
Tobias Hunger
eb6e5a77ce ToolChains: Warn when loading tool chain data too early
This helps getting the plugin initialization right.

Change-Id: Id67508fe2d188132ca16ab8cca808a8c11080fa3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2013-02-26 15:26:19 +01:00
Daniel Teske
0d6e20c6e9 ToolChainManager: Drop autoDetected toolchains that are no longer valid.
Improve isValid for GccToolChain and MsvcToolChain to make that sane.

Change-Id: If45cdb4e2666dd1a2ee16c01cb65427362ec29da
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-02-01 13:08:45 +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
Tobias Hunger
3f945d6737 ToolChain: Do not delete ToolChains that were not auto-detected again
Do not delete auto-detected tool chains that are still found on the
system if they are not auto-detected again. This avoids kits loosing
toolchain information when the PATH variable changes.

Change-Id: Ibb91a0a3636828c3db40827bfe8b303502ce2a11
Reviewed-by: hjk <qthjk@ovi.com>
2013-01-10 15:09:06 +01:00
hjk
386ca7c8dd Adjust license headers
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-10-05 17:12:56 +02:00
Tobias Hunger
eaaae54e10 Make sure to save settings when closing managers
This is needed to catch any updates that were triggered during tear
down of the UI (which happens after the saveSettings signal was emitted).

Change-Id: I9f14e8807070f3192551a3653bad31072db539f5
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-04 13:21:47 +02:00
Tobias Hunger
6bf583987a Warn when failing to restore auto-detected tool chains
Change-Id: If9582c35a35322efcd0d1666a6e52a62df98af21
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 13:09:28 +02:00
Tobias Hunger
e81cfa6e70 Make sure to never write kits/Qt/TCs before they were read
We should be save already, but let's be paranoid...

Change-Id: I925fb94f4cebe4c54e3419e18d307a999055ebbf
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 14:20:42 +02:00
Tobias Hunger
14bc65fdff Revert "Make sure to never write kits/Qt/TCs before they were read"
This patch causes core dumps in my work-creator while it works fine
in my test creator. Revert till I find the reason for this.

This reverts commit 5d253b3704.

Change-Id: Ib9912cda15294c28b9136f79675e0e5694788d5b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-27 12:32:35 +02:00
Tobias Hunger
5d253b3704 Make sure to never write kits/Qt/TCs before they were read
We should be save already, but let's be paranoid...

Change-Id: I925fb94f4cebe4c54e3419e18d307a999055ebbe
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 11:55:18 +02:00
Tobias Hunger
c9f4d24cb4 ToolChains: Accept autodetected duplicates
This is to prevent throwing out tool chains the SDK wants to register.

Change-Id: Ia49552bcffd98cf4579784047f9a425b2279b83f
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-19 16:29:20 +02:00
Tobias Hunger
adb40fadb6 ToolChains: Read SDK settings from Nokia/qtcreator/toolchains.xml
and not from Nokia/toolchains.xml. This makes sure the SDK settings
and the personal settings pathes differ in prefix only.

Change-Id: Ib3a742d28258e86912cb820ff6c9d0c1b44c1763
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
2012-09-19 10:28:53 +02:00
Tobias Hunger
8ba422d07c s/profile/kit/
* Rename profiles to kits.
* Update some strings:
   * projects mode has a Kits tab, not a Targets tab.
   * " Settings" was dropped from the sub-tabs of the Kits tab
   * menu entry "Build/Open Build/Run Target Selector" was renamed
     to "Build/Open Build and Run Kits Selector".
   * Use "Kit" instead of "Target" in miniprojecttargetselector.
     (The class was not renamed as it does indeed select targets,
      not kits)

Change-Id: I0727e086e2dfa0e8aaaf89fdc6f2e3596c7a4314
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-04 15:24:25 +02:00
Tobias Hunger
fb59a39a78 Fix saving of XML configuration files
... when removing settings

Change-Id: If85061321082a8cd0e35752f71d2498fd4693dfd
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-04 14:21:01 +02:00
Tobias Hunger
96d8009693 Fix saving of xml files
Do not save XML config files (profiles.xml, toolchains.xml, etc.)
if the file has not changed.

Change-Id: I5f0dea374b33a05e7c428f4031d53c83d92de595
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-24 15:48:40 +02:00
Tobias Hunger
61e95e9a99 Replace some QStrings with Utils::FileName
Change-Id: Ia96963b90788250b4bc6bc89c2bb697de103535f
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-08-24 11:27:05 +02:00
Eike Ziller
5a895d4fe5 Rename "Tool Chains" option page to "Compilers"
Currently it contains compiler settings only, so there's no
need to let people search for e.g. debugger settings there,
that might be considered part of the toolchain, too.

Change-Id: I458f3d1cf1784b85820f8af7604a2a004372a909
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 09:26:51 +02:00
Orgad Shaneh
07aec935b7 Fix warnings
MSVC warns about pm being unused (because settings() is static)

Change-Id: I750804cc52edc71649545bc03f798a6802c87c7d
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-07 22:22:29 +02:00
Konstantin Tokarev
d18bf468ad Changed return type of :ICore::mainWindow() to QWidget*
Also removed all <QMainWindow> includes which are not needed
anymore.

Change-Id: I393c9a62a5c6df95d9f35d872e1473a4f13bcdc4
Reviewed-by: hjk <qthjk@ovi.com>
2012-07-19 15:15:53 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
2012-07-19 13:23:21 +02:00
Tobias Hunger
2431456216 Profile introduction
Introduce Profiles to store sets of values that describe a system/device.

These profiles are held by a target, getting rid of much of the information
stored in the Build-/Run-/DeployConfigurations, greatly simplifying those.

This is a squash of the wip/profile branch which has been on gerrit for a
while, rebased to current master.

Change-Id: I25956c8dd4d1962b2134bfaa8a8076ae3909460f
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-06-21 12:08:12 +02:00
Eike Ziller
e3c354d8f2 Make PluginManager mostly static.
Change-Id: Ib938aa4999c7c418a82304c5cca2e8748ef9d228
Reviewed-by: hjk <qthjk@ovi.com>
2012-06-19 16:11:40 +02:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives.
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-02-15 16:24:46 +01:00
Eike Ziller
9dcb65a3dc Delay autodetection of the tool chains to a point where it's needed.
Change-Id: Ic05b2ec842be1486203c3d9e6e0fc28f1fcf91b4
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: hjk <qthjk@ovi.com>
2012-01-30 18:00:36 +01:00
Tobias Hunger
52b47364de Use QUuids to identify tool chains
Save/Restore has been updated to reflect this:

We now save manual as well as auto-detected tool chains into the user
toolChains.xml file.

When loading we load the SDK as well as the user toolChains.xml files.
We then do a autodetection run. All the tool chains restored that are
marked up as auto-detected are then checked again:
 * the tool chain was autodetected again: Throw away the newly auto-
   detected tool chain and reuse the saved one. This makes sure we
   keep the QUuid that is now part of the tool chains id.
 * the tool chain was not autodetected again: Throw away the saved
   tool chain.
 * the tool chain was newly autodetected: Add the new tool chain

We keep the old id around in the legacyId() method. It is used when
loading old .user files only. So there is no need to implement this
method for new tool chains.

Task-number: QTCREATORBUG-6702

Change-Id: Ifc0a216e5351a8a57db03615ba329e355e7d5f59
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-30 12:25:40 +01:00
hjk
2931a499e6 Long live the king!
Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-26 19:55:36 +01:00
hjk
4a21f0c3c8 Use new static ICore interface.
Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-24 18:48:47 +01:00
Tobias Hunger
2776346db4 Have ToolChainManager::defaultDebugger() return a FileName
Fix fallout of that change.

Change-Id: I2ba7187b232d17d03fecbea63fa68920bdafc5f2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-13 16:53:47 +01:00
Friedemann Kleint
ced6fc4136 ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII.
- Add missing translations
- Remove some unneeded conversions.

Change-Id: Ia30e5c838099e52a9f38ca4854395c10c0391075
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-01-09 16:45:08 +01:00
Eike Ziller
8cc3844038 Allow build to specify different settings path.
Task-number: QTCREATORBUG-5509
Change-Id: I4541049a1861e83f55106effc536fd50eb233d97
Reviewed-by: Alexander Lenhardt <alexander.lenhardt@nokia.com>
Reviewed-by: Niels Weber <niels.2.weber@nokia.com>
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
2011-12-16 08:48:31 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2011-11-03 10:33:19 +01:00
Jarek Kobus
2244911826 Implement Code Style schemes
Task-number: QTCREATORBUG-5092

Change-Id: I218cef02f7c242e4dfae59b1b8021ea618e60d07
Reviewed-on: http://codereview.qt-project.org/5160
Reviewed-by: Leandro T. C. Melo <leandro.melo@nokia.com>
2011-09-23 10:23:15 +02:00
hjk
dbe1653775 more style
Change-Id: Iecd6819a5376beced5413f134d3026fb889a13b1
Reviewed-on: http://codereview.qt-project.org/5115
Reviewed-by: hjk <qthjk@ovi.com>
2011-09-19 08:56:31 +02:00
Friedemann Kleint
cc632c1597 Header cleanup in ProjectExplorer.
Change-Id: I19f100003427ba43aaae5ba0dc7078088017cb09
Reviewed-on: http://codereview.qt.nokia.com/3178
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-18 13:47:33 +02:00
Tobias Hunger
20fe639139 Fix copy and paste error
Thanks Tim for pointing it out!
2011-05-13 12:27:55 +02:00
Friedemann Kleint
ddf4b613f3 Krazy fixes (spelling, single char strings, char constants). 2011-05-10 15:21:41 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
45c9cf7a12 add/unify i/o error handling
lots of use of Utils::FileSaver and Utils::FileReader

Task-number: QTCREATORBUG-1619
2011-04-18 14:10:14 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2'
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
2011-04-14 12:39:31 +02:00