summaryrefslogtreecommitdiffstats
path: root/src/pixeltool
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-2/+2
|\ | | | | | | Change-Id: I550cd94029cb515a487ccbf700dfc083101ed945
| * Fix whitespace and indentation of the tools' .plist filesFriedemann Kleint2017-01-251-2/+2
| | | | | | | | | | | | | | | | Expand tabs and indent by 4. Change-Id: I2e5766625bdb37462250a4207119e499a78c3202 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | Pixeltool: Add "About Pixeltool" displaying copyright and screen infoFriedemann Kleint2017-02-172-0/+46
| | | | | | | | | | Change-Id: Iea12f257eba1083a31493fff4b88e058af8969f9 Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2017-01-251-5/+5
|\| | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ide38734b7f27b855ed8fecb810e5cdc7d518110e
| * Update the tools' .plist filesFriedemann Kleint2017-01-251-5/+5
| | | | | | | | | | | | | | | | Change company name and domain, remove obsolete tags and bump the DTD/plist version. Change-Id: I3dd9e539f18e366049309a4ba204dd19e4a05a4d Reviewed-by: Jake Petroules <jake.petroules@qt.io>
* | foreach cleanup in the the smaller toolsFriedemann Kleint2016-12-221-1/+2
|/ | | | | | | | | Replace foreach by C++ 11 range based for in kmap2qmap, makeqpf, pixeltool, qdbus, qtattributionsscanner, qtdiag, qtplugininfo, winrtrunner and the simpletextviewer example. Change-Id: I079da84c47a1584526f4fe188377c0262419a44d Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
* Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-6/+21
|\ | | | | | | Change-Id: Ia29a9aa855aa3bfab1a26fc3671b6c5436c176c1
| * pixeltool: Check whether initial geometry is applicableFriedemann Kleint2016-11-081-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | When changing primary screens of multi-monitor-setups on Windows, out-of-screen positions might be saved which make it impossible to bring the tool back and also cause crashes when no screen is found for grabbbing. Check the saved position when reading the settings and check if a screen can be obtained for grabbing. Change-Id: I69ec677e144306290a4ee7a3e84f87dd600ff086 Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
* | Updated license headers and license testsAntti Kokko2016-06-103-51/+36
|/ | | | | | | | | | | | | From Qt 5.7 -> tools & applications are licensed under GPL v3 with some exceptions, see http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/ Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one (in those files which will be under GPL 3 with exceptions) License header tests also updated to match current headers. Change-Id: Ia6bdacaa3c5bbc9d31334e1a0cabfe502a484dc4 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Polish PixelTool.Friedemann Kleint2016-01-274-125/+169
| | | | | | | | | | | - Use Qt 5 connection syntax, streamline context menu code accordingly. - Streamline code, use constructor initialization, Q_DECL_OVERRIDE. - Introduce QCommandLineParser, add an option to turn off scaling. - Fix image file dialog. - Fix the cursor position display to always display native pixels. Change-Id: I534eed2144acf6c6c868af725ac6e01ab93bdd88 Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>
* pixeltool: Stop depending on QtNetwork.Raphael Kubo da Costa2016-01-191-1/+1
| | | | | | | | There is nothing in the code using the QtNetwork module, so stop requiring it in the build system. Change-Id: I1f7bc89a9589dc2510f38a11fc4b4aeb69d662bc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Update copyright headersAntti Kokko2015-02-143-21/+21
| | | | | | | | | | Qt copyrights are now in The Qt Company, so we could update the source code headers accordingly. In the same go we should also fix the links to point to qt.io. Change-Id: I7f14f408e04c5c4f73a913fae153adcffbebe38f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
* Update license headers and add new license filesAntti Kokko2014-09-253-57/+33
| | | | | | | | | - Renamed LICENSE.LGPL to LICENSE.LGPLv21 - Added LICENSE.LGPLv3 - Removed LICENSE.GPL Change-Id: I23ef9591f4d9054e0b6a252ba7767baf4189aeab Reviewed-by: Jani Heikkinen <jani.heikkinen@digia.com>
* Update Info.plist files for new Cocoa main() call patternGabriel de Dietrich2013-07-111-0/+2
| | | | | | | | | | | | We would get the following error message otherwise, 'No Info.plist file in application bundle or no NSPrincipalClass in the Info.plist file, exiting.' Needed by I790e5138c29aac2e0215a9147d0148fece40ca22. Change-Id: I8d2301c41e4957195be8ed5da9a55ab5b02c4608 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
* make use of qt_app.prfOswald Buddenhagen2013-05-031-5/+1
| | | | | Change-Id: Ibcc1430831082562a4d67030a0831e7839a38ba6 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-01-174-4/+3
|\ | | | | | | | | | | | | Conflicts: sync.profile Change-Id: I9871b004cc76d14d34f4a904cd7a8e4f8e2bb91a
| * Update copyright year in Digia's license headersSergio Ahumada2013-01-103-3/+3
| | | | | | | | | | | | | | Change-Id: I9b11dc8309c9739955e3acea12b564d6ad608f59 Reviewed-by: Akseli Salovaara <akseli.salovaara@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
| * remove some unnecessary CONFIG additionsOswald Buddenhagen2012-12-161-1/+0
| | | | | | | | | | | | | | | | qt is already added by spec_pre.prf, warn_on and depend_includepath by default_pre.prf. Change-Id: I0f6429ef61b73b9d57b9f1fc08b789d39e5b99c0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Replace deprecated QPixmap::grabWindow() by QScreen::grabWindow().Friedemann Kleint2012-12-061-1/+3
| | | | | | | | | | Change-Id: I9ca2576c5553d37cf25fcfd2934ade0d1bcb7fb0 Reviewed-by: hjk <qthjk@ovi.com>
* | pixeltool: Display cursor position in title bar for measurements.Friedemann Kleint2012-12-061-0/+5
|/ | | | | Change-Id: Ibc6d92dc9fb52989ea4d82e971cfc215d3f49f33 Reviewed-by: hjk <qthjk@ovi.com>
* Use "QtProject" as organization name in various tools.Friedemann Kleint2012-10-161-2/+2
| | | | | Change-Id: I00f896d36cba4024562703d5b808bea35a0d4008 Reviewed-by: hjk <qthjk@ovi.com>
* Build tools in release mode if using -debug-and-release optionYuchen Deng2012-09-261-5/+1
| | | | | | Change-Id: I2d0f60e2fcba66460f5488c6f66432b76a06f05a Reviewed-by: Yuchen Deng <loaden@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-253-72/+72
| | | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If89e41b25a242ff376eacdf8790957bcf499cc66 Reviewed-by: Janne Anttila <janne.anttila@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Compile fix if QT_NO_CLIPBOARD definedAndreas Holzammer2012-04-192-0/+12
| | | | | Change-Id: I3a4126c370b09c56c2e869254962035ae36c7c75 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* clean up qmake-generated projectsOswald Buddenhagen2012-02-211-6/+0
| | | | | | | remove "header" and assignmets which are defaults or bogus Change-Id: I300d4be1928e5a7dab0fdf1c5a56992e9960b1a4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* Remove "All rights reserved" line from license headers.Jason McDonald2012-01-303-3/+3
| | | | | | | | | | | As in the past, to avoid rewriting various autotests that contain line-number information, an extra blank line has been inserted at the end of the license text to ensure that this commit does not change the total number of lines in the license header. Change-Id: Ib4b7580dda53886247ad6eb10d17d8e67c51980d Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update obsolete contact address.Jason McDonald2012-01-233-3/+3
| | | | | | | | Replace Nokia contact email address with Qt Project website. Change-Id: I3841a7c154b90b73fe8f498fda035c8b3545c692 Sanity-Review: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Update copyright year in license headers.Jason McDonald2012-01-063-3/+3
| | | | | | Change-Id: I89fb3609f49f9a4f1e7d658b05e212febcb14c94 Sanity-Review: Jason McDonald <jason.mcdonald@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
* Merge remote-tracking branch 'origin/refactor' into masterLars Knoll2011-09-131-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/assistant/help/help.pro src/designer/src/components/formeditor/formwindow.cpp src/designer/src/components/formeditor/formwindow_dnditem.cpp src/designer/src/components/formeditor/layout_propertysheet.cpp src/designer/src/components/formeditor/qdesigner_resource.cpp src/designer/src/components/lib/lib.pro src/designer/src/components/signalsloteditor/signalsloteditor.cpp src/designer/src/components/signalsloteditor/signalsloteditor_tool.cpp src/designer/src/components/widgetbox/widgetbox_dnditem.cpp src/designer/src/components/widgetbox/widgetboxtreewidget.cpp src/designer/src/lib/lib.pro src/designer/src/lib/shared/qdesigner_formbuilder.cpp src/designer/src/lib/shared/qdesigner_propertysheet.cpp src/designer/src/lib/shared/shared.pri src/designer/src/plugins/qdeclarativeview/qdeclarativeview.pro src/linguist/lupdate/qdeclarative.cpp src/linguist/shared/profileevaluator.cpp src/linguist/shared/qph.cpp src/linguist/shared/ts.cpp src/qtconfig/mainwindow.cpp src/shared/qtgradienteditor/qtcolorline.cpp src/shared/qtgradienteditor/qtgradientwidget.cpp sync.profile Change-Id: I53f0ce4efae4179257cbf3aab87e1af12c3aa4ff
| * QtTools: Widget library split.Friedemann Kleint2011-05-241-1/+1
| |
* | Update licenseheader text in source files for qttools Qt moduleJyri Tahtela2011-05-243-51/+51
|/ | | | | | | Updated version of LGPL and FDL licenseheaders. Apply release phase licenseheaders for all source files. Reviewed-by: Trust Me
* Fixed all qttools references to the bin directory.axis2011-04-271-1/+1
|
* Initial import from the monolithic Qt.Qt by Nokia2011-04-275-0/+762
This is the beginning of revision history for this module. If you want to look at revision history older than this, please refer to the Qt Git wiki for how to use Git history grafting. At the time of writing, this wiki is located here: http://qt.gitorious.org/qt/pages/GitIntroductionWithQt If you have already performed the grafting and you don't see any history beyond this commit, try running "git log" with the "--follow" argument. Branched from the monolithic repo, Qt master branch, at commit 896db169ea224deb96c59ce8af800d019de63f12
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 07:27:52 +0000