aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/updateinfo
Commit message (Collapse)AuthorAgeFilesLines
* UpdateInfo: Make DisabledByDefault instead of ExperimentalEike Ziller2017-01-031-1/+1
| | | | | Change-Id: If51b6cefd3dd985b26244ddb1f7b88c38e82ec9e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* UpdateInfo: Inherit environment when checking updatesMartin Kampas2016-11-241-1/+1
| | | | | | | | Broken since 26ba9e62f36871c71df8ed54509d22b9c19d0c56 (UpdateInfo: Fix checking for updates) Change-Id: I89e8346f4cba1cd6b40382e644d3a54aafc959e2 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Core: Make IOptionsPage::categoryIcon a Utils::IconAlessandro Portale2016-09-201-1/+1
| | | | | | | This is necessary for themable + HighDPI icons in the options dialog. Change-Id: I8e3ff87a24591af40bb76b39cd970443d7678fae Reviewed-by: hjk <hjk@qt.io>
* UI files: Fix tab order in lots of UI formsNazar Gerasymchuk2016-08-021-0/+5
| | | | | | | | | | For unknown reasons tab order in listed UI files was set incorrectly and behave unexpectedly. Now tab order behave naturally. Changes made for listed objects and touches only UI. Change-Id: I057b95eb21943ddb29b108682618382661db7be9 Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
* SynchronousProcess: Change exit code interpreter to function objectEike Ziller2016-04-271-19/+2
| | | | | | Change-Id: Ic48d4f5810f171c070f0980581fb6e45f6fe6b4a Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
* Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-04-251-2/+23
|\ | | | | | | Change-Id: If0ba896a083392a532f76bb26bec3540a7c17667
| * UpdateInfo: Fix status of progress barEike Ziller2016-04-251-1/+20
| | | | | | | | | | | | | | | | | | MaintenanceTool returns with exit status != 0 in case there are no updates, so that is no indicator of failure. Change-Id: Ibe94cc8b5ecbd7a04be5da41112a4eda0cd84153 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * UpdateInfo: Fix implicit conversion to QString:Kai Koehne2016-04-251-1/+1
| | | | | | | | | | | | | | | | src\plugins\updateinfo\updateinfoplugin.cpp(127): error C2248: 'QString::QString': cannot access private member declared in class 'QString' Change-Id: I4dfed40d14505fd5fae1cc87a08e1d58347f197d Reviewed-by: Riho Pihlak <rpihlak@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@qt.io>
| * UpdateInfo: Fix checking for updatesRiho Pihlak2016-04-251-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | Checking for updates failed when MaintenanceTool printed out log messages. MaintenanceTool is expected to print out only xml data. So, parsing the output failed. MaintenanceTool printed out warnings about SSL and Qt account. Logging is now disabled when running MaintenanceTool. Change-Id: Ib163dae81368c8fec7218e5961590e07c208a73e Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* | Merge remote-tracking branch 'origin/4.0'Eike Ziller2016-04-201-2/+0
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/projectexplorer/session.cpp src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f
| * Qbs: Enable UpdateInfoOrgad Shaneh2016-04-171-2/+0
| | | | | | | | | | | | | | It was refactored in 13fcf5ad3c3705ae87556b2072889daa519ff1b3. Change-Id: I05d35795618d82024a2f587fc299c9f5829080dd Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | Wholesale conversion to #pragma oncehjk2016-03-302-8/+2
|/ | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-195-71/+51
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Replace assignment of null QString() with a call to clear().Jarek Kobus2015-06-161-2/+2
| | | | | | | | Looks like it's a kind of rule in QtCreator code. Change-Id: I92fb60055273d66d6e459245836df5b90d7a3cc6 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com> Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Refactor UpdateInfo pluginJarek Kobus2015-06-169-483/+456
| | | | | Change-Id: I63fc40b12e29204d9ecd4ed3fd33e7ad3171918d Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update LicenseEike Ziller2015-01-167-40/+40
| | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Fix license headersKai Koehne2014-11-201-1/+1
| | | | | | Change-Id: I810aa2d98c96040fd536ae0711041f301e5c22d7 Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-2/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Disable UpdateInfo plugin also with qbs build.Christian Kandeler2014-10-281-0/+2
| | | | | Change-Id: Iad15471600866e1c28e5ab544a75c8c8d1ca9ef3 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-146-42/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-097-44/+50
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
| * ProgressManager: Unify style of progress manager task descriptionsTobias Hunger2014-06-251-2/+3
| | | | | | | | | | | | Change-Id: I6826e66f00f47997c644c24d1b20f4a1ea53a8a2 (cherry picked from commit 36d8ec4f4771ebeb9d923af35c473e11bae1fe29) Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* | ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-023-18/+21
| | | | | | | | | | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | ExtensionSystem: Remove Qt4 supportEike Ziller2014-08-271-2/+0
| | | | | | | | | | | | | | | | Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5. Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | ProgressManager: Unify style of progress manager task descriptionsTobias Hunger2014-06-251-2/+3
|/ | | | | Change-Id: I6826e66f00f47997c644c24d1b20f4a1ea53a8a1 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Use double quotes instead of single quotes as per our guidelines.Christian Kandeler2014-04-221-1/+1
| | | | | Change-Id: Ib608bb49e26781aef1914085a5d801fcdcd5eb56 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* 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>