summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Use SPDX license identifiersHEADmasterRalf Habacker2022-10-24289-11224/+594
| | | | | | | Task-number: QTSOLBUG-205 Change-Id: I3374031a1c4ce0b806d4b3c8599fbba20099dfe3 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* QtSingleApplication: Fix build with Qt 6Benjamin Terrier2022-03-171-1/+2
| | | | | | | Replace QRegExp by QRegularExpression Change-Id: I52e997452ad7d2d14de59ad8fae597de9aec262b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtPropertyBrowser: Fix an issue when setting "flagNames"Thorbjørn Lindeijer2022-01-101-2/+2
| | | | | | | | | | | | | | | Setting the "flagNames" attribute causes the QtFlagPropertyManager to re-create its child properties. This causes the QtVariantPropertyManager to re-create its wrapping QtVariantProperty instances. When this happens with a property that is already added to a property browser, the value icon and text were requested before the QtVariantPropertyManager had set up the mapping between the wrapping QtVariantProperty instance and the internal property. This caused the returned icon and text for the child flag properties to be empty. Change-Id: If2166136b4ae3931c229c215f90f8582da81d2c3 Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
* qtwinmigrate: Fix geometry offsetFriedemann Kleint2018-07-161-1/+3
| | | | | | | | | | | | | Set the property "_q_embedded_native_parent_handle" on the widget before calling winId() so that it takes effect during native window creation. The bug was unveiled by qtbase/3035400f36731c400adb9204b94e9afe346a71b7. Task-number: QTSOLBUG-196 Change-Id: I5dac836b2845de9833da46bfb72d07aafdf4896a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* Fix use after freeJesus Fernandez2017-10-241-2/+2
| | | | | | | | | | | | | This could cause an immediate crash or incorrect values might be read subsequently resulting in incorrect computations. In QtFlagPropertyManager::uninitializeProperty(QtProperty *): A pointer to freed memory is dereferenced, used as a function argument, or otherwise used (CWE-416) Coverity-Id: 22622 Change-Id: I24fc9d6f7c1c516ddcadaaba2ba7cdaed7c7f807 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtSingleApplication: compiler warning about enum comparisonPhilippe Steinmann2017-09-141-1/+1
| | | | | | | | Compiler outputs a warning because of comparison between QLocalSocket::LocalSocketState and QAbstractSocket::SocketState. Change-Id: Idbae5c3c32a32324e07972e0bb0808fc40ef7624 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtSingleApplication: Bail out of read loop when peer disconnectsFriedemann Kleint2017-05-101-1/+10
| | | | | | | | | | | | | When messages are received while the event loop is inactive (for example, when locked by a native dialog), it can happen that a new connection is triggered which then goes into unconnected state when the peer terminates. Add a check to the loop and discard the connection in that case. Task-number: QTSOLBUG-193 Change-Id: I7d5502cb411d2b967bd06fe8734b97fee54b7d18 Reviewed-by: Joni Poikelin <joni.poikelin@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* qtwinmigrate: Fix build against Qt 5.8Friedemann Kleint2017-02-161-1/+1
| | | | | | | qWinAppInst() has been removed from QtCore. Change-Id: Iefd249c8e454c3141e2f7e0346b830b5efe41e0a Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* QtService: Added missing -p(ause) and -r(esume) to help textMorten Kristensen2016-11-021-4/+3
| | | | | | | | Added missing -p(ause) and -r(esume) to help text. And updated the short usage line to be: -[i|u|e|t|p|r|c|v|h] Change-Id: If209ad2d783e04b3a74b4ee92b795aeeb8557d7b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* QtSingleApplication: Fix build with Qt 5.5Jan Kundrát2015-06-291-0/+1
| | | | | | | | | ...due to the QDataStream include cleanup. Change-Id: I159b28a82abc9956802967d96b5b12f5fd46e961 Reviewed-by: Heiko Becker <heirecka@exherbo.org> Reviewed-by: Davide Pesavento <davidepesa@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* build: use qt5LibraryTarget() with Qt >= 5.4.2Davide Pesavento2015-06-292-2/+18
| | | | | | | | | | | qtbase commit 67289d0dfa64bf805c7ff2e455611affaea28558 restored qtLibraryTarget() to its original behavior, and introduced a new function qt5LibraryTarget() with the new behavior. Therefore we have to use the new function if available, so that Qt4 and Qt5 libraries can be installed side-by-side. Change-Id: Iff644bdc48984eb48c6fac2025c203502dfb2f79 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Qt Service solution: add missing QtService headerVincas Dargis2015-05-221-0/+1
| | | | | | | Task-number: QTSOLBUG-78 Change-Id: I5739bda6f9c1e10332dc047239e15047fdaae4fa Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Qt Service solution: Use qintptr in ↵Vincas Dargis2015-05-081-0/+8
| | | | | | | | QtServiceSysPrivate::incomingConnection() for Qt 5. Task-number: QTSOLBUG-180 Change-Id: I05f960ab342eb114c07e19af0d3b31507d17068f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Emit readOnlyChanged() and not echoChanged() in setReadOnly() of ↵Philip Allgaier2015-02-191-1/+1
| | | | | | | | QtStringPropertyManager. Change-Id: Id2cef6bc826066153572b9c8265eeb5315add158 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Philip Allgaier <mail@spacegaier.de>
* Qt Service/Windows: Fix compilation with Qt 5 / QTSERVICE_DEBUG.Friedemann Kleint2015-01-131-2/+9
| | | | | | | | Fix oversight of last commit. Change-Id: Iec9963313edf9d7438a90f9f3a7a4c6ae5065132 Task-number: QTSOLBUG-184 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Qt Service: Fix compilation with Qt 5 with define QTSERVICE_DEBUG.Friedemann Kleint2015-01-131-14/+32
| | | | | | | | | | Use Qt 5's new message handler within #ifdef and rewrite code use QByteArray instead of using toAscii(), which no longer exists in Qt 5. Change-Id: Iad6aa794c6578fd796e3b2bb402d3e290bdc711f Task-number: QTSOLBUG-184 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
* Remove qtgui link from qtlockedfile since is not usedFabio Alessandro Locati2014-12-191-1/+1
| | | | | Change-Id: I1bad1f36ff634193296bbe6452a865d9e8b8c708 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Improve error handling in Qt Mfc examples.Friedemann Kleint2014-10-142-22/+102
| | | | | | Task-number: QTBUG-40881 Change-Id: Iada4965609209a9926b8234acc09fc8fcf79e518 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Remove JPEG 2000 plugin.Jake Petroules2014-02-1230-2961/+0
| | | | | | | | | It is moving to the QtImageFormats module. Change-Id: I1b7e05e01852ce51e93189d5fb04af9c89f0c807 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Focus gained by mouse click handled correctly now.Lauri Laanmets2013-09-041-1/+3
| | | | | | | Task-number: QTSOLBUG-70 Change-Id: Id9cef80728762252542908b4fc62cb1509666da2 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* QtPropertyBrowser: Allow controlling whether to show text for bool valuesThorbjørn Lindeijer2013-07-086-12/+109
| | | | | | | | | | | | | This was a rather involved patch, but it avoids the need for using private API or duplicating QtBoolEdit (which is in a private header). Apart from adding support for this QtBoolEdit option to the QtCheckBoxFactory and the QtBoolPropertyManager, the setting can also be controlled via the 'textVisible' attribute associated with QtVariantProperty instances. Change-Id: Ia0c694ca852449c74cbe25429df69413211b45a5 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* QtPropertyBrowser: Respond to each change of text in QtLineEditFactoryThorbjørn Lindeijer2013-04-151-2/+5
| | | | | | | | | | | | I've extended this editor to allow adding a QCompleter to the line edit, but when changing the value via the QCompleter only the 'textChanged' and not the 'textEdited' signal is emitted. 'blockSignals' is now used to avoid this signal when applying a change of property value, like for all other editors. Change-Id: I1668dd45ad2e2bc651777b97cb143d1525eb5bd0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* QtPropertyBrowser: Document the 'echoMode' attribute for string valuesThorbjørn Lindeijer2013-04-151-0/+4
| | | | | Change-Id: Ib44c79aaaa8b777a058e2591986251e2506a4ca8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Set the tree widget as focus proxy of the tree property browserThorbjørn Lindeijer2013-04-101-0/+1
| | | | | | | | | Makes the focus go to the tree widget when set on the property browser, since it's not very helpful for it to stay on the property browser widget. Change-Id: I7b2a686e37d7a2693ec98133f3a51743aadf7cb4 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* QtSingleApplication: Make sure client reads ack data before disconnectingNils Jeisecke2013-04-091-0/+1
| | | | | | | | | | This solves the problem on Windows that sometimes a second application instance is started. Task-number: QTSOLBUG-160 Change-Id: I6586e2ccfbc1d640bcf42bc3bdbeed32a981d842 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Changed bool value from TRUE to lowercase trueSteven Ceuppens2013-03-271-1/+1
| | | | | | | | when building a CMake-Qt project on Linux, the build fails on this uppercase TRUE value. Change-Id: I9517226561da0f15a52831c09ab56dd716bad6d3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Fix warning about missing config.pri in Qt 5.Friedemann Kleint2013-02-156-6/+6
| | | | | | | | | For non-library-builds, no config.pri is generated by the configure(.bat) scripts. Change-Id: Ia39644d860d43cd322b3dd099a5d67248cd231be Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* configure.bat: Do not print usage when invoked correctly.Friedemann Kleint2013-02-159-0/+9
| | | | | Change-Id: Iecbb5235a7e3b7d92352784a858eed7148d648aa Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix compile errors for qtpropertybrowser.Indrajit Tapadar2013-02-134-24/+24
| | | | | | | | | | The compilation of QPropertybrowser as a DLL failed on linux for Qt5, because of a couple of deprecated API's, QRect::intersect() is replaced with QRect::intersected() and qVariantValue() macro replaced with Qvariant::Value(). Change-Id: I24acefe8ec9c288691ae807f27d2bdab385629f7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Read-only mode for string, double and integer propertiesAnton Malov2013-01-187-5/+253
| | | | | | | | | | | Added functionality to set read-only mode for string, double and integer properties using QLineEdit, QDoubleSpinBox and QSpinBox editors respectively). Read-only status can also be set using attributes of variant properties. Support for integer properties implemented by Vincent Wang https://gitorious.org/~linsong Change-Id: I0946cc44e2c5452e256f7c099427cae13cbb5264 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
* Fix compilation of the Qt Service Solution with Qt 5.Friedemann Kleint2013-01-113-0/+45
| | | | | | | Change-Id: I92e93bec3d39c135c00424eca64c2bc65582d49e Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-10309-313/+313
| | | | | Change-Id: I4520cf54a4c8d6ff6119dc3762d9aeac42b66af5 Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Make the QtWinMigrate solution work with Qt 5.0Andy Shaw2013-01-089-32/+116
| | | | | Change-Id: Ia4957fc75e89665c8b187a7932bd6b41e9230ee7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix compilation of the QtSingleApplication solution with Qt 5.Friedemann Kleint2013-01-072-4/+8
| | | | | | Change-Id: I48c20f8b96306d56bb6c365f6cb12dac795a0905 Reviewed-by: Jonathan Liu <net147@gmail.com> Reviewed-by: Andy Shaw <andy.shaw@digia.com>
* Fix usage of deprecated QCoreApplication::translateJonathan Liu2012-12-292-48/+44
| | | | | | | Based on qttools/ec87de9b8b6c7f6690f830086da542770537d4f7. Change-Id: I65fc7d5b4b00ece6dde1ec41508868749f08ec0a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Define QT_WA if using Qt 5Jonathan Liu2012-12-296-0/+24
| | | | | | | | Qt 5 always uses Unicode so define QT_WA to always select the Unicode path if using Qt 5. Change-Id: Ib0f0f403180442278728201c64cc79c284e2cb93 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change Q_WS_WIN to Q_OS_WIN for Qt 5 compatibilityJonathan Liu2012-12-2916-19/+19
| | | | | | | | Q_WS_WIN has been removed in Qt 5 so use Q_OS_WIN instead which exists in both Qt 4 and Qt 5 where appropriate. Change-Id: Icc9328f8d28da244dc828e670e2d6402c86a419b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add additional modules to QT variable if using Qt 5Jonathan Liu2012-12-292-0/+2
| | | | | Change-Id: I4532bb7de8a8772f08257ee3a14d28b0eda4e9bf Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove module prefix from includesJonathan Liu2012-12-29157-473/+473
| | | | | | | | The module prefix is not needed and removing it adds compatibility with Qt 5 which has classes moved into different modules. Change-Id: I20823be670d78ba6cc8eb0e5de1f4f3b6fa2edb6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Use "qt-project.org" instead of "trolltech" in the resource systemJonathan Liu2012-12-292-19/+19
| | | | | | | | Based on qttools/b97b090d620a23736d4ab5535000ce499509cac5. Task-number: QTBUG-23272 Change-Id: I480d51909c0115efa7515cb3c4ab0a3580f2160f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyedJonathan Liu2012-12-293-38/+69
| | | | | | | | | Based on qt/31ba9218c63b6c0177fabae3ff33cc5f3c2df8d5 and qttools/180e84ad39cf135d5facbd43e9ea3be830b2fe1f. Task-number: QTBUG-8046 Change-Id: Icfb06eab3d3f7495278e273d70046669ed5f4a40 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix type conversion to QVariant with Qt 5Jonathan Liu2012-12-291-0/+4
| | | | | | | | | | QVariant doesn't have QKeySequence constructor in Qt 5 (effect of the modularization project), therefore it can't be default constructed. Based on qttools/adfa9ccb102131de9739d5d79f320f07cea196ab. Change-Id: Ia4e69bf37bd94d2c2647128019e6d524c99a88e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix warnings about assigned/unused variablesJonathan Liu2012-12-293-8/+0
| | | | | | | Based on qttools/5ef5c6dd2446b04dce0d418816dadf2c0917803b. Change-Id: I604786cf54d5b62179fce5bfe3164e770ec79cf9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Fix \sa usageJonathan Liu2012-12-292-4/+4
| | | | | | | | | Ensure comma between elements (1 missing), single space and curly- braces around title elements, etc. Based on qttools/5ee351e266782ad51518ad9ad058f3608b277f8e. Change-Id: I2779e5e6da1b86ba2905ed59a70af6448cc1e63b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add widgets to QT variable if using Qt 5Jonathan Liu2012-12-291-0/+1
| | | | | | | The QT variable needs widgets added if using Qt 5. Change-Id: I83b63944dcadd6ee75a2103217bd90671866e811 Reviewed-by: hjk <qthjk@ovi.com>
* Enable deprecated item view methods for Qt 5Jonathan Liu2012-12-281-0/+1
| | | | | | | | | | QT_DISABLE_DEPRECATED_BEFORE=0 must be defined to use the deprecated QHeaderView::setMovable and QHeaderView::setResizeMode methods. Change-Id: I12387fce109c190fdf3c6d2699a2f606191f0052 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Replace Q_TYPENAME by typenameJonathan Liu2012-12-282-11/+11
| | | | | | | | | Q_TYPENAME is being removed. Based on qttools/f9aa0fb422ebc6a5a5b1416269eda471887a2c90. Change-Id: I26ffaf41d21d6fed12457e57e33dc830137255c1 Reviewed-by: Olivier Goffart <ogoffart@woboq.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Change copyright from Nokia to DigiaSergio Ahumada2012-12-27310-2609/+3581
| | | | | | Change-Id: Ie75877290e0bce06c8b5a24ed664e8aceaf2cac0 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* Fix '::getuid' has not been declared compile errorJonathan Liu2012-12-211-0/+2
| | | | | | | Task-number: QTSOLBUG-102 Change-Id: Idd30a013e4b1d113531e2a90c4b15924ca005788 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Added multiple inclusion protection in .h files.Sam Protsenko2011-09-075-3/+20
| | | | | | Task-number: QTSOLBUG-146 Merge-request: 4 Reviewed-by: ossi
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-24 04:19:03 +0000