aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/updateinfo
Commit message (Collapse)AuthorAgeFilesLines
* use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Improve performance of writing settingsEike Ziller2014-02-211-0/+2
| | | | | | | | | | By wrapping related ones in a single transaction, instead of (implicitly) doing a transaction per settings value that is written. Task-number: QTCREATORBUG-11524 Change-Id: I28e06c9d6cd4ebad024f9c277796abb37df5f992 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-112-2/+5
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-151-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/qmldesigner/components/formeditor/anchorindicatorgraphicsitem.cpp src/plugins/qmldesigner/components/propertyeditor/propertyeditorview.cpp src/plugins/qmlprofiler/qmlprofilertraceview.cpp Change-Id: I778a0c2d0f1b4f799caaa2c2cc5daf94ec7ca352
| * Updater: Only try to fetch updates once (even if it fails)Kai Koehne2014-01-131-1/+2
| | | | | | | | | | | | | | Do not repeatedly try to fetch updates, but only once. Change-Id: Id177b6677077e97132c7b40af3de35015a9c7658 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2014-01-087-7/+7
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-087-7/+7
| | | | | | | | | | | | Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/3.0'Eike Ziller2013-12-181-1/+11
|\| | | | | | | | | | | | | | | Conflicts: share/qtcreator/debugger/stdtypes.py src/plugins/qmlprofiler/qmlprofilereventsmodelproxy.cpp Change-Id: I5d86746d58960e41e01e725ccb2a6c00890f0dfd
| * Updater: Fix crash on exitKai Koehne2013-12-121-1/+11
| | | | | | | | | | | | | | | | | | Make sure we wait for the updater thread before deleting the object. Change-Id: I1bcc2c7d7f4567a3bd1bad393e039ee0e45a24ec Reviewed-by: Fawzi Mohamed <fawzi.mohamed@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | Preferences: Add default implementation for filteringEike Ziller2013-12-102-18/+14
|/ | | | | | | | | | | | | 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>
* Fix PluginManager warning on shutdownKai Koehne2013-11-131-6/+1
| | | | | | | Don't try to deregister settingspage if it's a zero pointer. Change-Id: If70370bf117713f0a9495e720f0df907c7a9df56 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* UpdateInfo: Do not translate times.Friedemann Kleint2013-11-121-24/+24
| | | | | Change-Id: Ie9c958e9008b0737afd34cb5d3dfe350060d2155 Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
* Fix compilation of update info plugin with Qt 4.Friedemann Kleint2013-11-122-1/+2
| | | | | Change-Id: I7878a67413a9f4b04a12025e4b4dc5c65e0ee3c7 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* UpdateInfo: Fix warning about initialization order.Christian Kandeler2013-11-121-2/+2
| | | | | Change-Id: I2f6d9188f7c4ce0b8413c081be18f9fef70c2a17 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* UpdatePlugin: Compile fixhjk2013-11-111-0/+1
| | | | | Change-Id: I408f39197fa0f8da79c17441e519345af41c1f41 Reviewed-by: hjk <hjk121@nokiamail.com>
* Implement settings page for updater plugin.kh12013-11-117-105/+533
| | | | | Change-Id: I32cf1cd03413d59da99e99d0d6c19f6ba2bcc52f Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* qbs project files: Make use of new qbsSearchPaths property.Christian Kandeler2013-10-091-1/+1
| | | | | Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* ProjectManager: Use Core::Id for progress typeshjk2013-09-041-1/+1
| | | | | Change-Id: I72993fda50ad70ad2d7c2f449923ac6e34b9e737 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Remove superfluous include paths from project files.Christian Kandeler2013-09-021-5/+0
| | | | | | | | | | | | | | | | | | | | A lot of our build system files specify unneeded include paths. These roughly fall into the following categories: a) Paths that are already set in more general files such as qtcreator.pri. b) Paths that serve no purpose at all, possibly left over from earlier versions of the project. c) Paths that act as workarounds for wrong include statements of the form '#include "xyz.h"', where xyz.h is not in the same directory as the including file. This patch removes such path specifications and fixes the offending include statements from case c). Tested on Linux, Windows and OSX with qmake and qbs. Change-Id: I039a8449f8a65df0d616b4c08081145c18ae4b15 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Core: Static pattern for ProgressManager, clean up all usershjk2013-09-021-7/+9
| | | | | Change-Id: I4af8793ca69a3af9e99baeb7c31dad3864266f91 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Add QTCREATOR_COMPAT_VERSIONEike Ziller2013-07-091-1/+1
| | | | | | | | | | | Necessary for keeping compatibility within a minor series. When bumping versions, the compatVersion now needs to be taken into account too. Change-Id: I588947f885480889ff2f58481f72db76e3f1a9f1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-281-1/+0
|\ | | | | | | | | | | | | | | | | Conflicts: src/plugins/analyzerbase/analyzerbase.qbs src/plugins/qmljseditor/qmljseditor.qbs src/plugins/qt4projectmanager/qt4projectmanager.qbs Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
| * Remove duplicate module dependencies from qbs files.Christian Kandeler2013-05-271-1/+0
| | | | | | | | | | | | | | These cause a warning now. Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | auto-generate <dependencyList> in .pluginspec filesOswald Buddenhagen2013-04-111-3/+1
| | | | | | | | | | | | Change-Id: I8bb9b4eb0ae5ed9b283da422be882603ae0e1b49 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | derive TARGET from QTC_{LIB,PLUGIN}_NAMEOswald Buddenhagen2013-04-031-1/+0
| | | | | | | | | | | | | | | | the information is redundant now Change-Id: Icc8c8b4ace11538d45c6c9e1dbe5a7976f4743e1 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | make library and plugin dependencies declarativeOswald Buddenhagen2013-04-031-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | instead of directly including the respective pri files in *_dependencies.pri, set variables and let qtcreator.pri resolve them to includes. this will allow us to re-use the dependency info elsewhere. Change-Id: Iaa33924e428ac0409660f42df2f98a7978452d3e Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | centralize assignment of TEMPLATE = libOswald Buddenhagen2013-04-021-1/+0
| | | | | | | | | | Change-Id: I4025539f3875e79f03743ba9ed3fd09cd31b998d Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | automatically include libs' and plugins' _dependencies.pri filesOswald Buddenhagen2013-04-021-1/+0
| | | | | | | | | | Change-Id: I25645bb625b467c6f9d895ff89a70acd6a25683e Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | Fix Krazy warnings about includes/header guards in various plugins.Friedemann Kleint2013-03-131-1/+0
|/ | | | | | | Change-Id: Iafd1b3be1ad43bb7519e14059ac2d33eb859c625 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QtcPlugin.qbs: make every plugin depend on ExtensionSystemJoerg Bornemann2013-02-131-1/+0
| | | | | | | | | Remove ExtensionSystem from the core plugin's ProductModule. Every plugin must depend on ExtensionSystem, not only the ones that depend on Core. Change-Id: I9f72653c5ef61bfab2b478f61e5723140c0896ec Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Merge remote-tracking branch 'origin/2.6'Oswald Buddenhagen2013-01-315-5/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-295-5/+5
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Adapt qbs project files to new installation approach.Christian Kandeler2013-01-241-1/+1
| | | | | | | | | | | | | | This need a qbs build >= commit 5cdf94de to work properly. Change-Id: If86aedf9e3f9d01ad1202e03221e49698d517666 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-162-3/+0
| | | | | | | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
* | Remove braces for single lines of conditionsOrgad Shaneh2013-01-081-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | #!/usr/bin/env ruby Dir.glob('**/*.cpp') { |file| # skip ast (excluding paste, astpath, and canv'ast'imer) next if file =~ /ast[^eip]|keywords\.|qualifiers|preprocessor|names.cpp/i s = File.read(file) next if s.include?('qlalr') orig = s.dup s.gsub!(/\n *if [^\n]*{\n[^\n]*\n\s+}(\s+else if [^\n]* {\n[^\n]*\n\s+})*(\s+else {\n[^\n]*\n\s+})?\n/m) { |m| res = $& if res =~ /^\s*(\/\/|[A-Z_]{3,})/ # C++ comment or macro (Q_UNUSED, SDEBUG), do not touch braces res else res.gsub!('} else', 'else') res.gsub!(/\n +} *\n/m, "\n") res.gsub(/ *{$/, '') end } s.gsub!(/ *$/, '') File.open(file, 'wb').write(s) if s != orig } Change-Id: I3b30ee60df0986f66c02132c65fc38a3fbb6bbdc Reviewed-by: hjk <qthjk@ovi.com>
* | UpdateInfo: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-273-1/+5
| | | | | | | | | | Change-Id: I3e25a0318a23970246ddcef0db458730e0cc6c81 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-10-055-88/+84
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Adjust license headershjk2012-10-055-88/+84
| | | | | | | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | qbs files: Sort filesOrgad Shaneh2012-10-031-1/+1
|/ | | | | Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qbs build: Add UpdateInfoOrgad Shaneh2012-09-271-0/+26
| | | | | Change-Id: I3ba202d216ae869accb0c0058e69c9ef13dc2eed Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Changed URL to qt-project.org in pluginspecs.Konstantin Tokarev2012-07-301-2/+2
| | | | | | | Also, it's 2012 now. Change-Id: I69a8d1d77658b2bb2cb547362d5e3163385cab3b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-194-12/+4
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* ActionManager API cleanup.Eike Ziller2012-05-251-1/+1
| | | | | | | | d-pointer instead of inheritance static methods Change-Id: I7b2f0c8b05ad3951e1ff26a7d4e08e195d2dd258 Reviewed-by: hjk <qthjk@ovi.com>
* Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+2
| | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-154-17/+17
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Move QtConcurrent library into Utils.Friedemann Kleint2012-02-091-1/+0
| | | | | | | | It causes a conflict with the new QtConcurrent library of Qt 5 and is quite small. Change-Id: Ib97ab6daf8f67a88300cf03f044ba3593a4cd270 Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Compile with Qt 5.Friedemann Kleint2012-02-081-0/+1
| | | | | | | | | | | | - QtQuick1 renaming. - Start on qtconcurrent split (pending renaming of Qt Creator's qtconcurrent library). - QWinEventNotifier is a public class in Qt 5. - Metatype system: Classes need to be known. Change-Id: I5582e7cc2777bf791a08b049262217055769c80f Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Long live the king!hjk2012-01-264-4/+4
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Use new static ICore interface.hjk2012-01-241-5/+3
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Don't call killTimer() on dead timers.Daniel Molkentin2011-12-191-0/+1
| | | | | | Change-Id: I3d8b44534d748c820ae63c6909b4eb28ff566283 Reviewed-by: Niels Weber <niels.2.weber@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-21 02:03:52 +0000