aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/texteditor/texteditor.qbs
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-301-1/+0
|\
| * Fix qbs build.Christian Kandeler2013-05-301-1/+0
| | | | | | | | | | | | | | Referring to non-existing files causes an error now. Change-Id: I51aed8dfdcc92779158b284b849a34f259997e7c Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Merge remote-tracking branch 'origin/2.7' into 2.8Eike Ziller2013-05-271-1/+1
|\| | | | | | | | | | | | | | | Conflicts: src/plugins/android/androiddebugsupport.cpp src/plugins/qtsupport/qtsupport.qbs Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1
| * rename ProductModule into ExportJoerg Bornemann2013-05-271-1/+1
| | | | | | | | | | | | | | | | This fixes a bunch of warning when building with the updated qbs version. Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* | Fix qbs build.Christian Kandeler2013-03-271-0/+1
|/ | | | | Change-Id: I491e62bfc853f7a422f432607ef4c2f44764acb5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix tests compilationOrgad Shaneh2013-03-051-1/+2
| | | | | Change-Id: I20d990b6be83e5fcd30a8911bcd2bbe8cc303989 Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>
* Generalize QT_NO_CAST_FROM_ASCIIOrgad Shaneh2013-01-161-2/+0
| | | | | Change-Id: I2b6c5876cafb7cf19fc3040bc84fd88a90b6c0e0 Reviewed-by: hjk <qthjk@ovi.com>
* Move TextEditor::ToolTip to UtilsDaniel Teske2013-01-111-17/+0
| | | | | | | To enabled reuse from all plugins. Change-Id: I1de68c8e6ed017d45f1248b2043f9611becc3b54 Reviewed-by: David Schulz <david.schulz@digia.com>
* TextEditor: Compile with QT_NO_CAST_FROM_ASCIIOrgad Shaneh2012-11-261-0/+1
| | | | | | Change-Id: If913f595de78dc8bc4eff1a5c3ad7fe8d5a623ae Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: David Schulz <david.schulz@digia.com>
* CMake: add auto completion for cmake editortomdeblauwe2012-10-251-0/+3
| | | | | | | Original Patch by tomdeblauwe <tdb@traficon.be> Change-Id: I54aea31755dd5702e6998c8343114d34a8752f7b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* qbs files: Consolidate includePaths in QtcLibrary and QtcPluginOrgad Shaneh2012-10-051-8/+3
| | | | | | | Avoid using "." as includePath when it is unneeded Change-Id: I9bc6f4ebe50409f49782520033fd5f098aed10d0 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* qbs files: Sort filesOrgad Shaneh2012-10-031-9/+9
| | | | | Change-Id: I6514deb70162bd52687e6143813bcf1325a797db Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
* Fix qbs code styleYuchen Deng2012-06-191-1/+1
| | | | | Change-Id: Ia3e4df528d391580064efbeeab75016335a4299d Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Fix qbs build with Qt5 (part2)Yuchen Deng2012-06-191-1/+1
| | | | | Change-Id: Iaadded4e1dc557f8e2e0a70b89b44bdda200faef Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* TextEditor: menu for pasting from clipboard history.Francois Ferrand2012-06-051-0/+2
| | | | | | | | | Add new action to show a menu of recent clipboard history. When an item is selected, the item is pasted. Change-Id: Id7e1a90730404fb63762bf1f20678484ec34cd2b Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* TextEditor: Cleanup qbsOrgad Shaneh2012-06-051-121/+146
| | | | | | | Sort files, separate directories to groups Change-Id: If6fca18b46802f9b506301179932a7d6025aea6b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* texteditor: use an enum instead of QString as color idshjk2012-05-031-0/+1
| | | | | Change-Id: I658412c18d5ccfe978ec444451c6417ffb18d71c Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* qbs files: missing dependency fixedJoerg Bornemann2012-04-021-0/+4
| | | | | | | texteditor_dependencies.pri adapted. Change-Id: Id8e2a12701deb6b2e3754dd67d583cfb58c21d95 Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
* Fix compilation of QmlJS code formatter test.Christian Kamm2012-02-281-0/+2
| | | | | | | | | | | | | | Done by moving ITextMark and ITextMarkable from itexteditor.h to itextmark.h. The test uses parts of the texteditor plugin by compiling some of its files. For that to work, the code has to be fairly stand-alone. The reference to EditorManager in itexteditor.cpp broke it. Long term, the test should become a plugin based test to avoid this kind of problem. Change-Id: Ibae3bcd7365eb4e2814cd07011cad0180507e82b Reviewed-by: Fawzi Mohamed <fawzi.mohamed@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-5/+2
| | | | | | | | | * Removed utils, extensionsystem and aggregation dependencies for plugins that depend on Core * Capitalized Find and CPlusPlus Change-Id: I505e5f46976f26da47ad778860f103b173668b1c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+262
Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>