summaryrefslogtreecommitdiff
path: root/src/share
Commit message (Collapse)AuthorAgeFilesLines
* Remove external tool for "sort text"Eike Ziller2017-11-032-39/+0
| | | | | | | We now have Edit > Advanced > Sort selected lines Change-Id: I948718a1be432e00b2646b29f173894a51691164 Reviewed-by: André Hartmann <aha_1980@gmx.de>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2017-07-2610-6553/+6499
| | | | | | | Mostly whitespace cleanup. Change-Id: Ife5831b23d5ee7406ece839f2c1061c9364ac4ad Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2017-06-205-159/+114
| | | | | Change-Id: Id2a6daabef6dae29e83df99ed195f7356f26866c Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Remove invalid entries in makefile.xmlOrgad Shaneh2017-05-191-4/+0
| | | | | | | | | Those keywords are mapped to undefined lists. Reported in https://phabricator.kde.org/D3621#inline-17949 Change-Id: I5d5fc654afe2e35577175a0e3fa2196555ee4ada Reviewed-by: David Schulz <david.schulz@qt.io>
* Add the JSON syntax highlighting fileThiago Macieira2017-02-281-0/+104
| | | | | | | | | Like XML (which is already present), it's very useful. Source: https://cgit.kde.org/syntax-highlighting.git/plain/data/syntax/json.xml Change-Id: Idd5ceba1eba34cb78c46fffd14a738f347db0d19 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* GenericHighlighter: Update from KSyntaxHighlightingOrgad Shaneh2017-01-177-23/+309
| | | | | | Change-Id: I2fdf7f48494e2de3ef8ec64260c4f194ab5f959d Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: David Schulz <david.schulz@qt.io>
* GenericHighlighter: Update from latest KTextEditor sourceOrgad Shaneh2016-10-2116-927/+1134
| | | | | Change-Id: I0caf19cd7698c9934655483304314b5653b69f21 Reviewed-by: David Schulz <david.schulz@qt.io>
* 3rdparty: Update Source Code Pro fontAlessandro Portale2016-10-183-0/+0
| | | | | | | Roman fonts version 2.030 and Italic fonts version 1.050 Change-Id: Ib5142f373531b3ad20f7b497b708b8f458275a7b Reviewed-by: Thomas Hartmann <Thomas.Hartmann@theqtcompany.com>
* GenericHighlighter: Update from latest KTextEditor sourceOrgad Shaneh2016-07-222-15/+15
| | | | | | Change-Id: Ic0ede8fce1c1cd1296bdf74f3e8591f138f234ea Reviewed-by: Eike Ziller <eike.ziller@qt.io> Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Adding Source Code Pro font and loading it on startupThomas Hartmann2016-07-185-1/+95
| | | | | | | | | | | This makes Source Code Pro available on all platforms. This font is designed specifically for code editing designed by Paul Hunt. See: https://github.com/adobe-fonts/source-code-pro Change-Id: I7c5a875bd5fc09b02049706f1d61f3667c10d967 Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
* Ask before reloading file changed with external editorRobert Loehning2016-06-303-3/+3
| | | | | | | To be consistent with other ways of starting external editors. Change-Id: Ia6f8d2179076482999ef527353feb91a49e1a2d9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
* Move 3rdparty resources into 3rdparty subdirectoryEike Ziller2016-04-1218-0/+10917
| | | | | | Change-Id: Ib6363629ef3e4d10bca64936a46147b5defc048b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Remove code duplication for copying resources.Eike Ziller2016-04-122-2/+22
| | | | | | | | | | | | | qtcreatordata.pri was created for "conditional" copying of resources to the build tree. Adapt it a bit and use it for the "unconditionally" copied resources as well. A side effect is, that the unconditionally copied resources now are also installed file by file instead of the directory as a whole, which doesn't make a difference in the end result though. Change-Id: I6da3eeaadcb48c19987858bbb8c2d42ee149f6f3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-198-136/+104
| | | | | | | * Update files in src/share* and src/tools Change-Id: I78aa5d4a1d76212964e467de7676c1fcb2b777d6 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-128-48/+48
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/utils/tooltip/tipcontents.cpp src/libs/utils/tooltip/tipcontents.h src/plugins/android/androiddeployqtstep.cpp src/plugins/baremetal/baremetalconstants.h src/plugins/baremetal/baremetaldevice.cpp src/plugins/baremetal/baremetaldevice.h src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp src/plugins/baremetal/baremetaldeviceconfigurationwidget.h src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h src/plugins/baremetal/baremetalplugin.cpp src/plugins/baremetal/baremetalplugin.h src/plugins/baremetal/baremetalruncontrolfactory.cpp src/plugins/baremetal/baremetalruncontrolfactory.h src/plugins/cppeditor/cppcodemodelinspectordialog.cpp src/plugins/cppeditor/cppdoxygen_test.cpp src/plugins/cppeditor/cppdoxygen_test.h src/plugins/debugger/breakpointmarker.cpp src/plugins/debugger/debuggeritemmodel.cpp src/plugins/debugger/debuggeritemmodel.h src/plugins/debugger/loadcoredialog.cpp src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp src/plugins/projectexplorer/addnewmodel.cpp src/plugins/projectexplorer/addnewmodel.h src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp src/plugins/qmlprofiler/abstracttimelinemodel.cpp src/plugins/qmlprofiler/abstracttimelinemodel.h src/plugins/qmlprofiler/notesmodel.cpp src/plugins/qmlprofiler/qml/CategoryLabel.qml src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qml/Overview.js src/plugins/qmlprofiler/qml/Overview.qml src/plugins/qmlprofiler/qml/TimeDisplay.qml src/plugins/qmlprofiler/qml/TimeMarks.qml src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp src/plugins/qmlprofiler/sortedtimelinemodel.cpp src/plugins/qmlprofiler/sortedtimelinemodel.h src/plugins/qmlprofiler/timelinemodelaggregator.cpp src/plugins/qmlprofiler/timelinemodelaggregator.h src/plugins/qmlprofiler/timelinerenderer.cpp src/plugins/qmlprofiler/timelinerenderer.h src/plugins/qmlprojectmanager/QmlProjectManager.json.in src/plugins/texteditor/findinfiles.cpp src/plugins/vcsbase/vcsconfigurationpage.cpp src/shared/qbs src/shared/scriptwrapper/interface_wrap_helpers.h src/shared/scriptwrapper/wrap_helpers.h tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp tests/system/suite_debugger/tst_debug_empty_main/test.py tests/system/suite_debugger/tst_qml_js_console/test.py tests/system/suite_debugger/tst_qml_locals/test.py Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
| * Update LicenseEike Ziller2015-01-168-48/+48
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Make sure qmlviewer/qmlscene application output is printedKai Koehne2015-02-022-0/+2
|/ | | | | | | | | | | | | | Qmlscene and qmlviewer are GUI applications. The heuristic to detect where to print application output (windows log or stderr) has changed in Qt 5.4, which caused the qmlscene, qmlviewer external tools to not print output anymore into General Messages. Work around this by forcing the tools to always print to stderr. Task-number: QTCREATORBUG-13753 Change-Id: Iceee600dd402032674fd3ee11e0bd920793659d2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: hjk <hjk@theqtcompany.com>
* License updateEike Ziller2014-10-098-56/+64
| | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* 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