aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/imageviewer
Commit message (Collapse)AuthorAgeFilesLines
...
| * ImageViewer: Replace own play/pause icons with those from coreAlessandro Portale2016-04-104-4/+2
| | | | | | | | | | Change-Id: If12eec9940bed026a65196801d064f59c228b4bc Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
| * Locator: Remove old "Locator" menu icon. Re-use the "search" icon.Alessandro Portale2016-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | This patch removes the locator.png icon and replaces it with a menu-friendly variation of the zoom icon. The current ZOOM icon becomes ZOOM_TOOLBAR. Change-Id: I8817c5c420801351db659caa4c4190a9074be720 Reviewed-by: hjk <hjk@theqtcompany.com>
| * Image Viewer: Fix capitalization for an actionLeena Miettinen2016-04-051-1/+1
| | | | | | | | | | | | | | | | Write prepositions in lower case also in action names, when they are not the first or last word in the name. Change-Id: I606b10ff9a08bb8542a03fc5a8a8f19dfd96277e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* | Wholesale conversion to #pragma oncehjk2016-03-306-24/+6
|/ | | | | | | Kudos to cgmb and https://github.com/cgmb/guardonce Change-Id: Ifa8970734b8d43fd08c9260c645bdb0228633791 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ImageViewer: Fix qbs build.Christian Kandeler2016-03-221-2/+2
| | | | | Change-Id: I7dd26214f33952a4116f52cd5bb525913e013b78 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
* ImageView: Remove hard dependency on QtSvg headershjk2016-03-211-3/+5
| | | | | Change-Id: I2c8aa3017a95b36b3d96687f2da03eb2ef558222 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* ImageViewer: Add option to export images from SVG.Friedemann Kleint2016-03-2110-2/+371
| | | | | | | | | | | Add a tool button showing a dialog with file name and size for exporting images from SVG. [ChangeLog][ImageViewer] Added option to export images from SVG. Change-Id: I84e04dc166e70b0359eba0f19703a75b882a2bc2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* ImageViewer: Remove class ImageViewerActionHandler.Friedemann Kleint2016-03-188-215/+80
| | | | | | | | Create the actions in ImageViewerPlugin and use lambdas instead of a QSignalMapper. Change-Id: Ic74622ca5e9daf6f0d367d00b709d732153dc62e Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Core: Make IDocument concreteOrgad Shaneh2016-03-172-22/+0
| | | | | Change-Id: I8290943614ea4a2060cf09a71fb4f957852ab705 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Update License according to agreement with Free Qt FoundationTobias Hunger2016-01-1914-234/+201
| | | | | | | * Update files in src/plugins Change-Id: Ia5d77fad7d19d4bb3498e78661982f68729adb22 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Add default implementation for IDocument::fallbackSaveAs(Path|FileName)Eike Ziller2016-01-192-13/+0
| | | | | | | | | The methods are only relevant for documents without a filePath, and there was a mix of different irrelevant implementations present in subclasses. Change-Id: I4f57d306e5ddd913974cfe6ed0b4db062eb907a1 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Remove setContents() from imageviewerUlf Hermann2016-01-182-7/+0
| | | | | | | It doesn't actually do anything. Change-Id: Ic89b778427c4dd663f7577f522688cde99da06f9 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* IDocument: Rename defaultPath and suggestedFileNameEike Ziller2016-01-142-4/+4
| | | | | | | | To fallbackSaveAsPath and fallbackSaveAsFileName. That makes it clearer what they are for, and that they actually belong to each other. Change-Id: Ie5b83b9db77d39a7fe9e979cc8f22b7f5b9101a3 Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Themed Icons: Introduce Utils::IconAlessandro Portale2015-11-251-7/+4
| | | | | | | | | | | | | | Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.6'Eike Ziller2015-10-261-1/+7
|\ | | | | | | Change-Id: Iddfa0d2f3c0fb8ba65c0e5d479ad8e2f2cb95685
| * Fix qbs build with Qt that does not have the SVG module.Christian Kandeler2015-10-141-1/+7
| | | | | | | | | | | | | | This now works the same way as with qmake. Change-Id: I8e6b7f32ffff19e6f4fe9d83ffe804984e33f298 Reviewed-by: Oliver Wolff <oliver.wolff@theqtcompany.com>
* | Icon refresh: First step towards the new Qt Creator themesAlessandro Portale2015-10-236-16/+7
|/ | | | | | | | | | http://blog.qt.io/blog/author/didesous/ announced new designs/themes for Qt Creator. This patch replaces many of the existing toolbar icons with recolorizable masks for better theming support. Change-Id: I557aa485205fe2624f33724226f698c303342b40 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* Port to new connect apiMontel Laurent2015-09-221-14/+14
| | | | | Change-Id: If9948ced45095546f37f9f397b65f922dc925b6a Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* ImageViewer: fix crashNikita Baryshnikov2015-06-241-3/+9
| | | | | | | | | | steps to reproduce: - open 'TestQtcCrash.jpg' - truncate -s 0 ./TestQtcCrash.jpg - write valid image back to 'TestQtcCrash.jpg' Change-Id: I76aed9379098c323f8434e0ab53b6561996fa281 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Add override to IDocument hierarchyEike Ziller2015-06-111-10/+11
| | | | | Change-Id: I6884f59fe0f06e380254c1f8076dd561d9df4ee3 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* Editor manager: Abort with a single message if file is not readable.Eike Ziller2015-06-102-11/+15
| | | | | | | | | | | | | | We show a dialog that offers opening a file in a different editor type if opening a file fails, but we should not do that if opening the file fails because it is not readable. With this change, documents now specify if they failed to open a file because reading failed, or because they could not handle the file contents. Task-number: QTCREATORBUG-14495 Change-Id: I5d4b7cfa74b87ef21b9b55bc30b3ebe2f8238dfa Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
* Move "open" from IEditor to IDocumentEike Ziller2015-06-104-10/+11
| | | | | | | | | | For non-editor documents it currently is not used, but for editors it makes more sense to have that on the document instead of the editor. Most actual implementations of "open" were done in the documents already anyhow, because it is needed for reloading. Change-Id: I29d4df2078995cbe80172b51a9bebeecb3afad3c Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Add override keyword to IEditor & TextEditorWidget implementationsEike Ziller2015-06-091-5/+5
| | | | | Change-Id: I403101d788d9edfea5c5c9440ab4f39ad00e81f7 Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
* ImageViewer: Support splittingEike Ziller2015-06-036-225/+339
| | | | | Change-Id: Id789bd4a77d14ff990f3c9092a9ba533ac4fab7a Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
* Merge remote-tracking branch 'origin/3.4'Eike Ziller2015-03-194-22/+20
|\
| * ImageViewer: Add up-to-date mimetypes (and add webp mimetype)Alessandro Portale2015-03-184-22/+20
| | | | | | | | | | | | | | | | | | | | | | The list of mimetypes was missing new types like tga, dds and webp. Just ask QImageReader::supportedMimeTypes() for the supported types, which is also easier to maintain. Task-number: QTBUG-45061 Change-Id: I80573da868088915b8d746c56374786e5e36903c Reviewed-by: hjk <hjk@theqtcompany.com> Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* | Remove aggregation dependency from project filesNikita Baryshnikov2015-03-092-2/+0
|/ | | | | Change-Id: Idfd3941f47b71d6b84306d88604b744e3585e4af Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Clean exported headers of the Core plugin.Friedemann Kleint2015-03-052-0/+3
| | | | | Change-Id: I26472d568844d5fee62323e01f5c5c12082d5450 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
* Use new mime databaseEike Ziller2015-02-173-75/+1
| | | | | Change-Id: I4305872b6b11ef3e8a364280ffa5209a5a793600 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* Merge commit '3c85058694ee2e41658d17f524fb48f0b187d2fe'Eike Ziller2015-02-1214-89/+89
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Update LicenseEike Ziller2015-01-1614-89/+89
| | | | | | | | | | Change-Id: I711d5fb475ef814a1dc9d2822740e827f3f67125 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Use new qt5 connect apiMontel Laurent2015-01-292-3/+3
| | | | | | | | | | Change-Id: I6c0d4ec60759b3c2fedac3e6649b7ec5102a6487 Reviewed-by: hjk <hjk@theqtcompany.com>
* | Core: Use FileName for file path in IDocumentOrgad Shaneh2015-01-122-2/+2
|/ | | | | Change-Id: I85f7398aee59d0d36f0e5c3bf88ff3c96002e394 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
* qbs build: Remove unneeded import statements.Christian Kandeler2014-11-101-2/+0
| | | | | | | The respective items are available without it. Change-Id: Idc840cf08e7bec84f561c096afe8de25b1fb8468 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* License update.Eike Ziller2014-10-151-1/+1
| | | | | Change-Id: I0acde2c3b995693de682679471f03af85bdd0a61 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* Merge remote-tracking branch 'origin/3.2'Eike Ziller2014-10-1411-77/+88
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * License updateEike Ziller2014-10-0912-79/+90
| | | | | | | | | | Change-Id: I3c22ef2685d7aa589f5d0ab74d693653a4c32082 Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
* | Remove Qt version checks.Christian Kandeler2014-09-081-6/+2
| | | | | | | | | | | | | | | | Qt 5.3 is the minimum requirement these days. Remove all fallback code from sources and project files. Change-Id: If6188a471197acadda4d6baee71804ba1a8026c6 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* | ExtensionSystem: Use Qt 5 plugin metadata instead of .pluginspec filesEike Ziller2014-09-022-17/+19
| | | | | | | | | | | | | | | | Change-Id: I2b2c704260c613985a4bda179658ec1f8879e70f Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Daniel Teske <daniel.teske@digia.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* | ExtensionSystem: Remove Qt4 supportEike Ziller2014-08-271-2/+0
| | | | | | | | | | | | | | | | Remove usage of the Q_EXPORT_PLUGIN macros, which do not exist in Qt 5. Change-Id: I678c3cf10b9c5d5c1b9f252b0ecd1c97dc810a47 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com>
* | ImageViewer: No interpolation when zooming inAlessandro Portale2014-08-011-1/+5
|/ | | | | | | | | | | | | The imageViewer currently always renders the images smooth/interpolated. When loading an image in an IDE and zooming in, I usually do that in order to examine the details on pixel level. Therefore, I believe that smoothing/interpolation should be turned off with a scalefactor >= 1. This patch does that for images and movies. Svg files remain always smooth. Change-Id: I327583b1f46132d179a1e0425f146106d962377b Reviewed-by: Daniel Teske <daniel.teske@digia.com>
* Always pass Core::Id by value.Christian Kandeler2014-07-012-2/+2
| | | | | | | | | | | Currently we pass in some places by value, elsewhere by const ref and for some weird reason also by const value in a lot of places. The latter is particularly annoying, as it is also used in interfaces and therefore forces all implementors to do the same, since leaving the "const" off is causing compiler warnings with MSVC. Change-Id: I65b87dc3cce0986b8a55ff6119cb752361027803 Reviewed-by: hjk <hjk121@nokiamail.com>
* IDocument: Make mimeType a value memberhjk2014-07-012-15/+1
| | | | | Change-Id: I2e90ccf0a45ae8d00bcd00ec77fe0d9776f2f119 Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ImageViewerPlugin: Remove useless codeDaniel Teske2014-05-081-3/+0
| | | | | Change-Id: I4e475df102638d5c8895b14b8bdecfacd94a565b Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Merge remote-tracking branch 'origin/3.1'Oswald Buddenhagen2014-03-181-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: qbs/imports/QtcTool.qbs src/plugins/git/giteditor.cpp src/plugins/qmldesigner/qmldesignerplugin.cpp Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
| * use new base import style in qbs filesJoerg Bornemann2014-03-111-1/+1
| | | | | | | | | | | | Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Editors: Move id() from editor to document.Eike Ziller2014-03-052-2/+2
|/ | | | | | Change-Id: Ib81076842ab1c16832224790194b001206404d64 Reviewed-by: hjk <hjk121@nokiamail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* ImageViewer: De-pimpl two internal classeshjk2014-02-255-46/+19
| | | | | Change-Id: I3302463157f757fbb5190f25052fad1506d10612 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
* Core: Make IEditor::id a value member and adjust usershjk2014-02-252-6/+2
| | | | | | Change-Id: I47e457c4a1821c515cd8a740d27bfe005a0c09e6 Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
* Qbs/qmake: Fix dependencies of pluginsTobias Hunger2014-02-112-0/+5
| | | | | | | | | ... based on output from dependencyinfo.py script Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com> Reviewed-by: Christian Stenger <christian.stenger@digia.com> Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>