feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
37,492 Commits 108 Branches 368 Tags
461a54bd2d8c4b6c3c342811d38c735fb7abb60a
Commit Graph

32 Commits

Author SHA1 Message Date
Robert Loehning
746c5d8863 Incremented year in copyright info 
Change-Id: Ib5423fdd064e4546f848c0b640b0ed0514c26d3a
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2014-01-08 08:29:47 +01:00
jkobus
e8801167aa Add common interface for text formats inside syntax highlighter 
Change-Id: I87f64446161a57aea0896f68e4eafacef791969b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>
 2013-08-26 13:39:40 +02:00
Friedemann Kleint
9528671f42 Clean headers in Bazaar. 
Ran script to remove inludes on a trial-and-error basis and
manually corrected it.

Change-Id: I004d756b351c3fdd9d13367627b1345f3efa7f2a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-04-05 11:19:36 +02:00
Oswald Buddenhagen
1fda2111d4 Merge remote-tracking branch 'origin/2.6' 
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
 2013-01-31 16:25:33 +01:00
Orgad Shaneh
7cb80f0e16 VCS: Use entries combobox for log 
Tests included

Change-Id: Ibe2f6ece207128f8467b0cbca9dc38f2bcd5ced6
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-30 10:26:31 +01:00
Robert Loehning
298531e370 Incremented year in copyright info 
Change-Id: Ic6a9ff0359625021ebc061d22db6811814534205
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
 2013-01-29 16:27:03 +01:00
Orgad Shaneh
7b39f41c05 VCS: Refactor fileNameFromDiffSpecification 
Use diff file pattern to match file name. Avoid duplication.

Include unit tests for Git

Change-Id: Ib68a08368270a27976a3e16bdd1cb219a52b8889
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-21 12:19:55 +01:00
Orgad Shaneh
725ecc5f91 VCS: Refactor createDiffHighlighter 
All plugins do the same...

Change-Id: I21e5a1d7507292add91199a3db75df74165b63b1
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
 2013-01-18 12:43:22 +01:00
hjk
386ca7c8dd Adjust license headers 
Change-Id: Ice592c6de9951ee3b2c4cb52ed0bb3b6770e0825
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2012-10-05 17:12:56 +02:00
Eike Ziller
e0e8cf3ada Contact -> qt-project.org 
Change-Id: I7134d7de30bcf9f9dcfad42520dd45ee083a852d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2012-07-19 13:23:21 +02:00
Aurélien Gâteau
acd49da492 Fix revno detection in bzr log 
Avoid false-positives when looking for changes under cursor in log view.

Change-Id: Ic0f9c105747ee2c1792b372f9cb3757017633861
Reviewed-by: Hugues Delorme <delorme.hugues@fougsys.fr>
 2012-03-20 17:40:50 +01:00
Tobias Hunger
4b366303e6 VCS: Make dark color schemes work with annotation highlighter 
Task-number: QTCREATORBUG-6257

Change-Id: Ied01cf6773b5114100afccbac33f359cc72c0889
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-03-06 14:34:01 +01:00
Erik Verbruggen
3fa55b7ab9 Removed module names from #include directives. 
Getting the #include directives ready for Qt5. This includes the
new-project wizards.

Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2012-02-15 16:24:46 +01:00
Tobias Hunger
ca4efa4a34 Git: Speed up diff/show output 
* Avoid calling git --version repeatedly
* Use VcsManager to find toplevel directory which does caching.

Task-number: QTCREATORBUG-6906
Change-Id: Ib9ba94751bbecac686a0e116baeded9b2f6f3d90
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2012-02-03 15:23:36 +01:00
hjk
6681d3edee vcs: s/VCS/Vcs/ 
According to style guide.

Change-Id: I05c1d4f50ddbf2876ab7e0835f4abec95fd573b2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
 2012-01-09 10:55:41 +01:00
hjk
fa66a540fd fix C++11 string literal incompatibility 
Change-Id: Ie5d484ba7078f29eae6636d01e1d99e3e45d1a45
Reviewed-by: hjk <qthjk@ovi.com>
 2011-11-22 15:51:41 +01:00
Eike Ziller
fbd47e25ee Merge remote-tracking branch 'origin/2.4' 
Conflicts:
	qtcreator.pri
	share/qtcreator/templates/qtquickapp/main.cpp
	src/plugins/analyzerbase/analyzermanager.cpp
	src/plugins/qmlprofiler/qmlprofilertool.cpp

Change-Id: I3be78f22e7301d61a9c7fc142cbc34a3cebc2cf4
 2011-11-18 10:16:49 +01:00
Hugues Delorme
8225956d17 Bazaar: fix jumping into file from diff view 
From a diff view, jumping into 'added' files wasn't working.
Actually file jumping was working only for 'modified' files.
This is fixed by using a more general diff regexp in class
BazaarEditor (attribute m_diffFileId)

This bugfix also allows to highlight all diff specs (rename, remove, ...)

Task-number: QTCREATORBUG-6531
Change-Id: I80bcbc0f77644c6caa7e7c750bd474a12263b589
Reviewed-by: Bill King <bill.king@nokia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-16 13:55:08 +01:00
Hugues Delorme
d4a4ca5054 Bazaar: whitespace and indentation fixes 
Change-Id: I31258a10bd79a047f25787d38c070b0c95ed9f78
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-11-14 10:29:35 +01:00
hjk
31600758de all: s/info@qt.nokia.com/qt-info@nokia.com/ 
Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
 2011-11-03 10:33:19 +01:00
cerf
e7b7b5f230 Bazaar: fix incomplete list of files in the diff editor 
BazaarEditor::fileNameFromDiffSpecification() was not seeing all lines
starting with "+++ file".
Searching for "=== modified file 'file'" instead solves the problem

Change-Id: Ib1d4c839543f0f8cc00ecbfaa177b369a4c20ee1
Merge-request: 330
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/78
 2011-05-24 12:07:53 +02:00
Tobias Hunger
aa2acec14c Fix/add copyright headers 
Change-Id: I8b73d583be1ee7183f4074bce49d5390e38631a2
 2011-05-06 15:17:05 +02:00
Oswald Buddenhagen
dc3c156cac Merge branch '2.2' 
Conflicts:
	src/plugins/debugger/gdb/pythongdbengine.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4desktoptargetfactory.h
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.cpp
	src/plugins/qt4projectmanager/qt-desktop/qt4simulatortargetfactory.h
	src/plugins/qt4projectmanager/qt-maemo/maemodeploystep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoglobal.cpp
	src/plugins/qt4projectmanager/qt-maemo/qt4maemotargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/qt4symbiantargetfactory.cpp
	src/plugins/qt4projectmanager/qt-s60/s60deploystep.cpp
	src/plugins/qt4projectmanager/qt4target.cpp
	src/plugins/qt4projectmanager/qt4target.h
	src/plugins/qt4projectmanager/qtoptionspage.h
	src/plugins/qt4projectmanager/qtversionmanager.cpp
	src/plugins/welcome/welcomemode.cpp
 2011-04-14 12:39:31 +02:00
hjk
8397663964 Update license. 2011-04-13 11:49:28 +02:00
Friedemann Kleint
d7cddd4e17 VCS[Bazaar, Mercurial]: Add diff formatting, revert chunk. 
Add toolbar controls for ignore-whitespace to editors
and wire 'Revert Chunk' context menus.

Fix Bazaar diff interaction (find the file on doubleclick).

Introduce initializeDiffEditor to BaseClient and wire the editors
there.
 2011-03-28 11:59:26 +02:00
cerf
d23d7cbc12 Bazaar: fix code folding markers in the diff view 
The top-level marker is now centered on the line starting with '==='

Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-16 17:29:13 +01:00
cerf
2c088f06a0 Bazaar: fix jumping to the changes from the blame view 
Merge-request: 273
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-16 17:29:12 +01:00
cerf
53ba19a102 Bazaar plugin : corrected whitespaces and indentation 
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-16 17:29:06 +01:00
cerf
9494352abf Bazaar: fix code folding markers in the diff view 
The top-level marker is now centered on the line starting with '==='

Merge-request: 274
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-14 19:32:42 +01:00
cerf
6971466eaa Bazaar: fix jumping to the changes from the blame view 
Merge-request: 273
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-14 17:52:50 +01:00
cerf
2e6a391966 Bazaar plugin : corrected whitespaces and indentation 
Merge-request: 268
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-03-11 15:32:11 +01:00
cerf
f9bb4c59dc Added new Bazaar plugin 
Merge-request: 229
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
 2011-02-28 16:08:38 +01:00