feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
58,042 Commits 108 Branches 368 Tags
88b29792cbb7899c4179bc95e6468b7afbd81c6f
Commit Graph

35 Commits

Author SHA1 Message Date
Eike Ziller
88b29792cb Merge remote-tracking branch 'origin/4.8' into 4.9 
Conflicts:
	src/plugins/android/androidrunnerworker.cpp
	src/plugins/android/androidrunnerworker.h

Change-Id: I52b9117c8a57dc4a34cfc09d1ae9bc76e0752bfc
 2019-02-04 15:21:55 +01:00
Eike Ziller
0aa8a98afa Help: Disable middle-mouse click outside of help mode 
Since only help mode supports it.

Fixes: QTCREATORBUG-20554
Change-Id: Ida8cee01c0ab0c8fc5ffacf3c4521feeadf65995
Reviewed-by: David Schulz <david.schulz@qt.io>
 2019-02-01 10:18:47 +00:00
Alessandro Portale
901b2be036 HelpPlugin: Modernize 
modernize-use-*

Change-Id: Ie0058675c1336377326089dbc093436130f1fe03
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
 2018-11-12 11:10:38 +00:00
Eike Ziller
da18fc1f50 Help: Use nullptr and fix a few warnings 
Change-Id: I7f7307a765d8755bf96b0cad1210e61df0a0199f
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
 2018-04-19 12:07:59 +00:00
Eike Ziller
5f68209541 Fix middle mouse button in help viewer 
It didn't do anything on links though opening links in new pages was its
purpose.

Task-number: QTCREATORBUG-19344
Change-Id: I9560a59bd2ad4ec7179dce984cf3bc5160b84ff3
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 2018-03-05 11:35:21 +00:00
Eike Ziller
d614131bef Help: Fix setting focus to help viewer 
Change-Id: Ie846d6996298b74a4b55c359787fd4f63b471cdf
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
 2017-07-12 12:35:22 +00:00
Jarek Kobus
cd2a70c867 Remove unneeded includes 
Change-Id: I83a6dc6ba33f7f8e1f6b1babbf60c69554435a0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
 2017-03-28 19:13:42 +00:00
Eike Ziller
ad7ab4bee1 Help: Fix that sourceChanged was not sent when using backward/forward 
Change-Id: Idc6ce63768bd77703149b5593f4ebabe88d1b033
Reviewed-by: David Schulz <david.schulz@qt.io>
 2016-11-01 13:43:56 +00:00
Eike Ziller
a416a5b6e3 Help: Option to open links in window 
Task-number: QTCREATORBUG-16842
Change-Id: I420f48a00c56ebc89bade7e91ceb8ec391316e36
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
 2016-09-23 11:26:07 +00:00
Eike Ziller
8c94419a0b Help: Remove unnecessary QLatin1Strings 
Change-Id: Ia5c83d5e2c392873f400f3db396b9c355cdd4192
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-07-21 06:12:22 +00:00
Orgad Shaneh
d01adc134d Help: Use Qt5-style connects 
The heavy lifting was done by clazy.

Change-Id: Ied9c7fcc031e530c41b342de950e2f0ac730bbb1
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
 2016-06-30 12:12:00 +00:00
Eike Ziller
8a77eacf8d Merge remote-tracking branch 'origin/4.0' 
Change-Id: Ied609608f6b12aa923c67777bc5a273c4d8fbcbb
 2016-04-15 10:07:55 +02:00
Eskil Abrahamsen Blomfeldt
cb62258ee3 Help browser: Fix overlapping images in old docs 
This works around an issue in Qt where line-height will be
interpreted as an absolute height, rather than the minimum,
so if images are larger than the specified size, they will
overlap the text.

The work around is just to change all instances of FixedHeight
to MinimumHeight until the default can be changed in Qt.

Task-number: QTBUG-51962
Change-Id: I343d30c539d434301866a7a659ef5fc300c364d6
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-04-13 08:09:44 +00:00
hjk
bcf7a11c24 Core: Apply 'static' pattern to Core::FindPlugin 
Also, rename it to Core::Find. It hasn't been a plugin for a while.

Change-Id: I845885ccf18bdc1440258d523b033758d5583881
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-03-15 12:43:59 +00:00
Eike Ziller
727b918773 Help: Fix issues with scrolling to right position 
The different viewer backends have different issues with scrolling to
the right position if the URL contains an anchor. In all combinations of
"viewer was visible/invisible when help was requested" and "viewer last
showed the same/a different page then the requested URL".

Move the special logic from help plugin to the viewer backends.

Task-number: QTCREATORBUG-15548
Change-Id: I962c90695ceaee48800a3590676e1d28343cf790
Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2016-03-03 15:10:57 +00:00
Tobias Hunger
397e7f4843 Update License according to agreement with Free Qt Foundation 
* Update files in src/plugins

Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
 2016-01-19 15:57:01 +00:00
Eike Ziller
91ffe63e1a TextBrowserHelpViewer: Fix opening external links 
External links were not opening at all. The logic for that was present
for TextBrowserHelpViewer::setSource, but clicking on links would
directly go through the text browsers loadResource method. Avoid that by
turning off openLinks and handling the anchorClicked signal instead.

Task-number: QTCREATORBUG-15491
Change-Id: I86017f14138b98738221c1aed42c37551feaf671
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2015-12-17 14:29:53 +00:00
Eike Ziller
55b0136923 TextBrowserHelpViewer: Don't use magic number. 
Change-Id: I0902ed925f0dc4c5770fee0f02159cfc31e67b02
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
 2015-12-17 14:29:45 +00:00
Montel Laurent
54eabfb0c1 Port to new connect api 
Change-Id: If9948ced45095546f37f9f397b65f922dc925b6a
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-09-22 05:54:01 +00:00
Eike Ziller
56aadc407d Merge remote-tracking branch 'origin/3.3' 
Conflicts:
	src/plugins/debugger/watchhandler.cpp
	src/plugins/projectexplorer/kitmodel.cpp
	src/plugins/qbsprojectmanager/qbsprojectmanager.cpp
	src/shared/qbs

Change-Id: I6a68090993a264e93ac7850858cc24ba6bdb5602
 2015-02-12 17:36:29 +01:00
Eike Ziller
9926fc2ab1 Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe' 
Conflicts:
	src/libs/utils/tooltip/tipcontents.cpp
	src/libs/utils/tooltip/tipcontents.h
	src/plugins/android/androiddeployqtstep.cpp
	src/plugins/baremetal/baremetalconstants.h
	src/plugins/baremetal/baremetaldevice.cpp
	src/plugins/baremetal/baremetaldevice.h
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwidget.h
	src/plugins/baremetal/baremetaldeviceconfigurationwizard.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.cpp
	src/plugins/baremetal/baremetaldeviceconfigurationwizardpages.h
	src/plugins/baremetal/baremetalplugin.cpp
	src/plugins/baremetal/baremetalplugin.h
	src/plugins/baremetal/baremetalruncontrolfactory.cpp
	src/plugins/baremetal/baremetalruncontrolfactory.h
	src/plugins/cppeditor/cppcodemodelinspectordialog.cpp
	src/plugins/cppeditor/cppdoxygen_test.cpp
	src/plugins/cppeditor/cppdoxygen_test.h
	src/plugins/debugger/breakpointmarker.cpp
	src/plugins/debugger/debuggeritemmodel.cpp
	src/plugins/debugger/debuggeritemmodel.h
	src/plugins/debugger/loadcoredialog.cpp
	src/plugins/genericprojectmanager/cppmodelmanagerhelper.cpp
	src/plugins/projectexplorer/addnewmodel.cpp
	src/plugins/projectexplorer/addnewmodel.h
	src/plugins/projectexplorer/jsonwizard/jsonfieldpage.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.cpp
	src/plugins/qmlprofiler/abstracttimelinemodel.h
	src/plugins/qmlprofiler/notesmodel.cpp
	src/plugins/qmlprofiler/qml/CategoryLabel.qml
	src/plugins/qmlprofiler/qml/MainView.qml
	src/plugins/qmlprofiler/qml/Overview.js
	src/plugins/qmlprofiler/qml/Overview.qml
	src/plugins/qmlprofiler/qml/TimeDisplay.qml
	src/plugins/qmlprofiler/qml/TimeMarks.qml
	src/plugins/qmlprofiler/qmlprofilertimelinemodelproxy.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.cpp
	src/plugins/qmlprofiler/sortedtimelinemodel.h
	src/plugins/qmlprofiler/timelinemodelaggregator.cpp
	src/plugins/qmlprofiler/timelinemodelaggregator.h
	src/plugins/qmlprofiler/timelinerenderer.cpp
	src/plugins/qmlprofiler/timelinerenderer.h
	src/plugins/qmlprojectmanager/QmlProjectManager.json.in
	src/plugins/texteditor/findinfiles.cpp
	src/plugins/vcsbase/vcsconfigurationpage.cpp
	src/shared/qbs
	src/shared/scriptwrapper/interface_wrap_helpers.h
	src/shared/scriptwrapper/wrap_helpers.h
	tests/auto/qmlprofiler/abstracttimelinemodel/tst_abstracttimelinemodel.cpp
	tests/system/suite_debugger/tst_debug_empty_main/test.py
	tests/system/suite_debugger/tst_qml_js_console/test.py
	tests/system/suite_debugger/tst_qml_locals/test.py

Change-Id: I67540b648f8b162496f4aa606b04d50c7c9125c6
 2015-02-12 17:29:21 +01:00
Thomas Hartmann
a6d4d50172 Use always black as the foreground color in HelpViewer 
Our css styling assumes black as the background color.
Task-number: QTCREATORBUG-13660
Change-Id: Ia8d76c39c970b436a0ae038191d8d0f8f8728ded
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-19 12:21:54 +01:00
Eike Ziller
3c85058694 Update License 
Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2015-01-16 12:37:56 +01:00
Nikita Baryshnikov
67788b6f0a Help: show ToolTips on links hovers 
Change-Id: Icce21b848f38b4f45b58ccff626b2e23a7e8ef98
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2015-01-06 10:32:25 +01:00
Eike Ziller
ee63594182 Help: Do not pass zoom factor to constructor 
Introduce HelpViewer::setScale instead

Change-Id: I9d50483bc1fa4de89de53db40eda348379bd0ae9
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
 2014-12-19 10:40:50 +01:00
Thomas Hartmann
300f54260c Use always white as the background color in HelpViewer 
Our css styling assumes white as the background color.

Change-Id: Ieeddf1eba5bb29cadf0f4da7c8ee6b14c5d1387e
Task-number: QTCREATORBUG-13300
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-11-06 12:07:26 +01:00
Eike Ziller
7e72b47728 Help: Remove some unnecessary direct accesses to central widget 
Change-Id: I04046b792f5b5264534e2654db28fcb18638869b
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2014-10-30 12:44:19 +01:00
Eike Ziller
8ab18cff2e Text browser help viewer: Remove unnecessary state. 
Change-Id: Ie8ecc98a065a5f9d79be45a6921f7b2165c75ead
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2014-10-30 12:44:12 +01:00
Eike Ziller
ea27143239 Merge remote-tracking branch 'origin/3.2' 
Conflicts:
	src/libs/utils/ipaddresslineedit.cpp
	src/libs/utils/logging.h
	src/plugins/analyzerbase/AnalyzerBase.pluginspec.in
	src/plugins/android/Android.pluginspec.in
	src/plugins/android/androiddeploystep.cpp
	src/plugins/android/androiddeploystep.h
	src/plugins/android/androiddeploystepfactory.cpp
	src/plugins/android/androiddeploystepwidget.cpp
	src/plugins/android/androidpackagecreationfactory.cpp
	src/plugins/android/androidpackagecreationstep.cpp
	src/plugins/android/androidpackagecreationstep.h
	src/plugins/android/androidpackagecreationwidget.cpp
	src/plugins/android/androidpackagecreationwidget.h
	src/plugins/android/javafilewizard.cpp
	src/plugins/autotoolsprojectmanager/AutotoolsProjectManager.pluginspec.in
	src/plugins/baremetal/BareMetal.pluginspec.in
	src/plugins/bazaar/Bazaar.pluginspec.in
	src/plugins/beautifier/Beautifier.pluginspec.in
	src/plugins/bineditor/BinEditor.pluginspec.in
	src/plugins/bookmarks/Bookmarks.pluginspec.in
	src/plugins/clangcodemodel/ClangCodeModel.pluginspec.in
	src/plugins/clangcodemodel/clanghighlightingsupport.cpp
	src/plugins/clangcodemodel/clangsymbolsearcher.cpp
	src/plugins/classview/ClassView.pluginspec.in
	src/plugins/clearcase/ClearCase.pluginspec.in
	src/plugins/cmakeprojectmanager/CMakeProjectManager.pluginspec.in
	src/plugins/cmakeprojectmanager/cmakeeditorfactory.cpp
	src/plugins/cmakeprojectmanager/cmakehighlighter.cpp
	src/plugins/coreplugin/Core.pluginspec.in
	src/plugins/cpaster/CodePaster.pluginspec.in
	src/plugins/cppeditor/CppEditor.pluginspec.in
	src/plugins/cppeditor/cppfilewizard.cpp
	src/plugins/cpptools/CppTools.pluginspec.in
	src/plugins/cpptools/cpphighlightingsupportinternal.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.cpp
	src/plugins/cpptools/cppmodelmanagerinterface.h
	src/plugins/cvs/CVS.pluginspec.in
	src/plugins/debugger/Debugger.pluginspec.in
	src/plugins/designer/Designer.pluginspec.in
	src/plugins/diffeditor/DiffEditor.pluginspec.in
	src/plugins/emacskeys/EmacsKeys.pluginspec.in
	src/plugins/fakevim/FakeVim.pluginspec.in
	src/plugins/genericprojectmanager/GenericProjectManager.pluginspec.in
	src/plugins/git/Git.pluginspec.in
	src/plugins/git/gitorious/gitorious.cpp
	src/plugins/git/gitorious/gitorious.h
	src/plugins/git/gitorious/gitoriousclonewizard.cpp
	src/plugins/git/gitorious/gitorioushostwidget.cpp
	src/plugins/git/gitorious/gitorioushostwidget.h
	src/plugins/git/gitorious/gitorioushostwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.cpp
	src/plugins/git/gitorious/gitoriousprojectwidget.h
	src/plugins/git/gitorious/gitoriousprojectwizardpage.cpp
	src/plugins/git/gitorious/gitoriousprojectwizardpage.h
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.cpp
	src/plugins/git/gitorious/gitoriousrepositorywizardpage.h
	src/plugins/glsleditor/GLSLEditor.pluginspec.in
	src/plugins/glsleditor/glsleditorfactory.cpp
	src/plugins/glsleditor/glslfilewizard.cpp
	src/plugins/helloworld/HelloWorld.pluginspec.in
	src/plugins/help/Help.pluginspec.in
	src/plugins/imageviewer/ImageViewer.pluginspec.in
	src/plugins/ios/Ios.pluginspec.in
	src/plugins/macros/Macros.pluginspec.in
	src/plugins/mercurial/Mercurial.pluginspec.in
	src/plugins/perforce/Perforce.pluginspec.in
	src/plugins/projectexplorer/ProjectExplorer.pluginspec.in
	src/plugins/pythoneditor/PythonEditor.pluginspec.in
	src/plugins/pythoneditor/pythoneditorwidget.cpp
	src/plugins/pythoneditor/wizard/pythonfilewizard.cpp
	src/plugins/qbsprojectmanager/QbsProjectManager.pluginspec.in
	src/plugins/qbsprojectmanager/defaultpropertyprovider.cpp
	src/plugins/qmakeprojectmanager/QmakeProjectManager.pluginspec.in
	src/plugins/qmakeprojectmanager/profileeditorfactory.cpp
	src/plugins/qmldesigner/QmlDesigner.pluginspec.in
	src/plugins/qmljseditor/QmlJSEditor.pluginspec.in
	src/plugins/qmljseditor/qmljseditorfactory.cpp
	src/plugins/qmljstools/QmlJSTools.pluginspec.in
	src/plugins/qmlprofiler/QmlProfiler.pluginspec.in
	src/plugins/qmlprojectmanager/QmlProjectManager.pluginspec.in
	src/plugins/qnx/Qnx.pluginspec.in
	src/plugins/qtsupport/QtSupport.pluginspec.in
	src/plugins/remotelinux/RemoteLinux.pluginspec.in
	src/plugins/resourceeditor/ResourceEditor.pluginspec.in
	src/plugins/resourceeditor/resourcewizard.h
	src/plugins/subversion/Subversion.pluginspec.in
	src/plugins/tasklist/TaskList.pluginspec.in
	src/plugins/texteditor/TextEditor.pluginspec.in
	src/plugins/texteditor/basetexteditor_p.h
	src/plugins/texteditor/basetextmark.cpp
	src/plugins/texteditor/codeassist/basicproposalitemlistmodel.h
	src/plugins/texteditor/codeassist/defaultassistinterface.h
	src/plugins/texteditor/codeassist/iassistproposalitem.cpp
	src/plugins/texteditor/itexteditor.cpp
	src/plugins/texteditor/itexteditor.h
	src/plugins/texteditor/itextmark.cpp
	src/plugins/texteditor/plaintexteditor.cpp
	src/plugins/texteditor/plaintexteditor.h
	src/plugins/texteditor/texteditoractionhandler.cpp
	src/plugins/todo/Todo.pluginspec.in
	src/plugins/updateinfo/UpdateInfo.pluginspec.in
	src/plugins/valgrind/Valgrind.pluginspec.in
	src/plugins/vcsbase/VcsBase.pluginspec.in
	src/plugins/welcome/Welcome.pluginspec.in
	src/plugins/winrt/WinRt.pluginspec.in
	tests/auto/debugger/temporarydir.h

Change-Id: I254af8be8119fe9855287909e17d4b8ca9d2fc2f
 2014-10-14 15:36:16 +02:00
Eike Ziller
8295b503be License update 
Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
 2014-10-09 11:41:44 +02:00
Eike Ziller
37e06c8d53 HelpViewers: Fix context menu item title and corresponding symbol names 
It should be "Open Link as New Page", not "New Window".

Change-Id: Iccfd179370e912028f8d0d2562cfe51e6f7d6ccd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
 2014-09-24 16:55:28 +02:00
Eike Ziller
be68fe7f4a Help: Unify help content loading and error message. 
Task-number: QTCREATORBUG-12352
Change-Id: If74453e75cc8eaf27c114d0976099388be778fa6
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
 2014-06-18 12:09:12 +02:00
Eike Ziller
c5be32fae7 Help: Provide native WebView backend on Mac 
Run Qt Creator with environment variable QTC_HELPVIEWER_BACKEND to
* 'native' to get the WebView based one on Mac
* 'textbrowser' to get the QTextBrowser based one

Defaults to use QWebView if QtWebKit is available, or QTextBrowser if
not, like before.

Change-Id: If0660782b18ff3d89301fa7bcaf4e2e2fb69627d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-30 09:37:04 +02:00
Eike Ziller
1228ffcd6c Help: Implement history menus for text browser backend 
Change-Id: Idbdb3f9807c8282f8c9050ba28c1e28a7e3865e7
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-13 09:00:18 +02:00
Eike Ziller
96e8f0bb7b Help: Cleanly separate different viewer backends 
Removes the conditional compilation of the text browser vs web kit,
cleans up the code, and enables us to provide and test other backends
(WebEngine? Native?)
Adds runtime switch for testing the text browser variant by setting
environment variable QTC_FORCE_TEXTBROWSER (for now)

Change-Id: I8cc9bb373438d37c8194e433224314caa0b617bd
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
 2014-05-13 08:57:47 +02:00