feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
38,286 Commits 108 Branches 368 Tags
e43af30faabaf3f38a6a652c519c61512203054f
Commit Graph

71 Commits

Author SHA1 Message Date
hjk
6b28505d53 Kit: Rename m_displayName to m_unexpandedDisplayName 
That's what it is.

Change-Id: Ibd19203b30a98eb2b4b57039a8d619c031d2e5e2
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2014-10-14 18:24:15 +02:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
hjk
0f29d404fd Kit: Denoise kit.cpp 
Mostly namespaces.

Change-Id: Ib11a75207d20e4db1233542e7e021dab647d70a6
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-10-10 19:14:59 +02: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
Fawzi Mohamed
d272e0cc3e projectexplorer: avoid excessive kit updates 
unblock did always assume something changed (and mustNotify not
correctly set)

Change-Id: Id2133b55ef27110a41be22d1f769fd987aa11033
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-10 18:12:49 +02:00
Tobias Hunger
c2ed44085b Kit: Change displayName generation 
Do not care whether the unexpandedDisplay name is unique or not, nor
whether the display name is unique or not.

Warn if it is not in the Kits Options Page, but that is all.

Change-Id: I1cbeb5beb477d533092ade6ef67a97044e53477c
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-09-04 13:36:56 +02:00
Daniel Teske
e476ff3587 QmakeProjectImporter: Prepare for multiple concurrent imports 
Fix logic around temporary qt versions. We want essentially shared
ownership of kits on the temporary qt version.

Change-Id: Ic8c748aa2b04afb5a30444563b3fc2f4272ca47c
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-09-03 17:31:09 +02:00
Tobias Hunger
4a52d8216c Kit: Introduce variables for Kit display names 
This change also adds a AbstractMacroExpander for the QtKitInformation.

It supports the following variables in the Kit display name:

 %{Qt:version} - Qt version number
 %{Qt:type}    - Qt type
 %{Qt:name}    - Qt version name
 %{Qt:mkspec}  - mkspec used by the Qt version

Task-number: QTCREATORBUG-11118
Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2014-08-18 17:17:50 +02:00
Tobias Hunger
b2ea6e1b9e FeatureProvider: Move features into Kits 
Make available features and platforms methods on kits (implemented
via the KitInformation). Add convenience methods to KitManager to
collect all that.

Remove QtFeatureProvider and implement KitFeatureProvider instead.

The idea of this patch is to make it easier to find which kits are
applicable to which wizard: I should now be able to match the
wizard features against a kit and have a good set of kits to choose
from.

Change-Id: Ie5be0213f142cfdf4417ac55bd6cbb056265a531
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
 2014-07-30 13:49:59 +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
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
Friedemann Kleint
e933524a4f Make a kit's file system friendly name configureable. 
This makes it possible to use concise names for shadow-build
directories, for example {projectname}_5s for Qt 5 / stable instead
of the long, auto-generated names. Also, users can then manually
configure names for kits with non-latin names, which would otherwise
result in underscores and dashes with numbers.

Change-Id: If0eab746942246d1aba6a5dd04f59d3219be47b8
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-04-28 14:50:04 +02:00
El Mehdi Fekari
0afe611e93 Kit: Save sticky kit information 
Task-number: QTCREATORBUG-10485

Change-Id: I02081a45ce789992f22f79dc0fc3a60fe7ce439f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-03-18 11:27:32 +01:00
Tobias Hunger
a8ea31bf09 FileUtils: Add static method to construct FileNames from Latin1 
Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2014-02-11 10:46:09 +01:00
Tobias Hunger
2d4cfc90fc Make sure to generate qmake friendly file names 
According to Ossi the only safe characters in a path for qmake are
alphanumerical, underscore, dot and dash.

Task-number: QTCREATORBUG-10980
Change-Id: Ibacbfeb7f04f1f0524093f1d8fce637ea4ae6fd6
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2014-02-06 17:30:46 +01:00
Eike Ziller
236ea9efb9 Merge remote-tracking branch 'origin/3.0' 
Conflicts:
	share/qtcreator/debugger/dumper.cpp
	share/qtcreator/debugger/dumper_p.h
	share/qtcreator/debugger/test/main.cpp
	src/plugins/debugger/gdb/classicgdbengine.cpp
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.cpp
	src/plugins/debugger/lldblib/guest/lldbengineguest.h
	src/plugins/debugger/lldblib/guest/main.cpp
	src/plugins/debugger/lldblib/ipcengineguest.cpp
	src/plugins/debugger/lldblib/ipcengineguest.h
	src/plugins/debugger/lldblib/ipcenginehost.cpp
	src/plugins/debugger/lldblib/ipcenginehost.h
	src/plugins/debugger/lldblib/lldbenginehost.cpp
	src/plugins/debugger/lldblib/lldboptionspage.cpp
	src/plugins/qbsprojectmanager/qbsstep.cpp
	src/plugins/qbsprojectmanager/qbsstep.h
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecanvas_p.h
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d.cpp
	src/plugins/qmlprofiler/canvas/qdeclarativecontext2d_p.h
	src/plugins/qmlprofiler/canvas/qmlprofilercanvas.cpp
	src/plugins/qnx/blackberrycheckdevmodestep.cpp
	src/plugins/qtsupport/debugginghelper.cpp

Change-Id: Ie9fd0a885fb6264a6a8a72daee071b75bcbd2e9d
 2014-01-08 11:01:06 +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
dc6b28366c Avoid value-list creation when iterating over maps. 
Change-Id: I704ba93d01ffababb405bc801f07a845631930cc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-12-16 16:03:16 +01:00
El Mehdi Fekari
a25cc26852 Kit: Add AutoDetectionSource to Kits 
This allows plugins (e.g Andoird, BlackBerry...) to better control
the kits that are auto generated from their SDK/Target sources.

Change-Id: I250451a21364780d083ef99af232ae914f8756f4
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-12-12 15:42:28 +01:00
Tobias Hunger
0224ec0a64 Kit: Add constructor to restore Kit from QVariantMap 
Do not trust kits with an invalid id, as there is no way those
could have ended up being saved out by creator. Safe all other kits
that were constructed using Kit(const QVariantMap &).

This new constructor uses the code that used to be in fromMap(...),
with some simplifications.

Remove fromMap(...) method from kit as it is no longer used.

Change-Id: Iac28ea9b85670e03088a4b7c5283af6b4b70c0fc
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-17 11:22:47 +02:00
Tobias Hunger
bca69693ee Kits: Delay validation 
This avoids useless validation runs during construction.

Also reorder member variables to save a couple of bytes
in the structure.

Change-Id: Ibc33b89f12c306852af02d387ee2d177f732bb83
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-16 16:29:01 +02:00
Tobias Hunger
46d4244e01 Kits: Do not trigger unmanagedKitUpdated signals during construction 
Stay below the radar during construction/fromMap. This avoids some
signals from the KitManager about unmanaged kits having been updated.

This signal is used in three places only and always connected only
after the the construction happend. So this should be safe.

Change-Id: If6cc29b6bb98fa161776a9a79f48f88173db04b8
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-10-16 15:49:07 +02:00
Tobias Hunger
331fdc923b Kit: Do not add generate empty names 
While those do not hurt they are just unnecessary.

Change-Id: Ic2a971637fe6b0441c6fffa0d3c5161aea36e924
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-10-14 15:48:24 +02:00
Tobias Hunger
f05fcdcdd5 Kits: Allow for mutable KitInformation 
Mutable KitInformation are those that are supposed to be editable in more
user-accessible places (e.g. like the Mini Target Selector or similar)
than the normal kit options page.

The functionality to display these settings is not part of this patch.

Change-Id: I13446c49abf89eaf739a60dbcd01c97e2144de45
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-19 16:42:03 +02:00
Tobias Hunger
f1f1f65f7c Kits: Simplify handling of sticky kit information 
Change-Id: Iff01445d1251487bd44c227de36f1b47ba4c3d42
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-09-12 18:46:20 +02:00
Daniel Teske
f214011d33 Kit: makeSticky() -> setSticky(), allows for unsetting sticky bit 
Change-Id: I6aa7d7d52b681ee61d27c2d98e6fefe9cfd9532b
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-03 12:18:29 +02:00
Daniel Teske
0aae98fb13 Android: Only create Kits for the newest toolchains 
It's rare that users will want older toolchains.
In updateAutomaticKits distinguish between a Kit being removed since
the toolchain doesn't exist anymore. Which happens on e.g. changing
the ndk path. If the toolchain still exists, then it isn't the
newest anymore, so demote the Kit to a manual kit thus enabling the
user to remove it if he no longer needs it.

Change-Id: I59203abc9bed5f2c46a002cea68fd72a84283840
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-09-02 11:37:05 +02:00
Tobias Hunger
52a41ecb0c Qt4BC: Simplify shadowbuild/builddirectory handling 
Change-Id: Id46a239588d21b6aa5d4c43e4d85b52a04bd17ab
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-08-28 11:39:29 +02:00
Tobias Hunger
5a916fb695 Add a outputparser for os specific errors 
The only os specific issue handled at this time is windows not wanting
to overwrite binaries that are still running. Make that message trigger
a build issue and provide a hint how to handle it.

Task-number: QTCREATORBUG-9100
Change-Id: Id0b270202b67b0b7d555392cb35b0e2ebcbc8fad
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-23 10:26:37 +02:00
Tobias Hunger
1b4b6ed6ca Kit: Use FileName for icon path 
Change-Id: Ica6cf20c4ae1c7d58386d4970e468a105a3263b3
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-23 10:18:55 +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
Tobias Hunger
6ee2d554e1 Kit: Add static method to get icon for a path 
Change-Id: Icd15e53022453be0713ee4953dd8f1f099b053de
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-08-21 16:54:34 +02:00
Tobias Hunger
1ca9bab242 Kit: Only make SDK-set KitInformation read-only 
Leave the rest user-editable.

Task-number: QTCREATORBUG-9030
Change-Id: I77c9ff980dd9a497bff53ee04dae7e771e4e7e82
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-05-07 16:39:29 +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
41dfa8bc2a Kits: Fix making names unique in optionspage for kits 
Task-number: QTCREATORBUG-8861

Change-Id: Iea9948f1f62a79df36b239ad3981cb137b44e5bd
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
 2013-03-20 15:02:09 +01:00
hjk
4d421acad3 Kits: Avoid some of the deprecated QString uses with Core::Id 
Change-Id: I40f4a0ff63fd99ecb1a9d8a35f034b1a48d6de84
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>
 2013-03-19 17:38:15 +01:00
Friedemann Kleint
fff7c62b8a Fix Krazy warnings about values or keys iteration in project management. 
Change-Id: I70674ac326f508b53f50b4dbbc5e051dbdd9017d
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
 2013-03-15 13:24:29 +01:00
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