aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qtsupport/qtoptionspage.h
Commit message (Collapse)AuthorAgeFilesLines
* Fix availability of "Link with Qt" info barEike Ziller2020-05-141-0/+2
| | | | | | | | | The info bar should never appear if the button is disabled, for example because the Qt Creator directory is not accessible. Fixes: QTCREATORBUG-23900 Change-Id: I819c87f5ca51f69f34bd462fca8e877be3544100 Reviewed-by: hjk <hjk@qt.io>
* QtSupport: Move option widget decalaration in .cpphjk2020-01-141-95/+4
| | | | | | | | Slimmer interface, allow removing m_ui indirections, du -s .obj: 66684 -> 65868 Change-Id: I686745017a5d239f41e256fd28f595a1fc3b5bac Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QtSupport: Update QtOptionsPagehjk2020-01-101-11/+5
| | | | | Change-Id: I34eba5a968914a1afdd168f7dd428329e3770c5a Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* Provide option to "link" Qt Creator to a Qt installationEike Ziller2020-01-091-0/+3
| | | | | | | | | | Allows making e.g. a Qt Creator-only offline installation aware of a Qt installation, with auto-registration of Qt versions and kits. Change-Id: Ia92dd9d4dbf34acb3a01713207699ff3f14cea12 Reviewed-by: David Schulz <david.schulz@qt.io> Reviewed-by: hjk <hjk@qt.io> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Some clang-tidy -use-modernize-nullptrhjk2019-08-011-1/+1
| | | | | Change-Id: I1bed5e85a5b7948d08502a72a10f80baa075c204 Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
* QtSupport: Remove QtOptionsPageWidget::qtVersionsDumpUpdated slothjk2019-02-181-1/+0
| | | | | | | Never called anymore. Change-Id: I6d2eaebbbf72d4e05aafeb4006d35bcdaa8a75d4 Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
* Qt options page: Simplify code a bitTobias Hunger2016-10-271-1/+0
| | | | | Change-Id: I70ea3134550c01f6c81f8a15d2730dc906d834a7 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* Utils: Streamline TreeModel APIhjk2016-07-271-1/+1
| | | | | | | | | | | | | | The LeveledTreeModel case is general enough to cover the UniformTreeModel case, so merge them and rename to TreeModel. The former TreeModel is now BaseTreeModel. BaseTreeModels should not be instantiated directly, a tree model with non-uniform basic items is available as TreeModel<>. Done-with: Eike Ziller <eike.ziller@qt.io> Change-Id: I64a65617ab68c0cde39cf65f4bc092ef808ee6fb Reviewed-by: Christian Stenger <christian.stenger@qt.io>
* QtSupport: Make changed Qt version names bold in version dialoghjk2016-06-151-1/+0
| | | | | | | Mimic what other Build&Run views do. Change-Id: I6abb13816b5fe17f9aeeb38b0041c1f9b11a98ec Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QtSupport: Use a LeveledTreeModel in option pagehjk2016-06-151-5/+3
| | | | | | | Less code, less casting. Change-Id: I44400914d722211612562c47286ac4d7fc5511b7 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* QtSupport: Use Qt5-style connectsOrgad Shaneh2016-06-061-2/+1
| | | | | | | The heavy lifting was done by clazy. Change-Id: I24cb0cd088b74364320cdd34282d7b15305a93bf Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Wholesale conversion to #pragma oncehjk2016-03-301-5/+1
| | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Removing support for DebuggingHelpersThomas Hartmann2016-01-251-11/+2
| | | | | | | | | | | This patch removes infrastructure and ui for DebuggingHelpers and specifically qmldumptool. The qmldumptool was the last relevant DebuggingHelper and is only required for Qt < 4.8. Change-Id: I3767be0858e5eba16a33a3ab8436e95fc06a9e99 Reviewed-by: hjk <hjk@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-191-17/+12
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* QtVersions Settings: Allow the user to sort the qt versionsDaniel Teske2015-08-311-10/+15
| | | | | | | | | | Rewrite the whole code to use a TreeModel. So that we can use a QSortFilterProxyModel on top of that. Change-Id: Idba5095dac897e9fcdaca0f2dcc7c77508dabcc1 Task-number: QTCREATORBUG-6200 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* ToolChain: Turn id into a QByteArrayTobias Hunger2015-07-091-1/+1
| | | | | | | | That should take a couple of bytes less to store. Make sure this change is invisible to the configuration files. Change-Id: If5e73b52493c9164de9e342021d8153d274b350f Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* QtVersion: Warn on duplicate namesTobias Hunger2015-07-061-0/+3
| | | | | | | | | This breaks the nice property of changes to one Qt version only effecting that version:-/ Task-number: QTCREATORBUG-14677 Change-Id: Ibec062663b6cc5cabedcd910a8c642b870527d72 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
* Update LicenseEike Ziller2015-01-161-6/+6
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-141-7/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License updateEike Ziller2014-10-091-7/+8
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | QtVersion: Allow for variables in Qt version namesTobias Hunger2014-09-041-2/+0
|/ | | | | | | | | | | * Supported variables are %{Qt:version}, %{Qt:type} and %{Qt:mkspec} * Qt version display names need no longer be unique. This simplifies the code a bit and makes the Qt versions behave like the Kits do now. * The default Qt version name now contains %{Qt:version}. The method to find the default version name no longer takes a Qt version string. Change-Id: Ibca1e3daffe5a81f3c158e8bbc1779d033b03872 Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Clean up single namespace forward-declarationsOrgad Shaneh2014-02-121-3/+1
| | | | | | | | | | | | | | | | | | Done using the following ruby script: Dir.glob('**/*.h').each { |file| if File.file?(file) s = File.read(file) t = s.gsub(/^namespace .+ \{\n\s*class .*;\n\s*\}.*$/) { |m| m.gsub(/\n\s*/, ' ').gsub(/\s*\/\/.*$/, '') } if t != s puts file File.open(file, 'w').write(t) end end } Change-Id: Iffcb966e90eb8e1a625eccd5dd0b94f000ae368e Reviewed-by: hjk <hjk121@nokiamail.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-081-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Incremented year in copyright infoRobert Loehning2014-01-081-1/+1
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Debugger: Remove support for non-Python GDBhjk2014-01-061-1/+0
| | | | | | | | | | | | | | | | This affects mainly Apple's version of GDB. Mac users are advised to use LLDB, or some recent build of FSF GDB. Change-Id: I6a7fbb591e79f737e12d08b0e881e9e4d1d9660c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Preferences: Add default implementation for filteringEike Ziller2013-12-101-8/+6
|/ | | | | | | | | | | | | The default "matches" method now takes the widget and looks for all child labels, checkboxes, push buttons and group boxes. Because of that, the former "createWidget" method can be called multiple times without creating a new widget (-->widget()), and the "finished" method must ensure that the created widget gets deleted, since not all widgets that were created are added to the UI anymore. Change-Id: Ia231c7c78dd8819146668e6447d36d22e7836904 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Remove support for debugging JS with Qt 4.7Kai Koehne2013-11-041-2/+0
| | | | | | | | Remove infrastructure to debug/inspect QML applications with Qt 4.7. Change-Id: I277e9884e009475a29017f502bbe1d069317460f Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-311-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Incremented year in copyright infov2.6.2Robert Loehning2013-01-291-1/+1
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Fix visibility of info widget in Qt version settings.Eike Ziller2013-01-091-2/+1
|/ | | | | | | | | | E.g. when changing the selected Qt version while one of the details widgets is expanded. Task-number: QTCREATORBUG-8026 Change-Id: Id10db9f917fce481791b70e37e5ded7e3dc13b32 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* Adjust license headershjk2012-10-051-21/+20
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Correct namespace in commentOrgad Shaneh2012-08-071-1/+1
| | | | | | Change-Id: Ie89430f6b5dd33f51aa32e0ac6a055debd1b6ef7 Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: hjk <qthjk@ovi.com>
* Contact -> qt-project.orgEike Ziller2012-07-191-3/+1
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Make Qt version info details behave like debugging helper detailsEike Ziller2012-07-091-0/+1
| | | | | | | | | Show only one panel with "details" at a time. The vertical space is just not enough otherwise. Change-Id: I602692166a1451ea5cb09cb9cc955934513355fe Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Qt version options page: Replace (large) tooltip by details widget.Friedemann Kleint2012-05-301-2/+5
| | | | | | | | | | | | | Remove the tooltip that has grown overly large for Qt 5 by a row containing a details text browser. Filter out the '/raw', '/get' variables, display all paths with the correct separator as a clickable link that opens a file browser. Change-Id: I81fee8e5be04c87b5b59b8fc444f75efa66fcaa0 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* IOptionsPage: replace virtual fuctions by data membershjk2012-05-231-6/+3
| | | | | Change-Id: I8297df85109b67b79f90c33263a5dc7b89efbb60 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix Options/Qt Versions adding versions on applyDaniel Teske2012-04-261-0/+1
| | | | | | Task-number: QTCREATORBUG-7242 Change-Id: I4e4955e45c69fe3a7124a4d54d98228876e510bb Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-04-261-1/+0
|\
| * Revert "Fix Options/Qt Versions adding versions on apply"Daniel Teske2012-04-231-1/+0
| | | | | | | | | | | | | | | | | | The fix is only needed in master, this was wrongly commited to 2.5 This reverts commit e636c09163cbebc1921f97628ee0354a29d545d4 Change-Id: I2d99e0c06b3ed5b054021aea906ecd59055d659e Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Oswald Buddenhagen2012-04-161-0/+1
|\|
| * Fix Options/Qt Versions adding versions on applyDaniel Teske2012-04-131-0/+1
| | | | | | | | | | | | Task-number: QTCREATORBUG-7242 Change-Id: Ie36dee9d186382fb4029ad00238d956319c59d30 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Qt4: Pick up Qt versions as they are updated by the installerTobias Hunger2012-03-291-1/+5
|/ | | | | | | | Pick up Qt version changes as they are written into the qtversion.xml file by the installer. Change-Id: I6cf9f96242d2a7af08c6207be32beeb15e7891df Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-151-2/+2
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Long live the king!hjk2012-01-261-1/+1
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use Utils::FileName for various bits in QtVersionDaniel Teske2011-12-071-1/+1
| | | | | Change-Id: I3afc3a4f2e0dd2671279c2d071779f1d7b277849 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-031-2/+2
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Reduce vertical minimum size of Qt versions settings.Eike Ziller2011-09-221-0/+1
| | | | | | | | | | The main point of the change is to hide the version info while the details for the helpers are shown. Change-Id: I02166674d2339a585fda0eebe643289471ca139c Reviewed-on: http://codereview.qt-project.org/5325 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge branch '2.3'Oswald Buddenhagen2011-07-291-1/+4
|\ | | | | | | | | | | | | Conflicts: src/plugins/debugger/qml/qmlengine.cpp Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
| * QtOptionsPage: Store selected toolchain for debugging helpersKai Koehne2011-07-271-1/+4
| | | | | | | | | | | | | | | | | | Keep selected toolchain when switching between Qt versions. Change-Id: I801e507d11b36b01888f016c35196fb098473bbf Reviewed-on: http://codereview.qt.nokia.com/2183 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* | Merge branch '2.3'Oswald Buddenhagen2011-07-251-0/+5
|\| | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp src/plugins/remotelinux/maemodeploystepfactory.cpp src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp Change-Id: I195163713145e72df20aec4ac9058f0c9158083e