feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
18,741 Commits 108 Branches 368 Tags
f8ef0fac136d48e4ddc1df260bab4344ca812bc8
Commit Graph

42 Commits

Author SHA1 Message Date
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
Oswald Buddenhagen
ca1b85cec7 Merge remote branch 'origin/2.2' 2011-04-07 10:12:39 +02:00
Leandro Melo
dc25adbe67 Fix duplicate mime types in the user file 
Also avoid writing the file on every apply and do it
only when the dialog is finished.

Reset can still be improved to take effect immediately.

Reviewed-by: con
 2011-04-06 16:00:35 +02:00
Friedemann Kleint
fb824677fc Documentation: Add Core/Mime classes. 2011-04-01 11:47:39 +02:00
Oswald Buddenhagen
93195356a9 mime type matching optimization 
given that checking for a match is expensive and determining the
priority is cheap, it makes sense to match only if the priority is known
to be high enough.

Reviewed-by: Leandro Melo
 2011-03-09 22:24:13 +01:00
Oswald Buddenhagen
f3d6cd9cd1 add mime type detection for stand-alone byte arrays 
Reviewed-by: Leandro Melo
 2011-03-09 22:24:13 +01:00
Leandro Melo
3db53206c2 MIME types: Introduce user extensions feature 
Creates a new page in the options dialog which allows
the user to modify MIME type's globl patterns and rule-based
magic matchers.

As a side-effect of this feature our MIME database (and related
components) got some improvements.

Reviewed-by: Friedemann Kleint
 2011-03-02 10:13:40 +01:00
Leandro Melo
467c13e11c MIME: A magic may have many match elements 
Reviewed-by: Friedemann Kleint
 2011-02-16 12:19:50 +01:00
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
Roberto Raggi
b4e421062f Removed stray tokens and fixed warnings/errors when compiling with pedantic C++ compilers. 2010-12-16 12:05:48 +01:00
Christian Kandeler
21bec0f775 Fix compilation. 
Move #include directive along with matching code.

Written-by: con
 2010-12-01 13:47:31 +01:00
con
964236c816 Move some API around and make some IFile based instead of IEditor. 
promptReadOnlyFile: EditorManager-->FileManager
fileFilters: EditorManager-->MimeDataBase
saveFile & saveFileAs --> IFile based
 2010-12-01 13:10:46 +01:00
Friedemann Kleint
1d85378840 Compile fix 2010-09-13 17:12:46 +02:00
Leandro Melo
463488f7d7 MIME database: Add support for attribut weight; Add magic matcher for byte patterns. 
This affects how files are identified by the MIME database.
Although this is a general improvement, it was triggered by the following bug report.

Task-number: QTCREATORBUG-1793
Reviewed-by: Friedemann Kleint
 2010-09-13 16:45:21 +02:00
dt
33c3e1cb89 Add a "All Projects" Filter to the Load Project dialog 2010-09-06 16:50:37 +02:00
Friedemann Kleint
4648a5b3a4 MimeDatabase: Split up findByFile in 2 passes. 
Try to do a match by suffix first to avoid
scanning the file contents if at all possible.
Reviewed-by: con
 2010-05-07 15:08:16 +02:00
hjk
9595504bda Long live the king! 2010-03-05 11:28:13 +01:00
Friedemann Kleint
7d3d9cad32 Fix code model indexing crash on Mac. 
Introduce multithread-locking to Core::MimeDatabase as it is
invoked from the indexer thread to sort apart headers and sources.
Add a convenience to operate on a sequence to avoid locking for each
file.
 2010-02-22 16:00:47 +01:00
dt
3c99f02bcb Rename QMake to qmake since that's the official spelling. 2010-02-17 16:54:50 +01:00
Friedemann Kleint
f672bff338 Fix some code scanning issues. 
foreach()-Loops.
 2010-02-01 14:00:07 +01:00
Friedemann Kleint
253f8c6010 Mime database: Fix potential memory leak. 
Uncovered by code scanning.
 2010-01-25 10:09:38 +01:00
con
24d592d8fa Merge remote branch 'origin/1.3' 
Conflicts:
	src/plugins/bineditor/bineditorplugin.cpp
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/debugger/gdb/gdbengine.cpp
	src/plugins/debugger/watchhandler.cpp
 2010-01-14 18:45:35 +01:00
Thorbjørn Lindeijer
c47f1e3a7f Made "All Files" filter always available 
Needed to be able to open text files with arbitrary or no extension.
Previously, the "All Files" filter would disappear when there was no
plugin with an empty filter string, like the BinEditor plugin.

Reviewed-by: con
 2010-01-13 17:17:21 +01:00
Tobias Hunger
592e494d1a Fix typos 
Reviewed-by: thorbjorn
 2010-01-11 10:26:13 +01:00
hjk
93cbef8724 long live the king 2009-08-14 09:30:56 +02:00
Sergey Belyashov
2c414f21a6 Added possibility to translate file types in open/save dialogs. 
Merge-request: 900
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
 2009-07-16 10:06:52 +02:00
Jason McDonald
884b7af769 Update license headers and sales contact details. 
Reviewed-by: Trust Me
 2009-06-17 00:01:27 +10:00
Thorbjørn Lindeijer
4fcabed862 Fixed .h++ and .c++ files to be recognized as supported file types 
For example, when creating a new generic project, such files would not
automatically get added to the list of files.

Reviewed-by: Daniel Molkentin
 2009-06-10 10:20:19 +02:00
Friedemann Kleint
5150089738 Fixed translation glitches. 2009-05-13 14:39:55 +02:00
Roberto Raggi
e0df247d21 Fixed: Possible crash in MimeType::matchesFile(). 2009-03-09 19:34:55 +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
hjk
4a552ead9f use QTC_ASSERT instead of Q_ASSERT 2008-12-09 15:25:01 +01:00
hjk
342caa2141 some more whitespace changes 2008-12-09 11:07:24 +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