Commit Graph

3443 Commits

Author SHA1 Message Date
Eike Ziller
3e7d94c362 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ib5e7c433606406d123b4a384ae1b48e2dbb26824
2012-11-16 15:31:02 +01:00
Daniel Teske
51bca85117 Replace BuildConfigWidge with NamedWidget
They have a identical interface.

Change-Id: Ia626496fbaffedefff6ee20b958cd505085d89f7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:26 +01:00
Daniel Teske
ea640a5aea BuildConfigWidget derived classes: Add missing tr()
Change-Id: I1861400c4d50191ed2fd2eba7c28f72628236f12
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:21 +01:00
Daniel Teske
3ef968097f BuildConfigWidget: Make displayName property instead of a virtual func
To make the interface the same as NamedWidget.

Change-Id: I5961b4e5aa7f5acf3a7f83e82b6fa4266b9ebf97
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:16 +01:00
Daniel Teske
b5bbdb38d9 Remove BuildConfigWidget::init()
It no longer serves a purpose.

Change-Id: Icdcb69c87112e295cefd4975dfa2b3d65818365a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:43:09 +01:00
Daniel Teske
613f3345e1 BuildConfiugration::subConfigWidge() Provide a default implementation
Which simply returns a BuildEnvironmentWidget. A long time ago
BuildConfigurations had no environment, nowdays they do. So it makes
sense for all BuildConfigurations to have the BuildEnvironmentWidget.

Change-Id: I824c45df79a0dcd2b624bf67a4730fb5dab098bc
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:10 +01:00
Daniel Teske
e08b38ffd6 Move Project::subConfigWidgets to BuildConfiguration
Change-Id: Idf58ebbb02e9cd0ab4ff7e74fbed17250e274693
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:40:00 +01:00
Daniel Teske
cfadfd6f3f CMakeProjectManager MakeStep: Slightly reduce dependency on CMakeBC
Change-Id: I2fee3e4ed1c217e16e3389610b01ee8a1f9604f7
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-16 14:39:18 +01:00
Robert Loehning
2394ceef6c Updated strings after target -> kit renaming
Change-Id: Ia686fdb377e2267c7687d6804c02b209402d6275
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-11-12 10:34:15 +01:00
Orgad Shaneh
10be8c9a48 InfoBar: Use Core::Id
Change-Id: I0918fbc20027a340facbedc685938a72d117d53b
Reviewed-by: hjk <qthjk@ovi.com>
2012-11-09 15:34:50 +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
be516c7c6e Remove useless CMakeBuildConfiguration fwd-declaration
Change-Id: If0a88439f5ebbcf01cbe90332f74540fd5c09413
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-07 13:24:17 +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
Daniel Teske
31e2ddd085 Kit: Add createOutputParser method
Which asks each KitInformation for their parser, thus currently creating
a toolchain + qt chain if that is applicable. Remove all code that does
that by hand from various buildsteps/buildconfigurations.

Change-Id: I79a07ffd1dbe9a43bdbc838bc0098071aa412009
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-11-02 14:49:34 +01:00
tomdeblauwe
76f69d0e2e CMake: add auto completion for cmake editor
Original Patch by tomdeblauwe <tdb@traficon.be>

Change-Id: I54aea31755dd5702e6998c8343114d34a8752f7b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-10-25 12:25:20 +02:00
Eike Ziller
021b64b5df Merge remote-tracking branch 'origin/2.6' 2012-10-22 11:17:09 +02:00
Daniel Teske
22327b0fa1 CMake: Use correct environment for new kits
Task-number: QTCREATORBUG-8073

Change-Id: I9c262fd553fa1af0e8de4900f465fe45aa8bbf78
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-19 11:46:12 +02:00
Eike Ziller
49d5c2381a Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/3rdparty/botan/botan.qbs
	src/libs/ssh/ssh.qbs
	src/plugins/qnx/blackberryqtversion.cpp

Change-Id: Ie8d16d636528aab4006310eab47a342fdf2634d9
2012-10-18 10:40:11 +02:00
Daniel Teske
d45716a820 Remove unnecessary overloads of BuildConfiguration::baseEnvironment()
Change-Id: I9805f5cb87f6c30b7952f9970b007f883eb62507
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-17 14:25:49 +02:00
Daniel Teske
f6d5ba9b1a CMake: Reparse .cbp files on swtiching targets
Also fix the code to not reparse the wrong file if the bc for a non
active target would be changed.

Task-number: QTCREATORBUG-8063
Change-Id: I40be4bbb1a5ef6ccc78515f153534a7304cae0e1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-16 18:01:31 +02: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
c3190f6e7f Kits should affect all buildconfiguration environments
Not just qt4 and cmake but also generic projects.

Change-Id: I4a7e86fb2dbf6c6e32b4da78953ad3199c554470
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-16 16:46:47 +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
Eike Ziller
720cb9f35e Merge remote-tracking branch 'origin/2.6'
Conflicts:
	qtcreator.pri
	qtcreator.qbp
	src/libs/ssh/sshconnection.cpp

Change-Id: I2946cbec1b5159eef9e47949860b28fba1e51529
2012-10-11 21:11:40 +02:00
Daniel Teske
28e7dcea41 CMakeBuildConfiguration: Actually save / restore useKit setting
Task-number: QTCREATORBUG-7984

Change-Id: Iaa33e95bd827e8b8662c62e155c0e9aca3d2fd69
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-11 12:16:46 +02:00
Eike Ziller
6fd252b0a5 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.cpp
	share/qtcreator/qml/qmlpuppet/commands/endpuppetcommand.h
	src/plugins/debugger/qtmessageloghandler.cpp
	src/plugins/debugger/qtmessageloghandler.h
	src/plugins/debugger/qtmessagelogwindow.cpp
	src/plugins/madde/maemodeployconfigurationwidget.cpp
	src/plugins/madde/maemodeployconfigurationwidget.h
	src/plugins/remotelinux/deployablefilesperprofile.cpp
	src/plugins/remotelinux/deployablefilesperprofile.h
	src/plugins/remotelinux/deploymentinfo.cpp
	src/plugins/remotelinux/deploymentinfo.h
	src/plugins/remotelinux/deploymentsettingsassistant.cpp
	src/plugins/remotelinux/profilesupdatedialog.cpp
	src/plugins/remotelinux/remotelinuxdeploymentdatamodel.h
	tests/auto/icheckbuild/ichecklib.cpp
	tests/auto/icheckbuild/ichecklib_global.h
	tests/auto/icheckbuild/parsemanager.cpp
	tests/auto/icheckbuild/parsemanager.h
	tests/manual/ssh/tunnel/tunnel.h

Change-Id: I04d7761df6bd936ad00e0547974284c967d39580
2012-10-05 21:20:50 +02:00
Eike Ziller
68c796e244 Merge origin/2.6
Conflicts:
	src/libs/utils/fileutils.cpp
	src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h
	src/plugins/cmakeprojectmanager/cmakeproject.cpp
	src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
	src/plugins/cmakeprojectmanager/makestep.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: I153295bad2d97609d96d28945e9f942c5b46b2da
2012-10-05 20:51:31 +02: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
Daniel Teske
9de676ce03 CMake and Kits: Fix interaction between them
On initial run we offer the user a choice between all the kits, which
are compatible with the cached generator. After the initial run, the
user can't change kits nor generators anymore.
Except if the builds into a new directory or adds a buildconfiguration,
then the user can choose between generators but not kits.

Task-number: QTCREATORBUG-7940
Task-number: QTCREATORBUG-7928

Change-Id: I9b663435cd2e021f7fe08379c1c487a6aebe8976
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
2012-10-05 12:17:03 +02:00
Orgad Shaneh
614bb33589 qbs files: Consolidate includePaths in QtcLibrary and QtcPlugin
Avoid using "." as includePath when it is unneeded

Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-05 10:18:56 +02:00
Peter Kümmel
264313ec90 CMake: add Ninja support
The cmake wizard proposes also ninja if ninja support is available

Ninja must be in PATH, but it is only called once, so it doesn't hurt.

Task-number: QTCREATORBUG-7720
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: If3c9c7ae55e6990fa16b031fc2998a8d8d9ed17a
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
Reviewed-by: Yuchen Deng <loaden@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-10-04 15:26:08 +02:00
Orgad Shaneh
a00b291484 qbs files: Sort files
Change-Id: I6514deb70162bd52687e6143813bcf1325a797db
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2012-10-03 09:26:34 +02:00
Eike Ziller
6faede0860 Merge remote-tracking branch 'origin/2.6'
Conflicts:
	share/qtcreator/qml/qmlpuppet/commands/changenodesourcecommand.h
	share/qtcreator/qml/qmlpuppet/commands/tokencommand.h
	share/qtcreator/qml/qmlpuppet/container/reparentcontainer.h
	share/qtcreator/qml/qmlpuppet/qml2puppet/instances/componentnodeinstance.h
	share/qtcreator/qml/qmlpuppet/qmlpuppet/instances/nodeinstanceclientproxy.cpp
	src/plugins/git/gitsettings.cpp
	tests/manual/ssh/remoteprocess/remoteprocesstest.h

Change-Id: I00c294e6d911d272615e65fed58562399af97a4e
2012-09-27 20:38:57 +02:00
Tobias Hunger
6c436988ff Use QtParser in CMake/Autotools/generic project makesteps
Change-Id: Ibe8db500e1b8ed7b473cc07cb00e303fa6bea9d1
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-27 11:55:27 +02:00
Peter Kümmel
9107d8d768 CMake: add Ninja support
The cmake wizard proposes also ninja if ninja support is available

Ninja must be in PATH, but it is only called once, so it doesn't hurt.

Task-number: QTCREATORBUG-7720
Change-Id: If3c9c7ae55e6990fa16b031fc2998a8d8d9ed17a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
2012-09-24 14:22:15 +02:00
Christian Kandeler
3d9e492860 Do not use the fromAscii() and toAscii() functions.
They are deprecated in Qt 5. Use fromLatin1() and toLatin1() instead. In
Qt 5, these always do the same thing as their "Ascii" counterparts. The
same goes for Qt 4, provided QTextCodec::setCodecForCStrings has not
been set, which it hasn't.

Change-Id: I04edeb376762b6671eff8156094f0d5e2cb8e1ea
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
2012-09-21 21:03:48 +02:00
Christian Kandeler
c0321ac305 Replace some Q_OS_* constructs with their HostOsInfo equivalents.
Change-Id: I023ba83f3dfc8ba51a6dda6236d0156358a2e592
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2012-09-19 16:37:01 +02:00
Oswald Buddenhagen
e730e2bb8a Merge remote-tracking branch 'gerrit/2.6'
Conflicts:
	src/libs/utils/environment.cpp
	src/plugins/android/androidtoolchain.cpp
	src/plugins/projectexplorer/gcctoolchain.cpp
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	src/shared/proparser/qmakeevaluator.cpp

Change-Id: I554e96445a4d2b9ba0cc173ecd766091ee921aa2
2012-09-12 17:27:37 +02:00
Daniel Teske
d3c0557444 Make Toolchain::makeCommand return a full path to the make command
Requires passing in the environment to use. Also now the mingw toolchain
has a fall back to make.exe on windows. And the msvc toolchain falls
back to nmake even if the "use Jom" option is used.

Task-number: QTCREATORBUG-7831

Change-Id: I850a96da41a380eef8c6992e27a72fb63958c456
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Peter Kümmel <syntheticpp@gmx.net>
2012-09-12 16:29:30 +02:00
Orgad Shaneh
4ef2fbd4ce Profile -> Kit variable renaming
Change-Id: I6cc06684134030bd527d9dcce21ad17938a56927
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
2012-09-11 17:08:52 +02:00
Nikolai Kosjar
9483408fec Locator on Linux/Mac: Show ~ instead of $HOME in paths.
With this, you will see more of the "relevant" path.

Change-Id: I03c4c7bd2bdaa9148c70a68678306e259f9c7204
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-09-11 15:42:58 +02:00
Tobias Hunger
9d90f8b396 Warn if kit has no tool chain set up
Change-Id: I551402c1e3023feeeb127f001a0e908938a07fc2
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-06 16:52:21 +02:00
Orgad Shaneh
948abf10ae GCC: Actually use sysroot for header path detection
Function signature was prepared for that on
4c6b794774 but it wasn't really used

Change-Id: I1ee7059a00f0441d42a117b8f8d2c8c776d93815
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-09-05 12:18:33 +02:00
Friedemann Kleint
a54056dacb CMakeProjectManager: Windows build fix.
Profile p -> Kit k in #ifdef Q_OS_WIN.

Change-Id: I6701b7c4c68770323d7b66ba2058861aa16f1cdc
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2012-09-05 08:21:57 +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
Yuchen Deng
0cb8c46328 Fix cross compiling for CMake based project
On Linux/Unix, there does not exist "MinGW Makefiles" generator.
Using "Unix Makefiles" can simply fixed the issue on Linux.
And does not effect Windows builds.

Change-Id: Id69e1a24485fbab05866f52d823035abc1dca06b
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
2012-08-31 17:23:20 +02:00
hjk
8d3c1cfb05 Rename FancyLineEdit::setHistoryKey -> setHistoryCompleter
similar for HistoryCompleter *m_completer -> m_historyCompleter

Change-Id: Ic7aedc19cbb865f0a5bdddb9565a7411fd06dfde
Reviewed-by: hjk <qthjk@ovi.com>
2012-08-24 16:18:39 +02:00
hjk
88f5949e38 close down history completer interface
Change-Id: Iaeff40be410d1f0facd687632c9ce4897eb2e613
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
2012-08-24 13:38:15 +02:00