summaryrefslogtreecommitdiff
path: root/src/plugins/help
Commit message (Collapse)AuthorAgeFilesLines
* Fix wrong names in the UIMarco Bubke2012-04-182-2/+2
| | | | | Change-Id: I6635b3a91eed4d34bb477aaeac37709e15059e06 Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
* qbs files: build with Qt5Joerg Bornemann2012-04-101-0/+2
| | | | | | | Help plugin and QmlDesigner have been disabled for Qt5. Change-Id: I9345d0fd00f9a575333dc972cc7adbdf146cd6cb Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* qbs files: use Qt5 module dependenciesJoerg Bornemann2012-04-101-1/+1
| | | | | | | | | | Renamed gui -> widgets. Renamed declarative -> quick1. With qbs the usage of qt.widgets and qt.quick1 with Qt4 is supported. Change-Id: I6cadaf34527f1f880d74ced7d2d18dd9801b7de1 Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
* Help: Decouple BookmarksWidget from OpenPageManager.Friedemann Kleint2012-04-031-0/+2
| | | | | | | | | | Connect via signal to make it possible to build the shared help code as a static library. Change-Id: If4e9c8ee43eb32e08167c7642f52214643de6d5c Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com> Reviewed-by: Marco Bubke <marco.bubke@nokia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-291-2/+1
|\ | | | | | | | | | | | | | | | | Conflicts: src/libs/symbianutils/symbianutils.qbs src/libs/utils/utils.qbs src/libs/zeroconf/zeroconf.qbs Change-Id: I4c888d8e58ec68dc4638b041b0c6ee743b809ab4
| * Help: Do not get stuck with spinning cursorTobias Hunger2012-03-281-2/+1
| | | | | | | | | | | | | | | | Do not get stuck with the busy cursor spinning on windows whenever a page is not found. Change-Id: I4596b6ec0d3de4005bc60422e4fe19142600e336 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-211-2/+27
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljsdebugclient/qmlprofilereventlist.cpp src/libs/zeroconf/servicebrowser.cpp src/plugins/qmlprofiler/qml/MainView.qml src/plugins/qmlprofiler/qmlprofilerengine.cpp src/plugins/qmlprofiler/qmlprofilertool.cpp src/plugins/qmlprofiler/qmlprofilertraceview.h src/plugins/qmlprofiler/tracewindow.cpp Change-Id: Ib5e7579efffe74f2bf6871690d1e398e1062f986
| * Fix 38fe616d857234845b9169576433c28aa54fee89kh12012-03-161-1/+1
| | | | | | | | | | | | | | | | Obviously it helps to add the search term even if it does not contain special characters. Change-Id: If32e3e0b8b64fde99a3247dd6eee29928995591f Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * Curly-braces in "Help -> Search for..." crashes Creator.kh12012-03-161-2/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTCREATORBUG-6212 We need to escape special characters that are used inside the search engine as field delimiter. As soon as the search engine proccesses the search string it will remove the character and we might end up with an invalid string, forcing it to throw an exception thats not catched. Change-Id: I8b66c87c3137a1f175ead5df85c7f53fdcb5193e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge remote-tracking branch 'origin/2.5'Eike Ziller2012-03-082-5/+5
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/remotelinux/startgdbserverdialog.cpp Change-Id: I69597e20d5372e9baf12ac09fc20d39406683f9e
| * Normalized connect()sRobert Loehning2012-03-062-5/+5
| | | | | | | | | | | | Change-Id: Id353ab140a46e06ffc3abf667ab3b234e749e17c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Port Qt Creator to the new plugin system of Qt 5.Friedemann Kleint2012-03-021-0/+1
|/ | | | | | | | | | - Add Q_PLUGIN_METADATA for Qt 5, use Q_EXPORT_PLUGIN for Qt 4. - Generate the Json files for Qt 5 from the pluginspec files by using a XSLT sheet. Change-Id: I8653f182ae7d61615971c093df10b84fb06c2172 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* qbs: CleanupOrgad Shaneh2012-02-281-4/+1
| | | | | | | | | * Removed utils, extensionsystem and aggregation dependencies for plugins that depend on Core * Capitalized Find and CPlusPlus Change-Id: I505e5f46976f26da47ad778860f103b173668b1c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* add qbs filesJoerg Bornemann2012-02-201-0/+89
| | | | | Change-Id: If6bf71797ae81655d24a77e6badb86a77312af38 Reviewed-by: hjk <qthjk@ovi.com>
* More consistency for close & close split.Eike Ziller2012-02-201-2/+2
| | | | | Change-Id: I3d0869d5fc2542ff59434e0d42dae0ce6c7a2391 Reviewed-by: Virva Auvinen <virva.auvinen@nokia.com>
* Removed module names from #include directives.Erik Verbruggen2012-02-1536-147/+147
| | | | | | | | Getting the #include directives ready for Qt5. This includes the new-project wizards. Change-Id: Ia9261f1e8faec06b9285b694d2b7e9a095978d2b Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Extend the CSS workaround in the helpviewerDaniel Molkentin2012-01-311-2/+6
| | | | | | | | The documentation now uses /doc instead of /qdoc. Change-Id: If01ee02d236cb343f78e0c185a3e05620dac24ae Reviewed-by: Michael Bruning <michael.bruning@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Core::ModeManager: make some functions statichjk2012-01-272-9/+8
| | | | | | Change-Id: I5c1275ba3f596d8911fd2e4404181bf57b58f494 Reviewed-by: Daniel Teske <daniel.teske@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* bugreports.qt.nokia.com -> bugreports.qt-project.orgDaniel Molkentin2012-01-261-1/+1
| | | | | Change-Id: Ifc258886f7d6e7d5b02caae8994210aeef221554 Reviewed-by: Robert Löhning <robert.loehning@nokia.com>
* Long live the king!hjk2012-01-2641-41/+41
| | | | | Change-Id: I2b72b34c0cfeafc8bdbaf49b83ff723544f2b6e2 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Replace Q_WS_MAC with Q_OS_MAC.Morten Johan Sorvig2012-01-264-6/+6
| | | | | | | | | | | | | | | We want to carry over all mac-specific code paths to Qt 5. WS_MAC is no longer set; OS_MAC is. This change is compatible with Qt 4 builds since OS_MAC is set whenever WS_MAC is. (OS_MAC would also be set for the theoretical X11/Mac platform, but that's anyway not a supported configuration for Creator) Change-Id: Ib25d8c4e83e7e27d911124cd48aa17fdb875923f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* Use new static ICore interface.hjk2012-01-246-23/+19
| | | | | Change-Id: I9b690d9b150c8d162b15370f9f8986267c9128f1 Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
* Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-12-131-0/+1
|\
| * Fix loading files from within documentation.Eike Ziller2011-12-091-0/+1
| | | | | | | | | | | | | | Task-number: QTSDK-1129 Change-Id: Ief29c41ad4074d74c97b4e8aa9c69a6e4a0d9d67 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* | Whole-words searching doesn't work with QtWebKit.Eike Ziller2011-11-291-4/+2
| | | | | | | | | | | | | | | | So we turn it off. Task-number: QTCREATORBUG-4706 Change-Id: Ib51740428db35a1697dd5bca0f8f58b7ffd5fb1a Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* | Add Qt 5 libraries to .pro files.Friedemann Kleint2011-11-241-0/+5
| | | | | | | | | | | | | | | | Make Qt Creator compile with Qt 5 after using fixqt4headers.pl. Change-Id: I74ca51d562f49378b40103b79848f5dd3b11e77e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | UI files: Do not polute the global Ui namespaceTobias Hunger2011-11-243-8/+8
| | | | | | | | | | | | | | Make sure all ui-files are in the plugin's internal namespace. Change-Id: Ifb2c3093441e8feb89e46f52fbb386fc316cfd13 Reviewed-by: hjk <qthjk@ovi.com>
* | Merge remote-tracking branch 'origin/2.4'Eike Ziller2011-11-1141-82/+82
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: src/libs/qmljs/qmljsinterpreter.cpp src/libs/qmljs/qmljsinterpreter.h src/plugins/debugger/qml/scriptconsole.cpp src/plugins/git/gitplugin.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas.cpp src/plugins/qmlprofiler/canvas/qdeclarativetiledcanvas_p.h Change-Id: Iad59c8d87c72a21c79c047e374c0ab689998af39
| * Fix qreal is not double.Felix Geyer2011-11-091-1/+1
| | | | | | | | | | | | Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2 Reviewed-by: hjk <qthjk@ovi.com> (cherry picked from commit 3b0f26e23136e60b61203c26075349f1e541f654)
| * all: s/info@qt.nokia.com/qt-info@nokia.com/hjk2011-11-0341-82/+82
| | | | | | | | | | Change-Id: If18afb5d4665924e7d9250dccbc60a65e6daa75e Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Implement context help for pro file editorJarek Kobus2011-11-101-0/+6
| | | | | | | | | | | | Task-number: QTCREATORBUG-6325 Change-Id: Ie8b2eb582eb527eac6af56d0c69a8ae1dafdc1df Reviewed-by: Leandro Melo <leandro.melo@nokia.com>
* | Small include header fixesHarald Fernengel2011-11-092-1/+2
| | | | | | | | | | | | | | | | | | QtXmlStream classes live in QtCore, not QtXml. Also add a few headers that are not implicitly included in Qt 5 any more. This greatly eases transition to Qt 5 which not having any side effects on the Qt 4 build. Change-Id: I1293ef4360015b885dcea8c4099e8e5b9e254c91 Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
* | Fix qreal is not double.Felix Geyer2011-11-091-1/+1
| | | | | | | | | | Change-Id: Ife56e908a67da70ebe5af223b19fc8b99fc3a1d2 Reviewed-by: hjk <qthjk@ovi.com>
* | more style fixes of string literal accesshjk2011-11-022-15/+15
|/ | | | | Change-Id: I60b0c53681c6a0cc38231e805479deb614aa0096 Reviewed-by: hjk <qthjk@ovi.com>
* Fixed dead initializationRobert Loehning2011-10-201-2/+2
| | | | | Change-Id: I839a8478cd57e872fb5a145f095b3b57f25fdf11 Reviewed-by: Karsten Heimrich <karsten.heimrich@nokia.com>
* help: Add '...' to indicate there will be another dialoghjk2011-10-181-1/+1
| | | | | | | Change-Id: Ic884acf20f1d1a48f5306b380338fd0a99d63fa8 Reviewed-by: hjk <qthjk@ovi.com> (cherry picked from commit 6ae50657041efc7c13910b495f25a01043d849bb) Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* s/error_message/errorMessage/ghjk2011-09-211-1/+1
| | | | | | Change-Id: I9a91028fb7c00a20843d99ece659ec8b7acc7710 Reviewed-on: http://codereview.qt-project.org/5312 Reviewed-by: hjk <qthjk@ovi.com>
* minor stylehjk2011-09-191-5/+5
| | | | | | Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7 Reviewed-on: http://codereview.qt-project.org/5122 Reviewed-by: hjk <qthjk@ovi.com>
* Sort help registrations.Bill King2011-09-121-0/+3
| | | | | | | | | Looks cleaner, also helps cleanup. Change-Id: If3182f974ca3401cd44fb062d695685e5029aa81 Reviewed-on: http://codereview.qt-project.org/4473 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* core: rename uniqueidmanager.{cpp,h} as the class UniqueIdManager is gonehjk2011-09-051-1/+1
| | | | | | | Change-Id: Iffe04bc3bb0103cbac605f0734bbfd66eb7fd854 Reviewed-on: http://codereview.qt.nokia.com/4215 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: hjk <qthjk@ovi.com>
* core: progress on the QString->QByteArray for Core::Id, remove UniqueIDManagerhjk2011-09-051-1/+1
| | | | | | Change-Id: I94bec127866822b790a6e45a4201a7a5fe71d6ce Reviewed-on: http://codereview.qt.nokia.com/4208 Reviewed-by: hjk <qthjk@ovi.com>
* core: remove usages of Core::ICore::instance()->modeManager()hjk2011-09-051-20/+18
| | | | | | | | The function is still there but should be remove in my opinion. Change-Id: I739fe942e74f459faccb80b5bcb8a5721c6bb9bf Reviewed-on: http://codereview.qt.nokia.com/4200 Reviewed-by: hjk <qthjk@ovi.com>
* Merge app_version.h and ide_version.hEike Ziller2011-08-312-14/+14
| | | | | | | Change-Id: I703d4704a3bdf88bd567c92512ee27db6aea043c Reviewed-on: http://codereview.qt.nokia.com/3918 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>
* Merge remote-tracking branch 'origin/2.3'Eike Ziller2011-08-101-2/+1
|\ | | | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/libs/libs.pro src/plugins/debugger/watchwindow.cpp src/plugins/remotelinux/maemopackagecreationstep.h Change-Id: Ic67c46256d0060ee9845b92ef82539f6f8fbe639
| * Remove superflous connect statement.Daniel Molkentin2011-08-011-1/+0
| | | | | | | | | | | | | | Change-Id: I964e3765c4b499e291539d9031d66c8f35642abe Reviewed-on: http://codereview.qt.nokia.com/2437 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
| * tr()-Fix: 'Report bug' needs '...'Friedemann Kleint2011-08-011-1/+1
| | | | | | | | | | | | | | | | Acked-by: Eike Ziller <eike.ziller@nokia.com> Change-Id: I892df68c1e9eb5f45275c1a441903279ca1ce665 Reviewed-on: http://codereview.qt.nokia.com/2427 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* | Changed links to bugtracker to httpsRobert Loehning2011-08-101-1/+1
| | | | | | | | | | | | | | Change-Id: I62aa9a4033399ee7fc0b55952613657f124c8fb9 Reviewed-on: http://codereview.qt.nokia.com/2791 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge branch '2.3'Oswald Buddenhagen2011-07-292-0/+11
|\ \ | |/ | | | | | | | | | | Conflicts: src/plugins/debugger/qml/qmlengine.cpp Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4
| * Add Help Menu Entry that points to the bug tracker.Daniel Molkentin2011-07-282-0/+11
| | | | | | | | | | | | | | | | | | Task-Number: QTCREATORBUG-5098 Change-Id: Ibed9e8eea98cb716f2eff29582a39e133c7d8607 Reviewed-on: http://codereview.qt.nokia.com/2221 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
* | Merge branch '2.3'Oswald Buddenhagen2011-07-251-4/+4
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: qtcreator.pri src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp src/plugins/remotelinux/maemodeploystepfactory.cpp src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp Change-Id: I195163713145e72df20aec4ac9058f0c9158083e
View Lorry Controller Status