feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
59,435 Commits 108 Branches 368 Tags
4704f49fbb1201ebf10ab9dbaed0275ff25faba8
Commit Graph

85 Commits

Author SHA1 Message Date
con
d1023c7614 It's 2011 now. 
Reviewed-by: hjk
 2011-01-12 09:46:24 +01:00
con
b1bcf081d8 Merge branch '2.1' 
Conflicts:
	src/plugins/coreplugin/basemode.cpp
	src/plugins/coreplugin/basemode.h
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.cpp
	src/plugins/coreplugin/scriptmanager/qworkbench_wrapper.h
	src/plugins/debugger/cdb/cdbsymbolpathlisteditor.cpp
	src/plugins/debugger/debuggeragents.cpp
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/debugger/debuggeruiswitcher.h
	src/plugins/projectexplorer/buildconfigdialog.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.cpp
	src/plugins/qmldesigner/components/propertyeditor/colorwidget.h
	src/plugins/qmldesigner/designercore/include/enumeratormetainfo.h
	src/plugins/qmldesigner/designercore/include/modelutilities.h
	src/plugins/qmldesigner/designercore/include/nodeinstance.h
	src/plugins/qmldesigner/designercore/include/propertymetainfo.h
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicsscenenodeinstance.h
	src/plugins/qmldesigner/designercore/instances/graphicsviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/graphicswidgetnodeinstance.h
	src/plugins/qmldesigner/designercore/instances/nodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/qmlviewnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.cpp
	src/plugins/qmldesigner/designercore/instances/widgetnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/enumeratormetainfo.cpp
	src/plugins/qmldesigner/designercore/metainfo/propertymetainfo.cpp
	src/plugins/qmldesigner/designercore/model/modelutilities.cpp
	src/plugins/snippets/inputwidget.cpp
	src/plugins/snippets/snippetscompletion.cpp
	src/plugins/snippets/snippetscompletion.h
	src/plugins/snippets/snippetspec.cpp
	src/plugins/snippets/snippetsplugin.cpp
	src/plugins/snippets/snippetswindow.cpp
	src/plugins/snippets/snippetswindow.h
	src/plugins/texteditor/snippetsparser.cpp
	src/tools/qml/qmldom/main.cpp
	tests/manual/trk/runner.cpp
	tests/manual/trk/trkolddevice.cpp
	tests/manual/trk/trkolddevice.h
	tests/manual/trk/trkserver.cpp
 2010-12-17 17:00:53 +01:00
con
04e32b0049 License headers. 2010-12-17 16:03:42 +01:00
con
c7a1068f21 Support \n for regexp replace string. 2010-11-03 11:37:04 +01:00
Friedemann Kleint
699495f017 Fix compiler warnings, constify. 2010-10-19 08:55:55 +02:00
con
8f0b3f463f Yet another missing utf8 encoding for file search. 
Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning
 2010-10-18 18:11:40 +02:00
con
63bd3c2e51 Avoid endless loop in multi-file search. 
Making it line based, which simplifies it a bit (and makes it more
consistent with the regexp search).
 2010-10-14 19:24:36 +02:00
con
d2a91ed1a0 Use the encoding settings when doing multi-file searches. 
Task-number: QTCREATORBUG-65
 2010-10-11 14:25:22 +02:00
Christian Kamm
b78c1ef6da Merge remote branch 'origin/2.1' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	share/qtcreator/templates/wizards/qtcreatorplugin/MyPlugin.pluginspec
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.pluginspec
	src/plugins/classview/ClassView.pluginspec
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec
	src/plugins/coreplugin/Core.pluginspec
	src/plugins/coreplugin/coreconstants.h
	src/plugins/cpaster/CodePaster.pluginspec
	src/plugins/cppeditor/CppEditor.pluginspec
	src/plugins/cpptools/CppTools.pluginspec
	src/plugins/cvs/CVS.pluginspec
	src/plugins/debugger/Debugger.pluginspec
	src/plugins/debugger/breakhandler.cpp
	src/plugins/designer/Designer.pluginspec
	src/plugins/fakevim/FakeVim.pluginspec
	src/plugins/find/Find.pluginspec
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec
	src/plugins/git/ScmGit.pluginspec
	src/plugins/helloworld/HelloWorld.pluginspec
	src/plugins/help/Help.pluginspec
	src/plugins/imageviewer/ImageViewer.pluginspec
	src/plugins/locator/Locator.pluginspec
	src/plugins/mercurial/Mercurial.pluginspec
	src/plugins/perforce/Perforce.pluginspec
	src/plugins/projectexplorer/ProjectExplorer.pluginspec
	src/plugins/qmldesigner/QmlDesigner.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.pluginspec
	src/plugins/qmljsinspector/QmlJSInspector.pluginspec
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/regexp/RegExp.pluginspec
	src/plugins/resourceeditor/ResourceEditor.pluginspec
	src/plugins/snippets/Snippets.pluginspec
	src/plugins/subversion/Subversion.pluginspec
	src/plugins/tasklist/TaskList.pluginspec
	src/plugins/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
	tests/auto/cplusplus/codeformatter/tst_codeformatter.cpp
	tests/manual/fakevim/fakevim.pro
	tests/manual/ssh/errorhandling/main.cpp
 2010-10-11 14:16:33 +02:00
con
028a2c8f5c File search wasn't showing non-latin1 chars correctly in results. 
Missing conversion back to the codec. This fixes it only for Utf8
encoded files. It was only happening for non-regexp searches.

Task-number: QTCREATORBUG-65
Reviewed-by: Robert Loehning
 2010-10-08 13:48:25 +02:00
con
fe8f2c2b1a Insert tabs for \t when doing regexp replace. 
Task-number: QTCREATORBUG-1544
 2010-10-06 16:18:11 +02:00
con
a54fc1f6a1 Work around stupid bug in QtConcurrent. 
You have to call setProgressValue(AndText) at least once
unconditionally, before resultReporting and isProgressUpdateNeeded
actually do the right thing.

Also use qreal progress values internally while iterating directories.
 2010-06-25 12:23:03 +02:00
con
9c47c42232 Add multiple search results to the tree at once. 
Task-number: QTCREATORBUG-1690
 2010-06-25 12:23:03 +02:00
con
e8c0c7895c Use iterator instead of collecting all the files to search beforehand. 
Especially for the file system filter, it's better not to block while
collecting all the file names by first iterating over the file system.
Now, the filters return an iterator, and the search thread takes a file
from it, searches it, and takes the next file.

This also unifies the file iterator for the custom locator filters and
the find in files on file system search filter.

Task-number: QTCREATORBUG-1690
 2010-06-24 17:52:25 +02:00
con
f232cd4ead Fixes: Multi-file regexp replace didn't replace placeholders e.g. \1 2010-06-11 11:07:48 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Robert Loehning
62dd493865 Fixed crash. Passing negative values to isalnum compiled with MSVC crashed. 2010-02-11 19:04:19 +01:00
Friedemann Kleint
f672bff338 Fix some code scanning issues. 
foreach()-Loops.
 2010-02-01 14:00:07 +01:00
Friedemann Kleint
5948e284bb Rename namespace Core::Utils into Utils 
Also move Designer::Internal::FormWindowEditor ->
Designer::FormWindowEditor.
 2009-10-05 11:06:05 +02:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
con
5b2abd8510 Searching in files takes open editors into account now. 
Task-number: 258468
 2009-08-05 13:29:16 +02:00
dt
3607ad172e Fix opening files from search results didn't get the correct encoding. 
Patch based on the analysis by Grigory Zagorodnev.

Task-number: 253974
 2009-07-15 15:34:59 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Friedemann Kleint
2f129dfad3 Fixed some translation errors. 2009-04-30 16:09:57 +02:00
Oswald Buddenhagen
9db13e3255 make lupdate see the QApplication::translate() calls 2009-04-20 16:51:10 +02:00
dt
5d14ef86e8 Fixes: Compile fix 
Details:  Patch by Kris Wong
 2009-03-13 18:31:21 +01:00
con
b315b1dab6 Fixes: - 'Whole words only' search in files bug 
Task:     - 246854
RevBy:    - hjk
 2009-03-04 17:40:38 +01:00
hjk
8ca887aae2 Fixes: change file license headers to include LGPL 2009-02-25 09:15:00 +01:00
Daniel Molkentin
59affcfffc Bump year in licence header. 2009-01-13 19:22:14 +01:00
hjk
da3cb14483 chancge Nokia GPL exception version from 1.2 to 1.3 2008-12-16 17:20:00 +01:00
Oswald Buddenhagen
01332cfb38 escape backslash => make "whole words only" work with "regular expression" 2008-12-03 22:03:07 +01:00
hjk
ab83dcd87c off-by-one in headers 2008-12-02 14:20:25 +01:00
hjk
8a43d9b9f3 end-of-line whitespace correction of the new headers 2008-12-02 14:17:16 +01:00
hjk
f61e8672db more cosmetic changes 2008-12-02 14:09:21 +01:00
con
05c35356ab Initial import 2008-12-02 12:01:29 +01:00