feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
30,482 Commits 108 Branches 368 Tags
77ddc869e02e77631264e69cb67b51ced7500d15
Commit Graph

523 Commits

Author SHA1 Message Date
kh1
de040e80fc Initial support for showing help in external window. 
Task-number: QTCREATORBUG-1473
 2010-07-23 16:37:29 +02:00
kh1
8c0223f874 Some preparations for externel help support. 2010-07-23 16:37:29 +02:00
kh1
c242146a0c Call the proper method to avoid code duplication. 2010-07-23 16:37:28 +02:00
kh1
37b06903d3 Move some code to where it belongs really. 2010-07-23 11:21:06 +02:00
kh1
a59a1e5d37 Use new function signature. Small code cleanup. 2010-07-23 11:21:06 +02:00
con
6bd790bd0f Version bump 2010-07-22 18:05:53 +02:00
kh1
a7d5a1f455 Hide the Unfiltered filter in the settings dialog. 
Reviewed-by: ck
 2010-07-21 10:14:11 +02:00
kh1
37efd0e10f Implement online help filter. 
The search for remote content, like stl::vector in cpp-reference,
google, bing, wikipedia etc...

Task-number: QTCREATORBUG-1375
Reviewed-by: ck
 2010-07-16 11:16:21 +02:00
con
cecf9ac25a Move find flags from IFindSupport to more accessible place. 
For later use in IFindFilter.
 2010-07-15 16:42:31 +02:00
kh1
01fb9cdbaf Make sure we open the help only if needed. 
Reviewed-by: ck
 2010-07-14 17:01:26 +02:00
kh1
141e555647 Lower the count to spead up search. 
Reviewed-by: ck
 2010-07-14 17:01:26 +02:00
con
2c25f5ed7a Add replace action. Replace the icons for replace with text-only. 
Also show "Replace", "Replace & Find" and "Replace All" in the tool bar,
i.e. don't show the "Replace & Find Previous" in the tool bar to avoid
it getting crowded.

Reviewed-by: Thorbjørn Lindeijer
 2010-07-14 14:45:18 +02:00
con
e85d215460 Merge remote branch 'origin/2.0' 2010-07-13 15:43:48 +02:00
kh1
3af05a8f67 Fix build problem without webkit. 2010-07-13 15:31:46 +02:00
con
b3dbc4b4e4 Add flag to IPlugin::aboutToShutdown that allows asynchronous shutdown. 
If a plugin requests asyncronous shutdown, the shutdown sequence does
not continue to deleting the plugins before it has sent a
asynchronousShutdownFinished signal. During that time an event loop
is running.
 2010-07-13 15:25:21 +02:00
Friedemann Kleint
adf2c1b0da Merge branch '2.0' 
Conflicts:
	src/plugins/qmlinspector/QmlInspector.pluginspec
 2010-07-13 15:20:54 +02:00
kh1
6a98c17147 Implement topic highlighting after e.g. F1. 
Task-number: QTCREATORBUG-1765
Reviewed-by: ck
 2010-07-13 13:30:39 +02:00
kh1
2cd7c7b8c8 Force engine setup. 
If we where not in full help mode at least once, the engine
would still run without valid help collection due to the new
lazy initialisation, thus the right side pane would not be
able to retrieve the requested help file.

Reviewed-by: ck
 2010-07-08 10:43:01 +02:00
kh1
b546e979d3 Force engine setup. 
If we where not in full help mode at least once, the engine
would still run without valid help collection due to the new
lazy initialisation, thus the right side pane would not be
able to retrieve the requested help file.

Reviewed-by: ck
 2010-07-07 11:26:59 +02:00
kh1
8f76baa647 Fix the missing call to register the qml and internal help files. 2010-06-29 10:48:52 +02:00
kh1
5337667cc4 Fix the missing call to register the qml and internal help files. 2010-06-29 10:44:14 +02:00
hjk
f56dacc76f Core::Context: remove special handling of C_GLOBAL_ID/C_GLOBAL 2010-06-28 14:30:03 +02:00
hjk
2f5f358ff4 Core::Context: compile hot fix for Windows. 2010-06-25 17:38:25 +02:00
hjk
c7e8b51d37 core: use a class derived from QList<int> instead of a QList<int> for Core::Context 
A mostly mechanical change.

Reviewed-By: con
 2010-06-25 12:58:07 +02:00
con
af44136e22 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/help/helpplugin.cpp
	src/plugins/projectexplorer/projectexplorer.cpp
	src/plugins/projectexplorer/projectexplorer.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecontents.h
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationstep.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/qt4projectmanager/qt-maemo/maemoruncontrol.cpp
	src/tools/qml/qmldump/main.cpp
 2010-06-24 11:40:22 +02:00
kh1
38b2ffce04 Fix missing help plugin shortcuts. 
Reviewed-by: ck
 2010-06-21 13:27:42 +02:00
Erik Verbruggen
05639e4688 Merge branch 'origin/2.0' (early part) 2010-06-15 11:30:51 +02:00
kh1
106d111f9b Fixes broken attribute list for real. 
Task-number: QTCREATORBUG-1621
 2010-06-14 18:07:20 +02:00
kh1
3cf8d21115 Fix build without webkit. 2010-06-14 16:57:53 +02:00
kh1
27daa542d3 We need to check for http only. 2010-06-14 16:57:52 +02:00
kh1
7d4bbf4934 Allow http request to be opened in the help plugin. 
Reviewed-by: ck
 2010-06-14 14:34:32 +02:00
con
2e10016210 Version update to match the planned version naming. 2010-06-11 16:41:11 +02:00
con
9250d0007d Version update to match the planned version naming. 2010-06-11 16:37:10 +02:00
con
30fae3eab1 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/projectexplorer/taskwindow.h
	src/plugins/qmldesigner/designercore/model/modelmerger.cpp
	src/plugins/qmljseditor/qmljshoverhandler.h
	src/plugins/qt4projectmanager/Qt4ProjectManager.pluginspec
	src/plugins/qt4projectmanager/qt-maemo/maemopackagecreationwidget.cpp
	src/plugins/subversion/subversionplugin.cpp
 2010-06-11 16:30:39 +02:00
kh1
1b6ad08795 Move help manager into core. 
- lessens open file handles
 - improves help plugin startup further

Task-number: QTCREATORBUG-337
Reviewed-by: ck
 2010-06-11 13:11:37 +02:00
kh1
40b983a91b Fix missing check-boxes on initial startup. 
Task-number: QTCREATORBUG-1621
Reviewed-by: ck
 2010-06-11 12:49:19 +02:00
con
7f733b1545 Merge remote branch 'origin/2.0' 
Conflicts:
	README
	doc/qt-html-templates.qdocconf
	doc/qtcreator.qdoc
	doc/qtcreator.qdocconf
	src/app/Info.plist
	src/plugins/bineditor/BinEditor.pluginspec
	src/plugins/bookmarks/Bookmarks.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/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/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/qmlinspector/QmlInspector.pluginspec
	src/plugins/qmljseditor/QmlJSEditor.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/texteditor/TextEditor.pluginspec
	src/plugins/vcsbase/VCSBase.pluginspec
	src/plugins/welcome/Welcome.pluginspec
 2010-06-08 10:39:45 +02:00
con
d326c16747 Version bump. 2010-06-07 13:45:49 +02:00
Thorbjørn Lindeijer
50ccecee2e Some initialization and removed redundant member variables 
Reviewed-by: kh1
 2010-06-02 14:53:44 +02:00
hjk
5806009d29 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp
 2010-06-02 09:57:23 +02:00
kh1
284fc63236 Backport some Qt Assistant print fixes. 
Reviewed-by: ck
 2010-06-01 13:15:07 +02:00
Daniel Molkentin
a7f1e80322 Do not try to force a version, this heuristic breaks too often. 
Reviewed-by: Leena Miettinen
 2010-05-31 13:57:34 +02:00
kh1
9960008f77 Some translation fixes and reuse some existing constants. 
Reviewed-by: ossi
 2010-05-31 12:39:41 +02:00
Friedemann Kleint
3330d15964 Qt Designer integration: Fix Help button in stylesheet editor. 
Wire QDesignerIntegration's help signal to help manager.

Task-number: QTCREATORBUG-1505
Reviewed-by: kh <qtc-committer@nokia.com>
 2010-05-28 15:58:55 +02:00
con
38f6379f39 Merge remote branch 'origin/2.0' 
Conflicts:
	doc/qtcreator.qdoc
	src/plugins/find/currentdocumentfind.cpp
	src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
 2010-05-17 17:40:40 +02:00
Leena Miettinen
cf233161fa Doc - UI - Fix UI text capitalization to follow the KDE Style Guide rules. 
Reviewed-by: ossi
 2010-05-14 15:53:56 +02:00
con
84d9b647ee Version bump. 2010-04-30 11:58:05 +02:00
Lasse Holmstedt
7ba6fc8834 Fixed localization issues with SideBar 
When changing the language, the sidebar items would break because
their localized window titles were used for storing the settings. Now,
id's are used.

Reviewed-by: con
 2010-04-29 13:50:21 +02:00
con
ca14299790 Rename IPlugin::shutdown --> IPlugin::aboutToShutdown 
Discussed-with: hjk
 2010-04-28 17:32:01 +02:00
kh1
c908da836f Fix handleHelpRequest. 
* Make sure we only change our own urls inside that function
* QDesktopService::setUrlHandler expects the target slot to take a QUrl

Reviewed-by: ck
 2010-04-28 15:07:06 +02:00