feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
28,096 Commits 108 Branches 368 Tags
7545ce072f64cd6b16f7663b0643fb0024bdeff1
Commit Graph

34 Commits

Author SHA1 Message Date
Eike Ziller
7545ce072f Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/projectexplorer/devicesupport/devicemanager.cpp

Change-Id: I1d46128f530428315e7ab5d52c8115036371487f
 2013-03-04 15:07:19 +01:00
Tobias Hunger
dea731088a Kit: small fixes 
Change-Id: I24ce10ac147b116ca438681b34cdc4398675edeb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-28 18:12:29 +01:00
Oswald Buddenhagen
6bbdeec812 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	src/plugins/qnx/blackberrydeployconfiguration.cpp

Change-Id: I16d1c7717f4bc25ba7e8dbdd5be6580fafe3f33d
 2013-02-28 12:02:40 +01:00
Daniel Teske
2a4f73c7b9 Add sdkProvided flag to Kits 
Change-Id: Ic413ed46abd4455b5bc3d282326e95b9dd372b49
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-21 17:33:59 +01:00
Oswald Buddenhagen
1ffe15a471 Merge remote-tracking branch 'origin/2.7' 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I84145b02bf4f80848c0c1d762de34738f08bb78f
 2013-02-18 14:16:53 +01:00
Tobias Hunger
84e24dee82 Kit: Simplify code a bit 
Change-Id: I5b092dacd6ebcbd3bf914829f2810c4b1d38c351
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-15 13:25:45 +01:00
Tobias Hunger
d0587c951f Kit: Display warning and error icons 
Display warning and error icons in the kit options page. This is more
consistent with what we do elsewhere.

Change-Id: I31786054da3ad8c55931156f0124740eea2d68d3
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-02-08 11:27:33 +01:00
Fawzi Mohamed
9f8e5c443c ProjectExplorer/Kit: making toHtml() const 
Change-Id: I8a9be3cda84f5d00d29a8f5e101c004ea2bbc6ba
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-02-04 17:25:44 +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
Oswald Buddenhagen
f1cec4629e Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/libs/utils/tooltip/tips.cpp
	src/plugins/coreplugin/versiondialog.cpp
	src/plugins/projectexplorer/kitinformationconfigwidget.cpp
	src/plugins/qnx/blackberryapplicationrunner.cpp
	src/plugins/qnx/blackberrydeployconfiguration.cpp
	src/plugins/qnx/blackberrydeployconfiguration.h
	src/plugins/qt4projectmanager/qmakekitconfigwidget.cpp

Change-Id: I7886ec971942d9e0a9da237dcf4ceb1687abd71b
 2013-01-29 15:52:36 +01:00
Kai Koehne
5e5831bb12 Add a space after "Error:" in tooltip 
Change-Id: I0ecefcedf49175abee7a71ddce9ce9630b989a17
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-23 17:59:42 +01:00
Tobias Hunger
f2122583da Kits: Reduce magic while improving setup 
Task-number: QTCREATORBUG-8576
Task-number: QTCREATORBUG-8081

Change-Id: I9a6675a8ae97517f78bca026c4aa0edca82d606d
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-22 16:02:31 +01:00
hjk
e7003283a5 Kits: update Core::Id usage to new interface 
Change-Id: I653827e8a11e56975e1b2cb1b791e9ea9408f54c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <qthjk@ovi.com>
 2013-01-18 15:50:30 +01:00
Orgad Shaneh
e9dae735dc ProjectExplorer: Compile with QT_NO_CAST_FROM_ASCII 
Change-Id: I84d9526449b8ca6cdcf8296e353c5d892d5f942d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2012-12-04 14:12:53 +01:00
Eike Ziller
d719eebfdc Merge remote-tracking branch 'origin/2.6' 
Conflicts:
	src/plugins/coreplugin/editormanager/openeditorsview.cpp
	src/plugins/debugger/qml/qmlengine.cpp
	src/plugins/debugger/qml/qmlinspectoradapter.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/qtsupport/exampleslistmodel.h
	src/plugins/welcome/welcomeplugin.cpp

Change-Id: I92b542af23ceb7cf7dac84b12439e5f819f2dc39
 2012-11-30 17:02:35 +01:00
Tobias Hunger
dccb63b406 Kits: Do not allow kits with empty names 
Change-Id: Id30080cebd7aeb0917516d7d94200f90bd531397
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-11-29 13:07:29 +01:00
Tobias Hunger
0e7cb4b1c6 Kits: Do not construct kits with names starting with - 
Those look ugly.

Change-Id: I984060aaddf3294edf748a4c5c167efba7e40da8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-11-29 13:07:23 +01:00
Orgad Shaneh
7c4e2b6c60 Id: Add QByteArray constructor 
Distinguish from const char * one.

QString ctor is yet to be removed

Change-Id: I2da231036c6417353b0566d39666d918ad141c6d
Reviewed-by: hjk <qthjk@ovi.com>
 2012-11-20 08:57:35 +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
Daniel Teske
2023375d60 Kits: Ensure that kitUpdated is send on apply 
Change-Id: If2afb0d0c9e83c3815e838c6e31d2e2f815e3ac2
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-17 16:35:33 +02:00
Tobias Hunger
59dfe0923e Kit: Add method to fix up a kit 
Change-Id: I14c540766e37d63957d8c648a8b31dbc68445ac7
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:54:12 +02:00
Tobias Hunger
8530e0bdc8 Kit: Infrastructure to stop sending out too many update signals 
This reduces the amount of validation that is happening a lot.

Change-Id: I9a854afc462109845febbb09da1b27930a23cb95
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:53:59 +02:00
Tobias Hunger
9e268f0758 Kit: Small fixes 
* Do actually print severity of an issue in the tool tip

Change-Id: I266bc6efbeb2175d9ca001147a5c732f29b2485c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:53:46 +02:00
Tobias Hunger
4a9130a05c KitInformation: Make validate work on const Kits and add fix method 
Make sure validate will not modify kits, add a fix method to do that
when kits are loaded/added.

Change-Id: Ib378af0f3470b2caf64177b35fca061089ac4523
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:53:33 +02:00
Tobias Hunger
c160433ac8 Kit: Simplify validation of kits 
Change-Id: I562e6f8d5fef36eea543c208cdd855db048b7f33
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:52:57 +02:00
Tobias Hunger
eac5a6460d Kit: Add copyFrom(otherKit) method 
Change-Id: I28d13c2f54aa42dc42bd9bd5fcae8f8ac0430d0b
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:52:52 +02:00
Tobias Hunger
7aaaf07259 Kit: Replace operator == 
Change-Id: I4f211e118bc5cb58a7adf1f6d814105905f964f8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:52:47 +02:00
Tobias Hunger
7a37897f79 Kit: Allow creation of kits with a given id 
This is to avoid creating lots of Core::Ids due to temporary kits,
etc.

Change-Id: Id786e3412aadae7a594f6caf64d0dd364744d296
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2012-10-12 16:52:37 +02:00
Tobias Hunger
6a58e1b9fb Using target name instead of ID in shadow build dir 
Task-number: QTCREATORBUG-7901
Change-Id: Ia38ea896809e7793439e412e260b7cdc409923da
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2012-10-12 16:13:11 +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
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
Tobias Hunger
f3d8f967a7 Do not make kit names needlessly ugly 
Change-Id: I18590604c307f0da831aa15efaf113633cd9a014
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
 2012-09-06 11:08:23 +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