summaryrefslogtreecommitdiff
path: root/src/share
Commit message (Collapse)AuthorAgeFilesLines
* Incremented year in copyright infoRobert Loehning2014-01-088-8/+8
| | | | | | 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/2.6'Oswald Buddenhagen2013-01-318-8/+8
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-298-8/+8
| | | | | | | | | | Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205 Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* | Merge remote-tracking branch 'origin/2.6'Eike Ziller2012-12-182-1/+44
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: src/plugins/debugger/gdb/gdboptionspage.cpp src/plugins/fakevim/fakevimoptions.ui src/share/share.qbs Change-Id: Ic45b68ba7b1cc1b780be4271ba4ee939e6055b80
| * Add qmlscene to external tools menuKai Koehne2012-12-173-1/+45
| | | | | | | | | | | | | | Task-number: QTCREATORBUG-7797 Change-Id: Icddb58db27f871c82468bf3a77bedc152ddf29cc Reviewed-by: Eike Ziller <eike.ziller@digia.com> Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>
* | qbs files: Remove src/share/share.qbsOrgad Shaneh2012-11-121-40/+0
|/ | | | | | | Merged into share/share.qbs Change-Id: Ia60124a851d234c69e5bc1a57a9e390863327f95 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Adjust license headershjk2012-10-057-152/+152
| | | | | Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* qbs files: Install conditionally shared contentYuchen Deng2012-07-261-0/+40
| | | | | Change-Id: I2f5e946fff7e57760a90eac57d1a1437f1b8b76f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Contact -> qt-project.orgEike Ziller2012-07-197-7/+7
| | | | | Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-037-7/+7
| | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Fix translation of external tools.Eike Ziller2011-08-156-18/+0
| | | | | | Change-Id: I21541c579f3be75537763ad65b63f6804c329e50 Reviewed-on: http://codereview.qt.nokia.com/2951 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Provide qmlviewer in external tools menuKai Koehne2011-07-291-0/+43
| | | | | | | | | | Quite a few people have asked for previewing a .qml file in qmlviewer, independent of the current project format. Change-Id: I2d012282b035cbf977de1994b6c2ace31f3cdfd5 Reviewed-on: http://codereview.qt.nokia.com/2397 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Update license.hjk2011-04-136-42/+42
|
* add README explaining purpose of src/share/Oswald Buddenhagen2011-03-301-0/+2
| | | | Reviewed-by: con
* UI text: fix capitalizationLeena Miettinen2011-03-212-2/+2
| | | | Reviewed-by: con
* Avoid error message with external vi on Ubuntu.con2011-03-091-1/+1
| | | | | | | Ubuntu comes with only a stripped down version of vim by default which doesn't support setting the column. So we don't do it. Task-number: QTCREATORBUG-3850
* Using the same sort command on Unix and WindowsRobert Loehning2011-02-281-44/+0
|
* Fix german translationcon2011-02-281-1/+1
|
* Add sort tool for windows.con2011-02-281-0/+44
| | | | Task-number: QTCREATORBUG-3851
* Update external tool to new xml definitioncon2011-02-211-1/+1
|
* Add a generic variable chooser widget.con2011-02-182-2/+2
| | | | | | | | The chooser allows choosing variables from a list, and inserting them into previously focused line edit, text edit, or plain text edit. Variables are now registered with a description in the variable manager. Also make the QT_INSTALL_BINS --> CurrentProject:QT_INSTALL_BINS for consistency.
* Save modified external tools in user resource location.con2011-02-181-4/+4
|
* Make "modifies current document" its own property. Add some tool tips.con2011-02-182-2/+2
|
* Add 'edit in notepad' external tool for windows.con2011-02-181-0/+44
|
* Fix deployment of external tools on Linux/Wincon2011-02-185-0/+271
View Lorry Controller Status