3 years agoQt Service solution: Use qintptr in QtServiceSysPrivate::incomingConnection() for... master
Vincas Dargis [Wed, 6 May 2015 10:21:34 +0000 (13:21 +0300)]
Qt Service solution: Use qintptr in QtServiceSysPrivate::incomingConnection() for Qt 5.

Task-number: QTSOLBUG-180
Change-Id: I05f960ab342eb114c07e19af0d3b31507d17068f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
3 years agoEmit readOnlyChanged() and not echoChanged() in setReadOnly() of QtStringPropertyManager.
Philip Allgaier [Thu, 19 Feb 2015 01:33:33 +0000 (02:33 +0100)]
Emit readOnlyChanged() and not echoChanged() in setReadOnly() of QtStringPropertyManager.

Change-Id: Id2cef6bc826066153572b9c8265eeb5315add158
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Philip Allgaier <mail@spacegaier.de>
3 years agoQt Service/Windows: Fix compilation with Qt 5 / QTSERVICE_DEBUG.
Friedemann Kleint [Tue, 13 Jan 2015 14:10:28 +0000 (15:10 +0100)]
Qt Service/Windows: Fix compilation with Qt 5 / QTSERVICE_DEBUG.

Fix oversight of last commit.

Change-Id: Iec9963313edf9d7438a90f9f3a7a4c6ae5065132
Task-number: QTSOLBUG-184
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
3 years agoQt Service: Fix compilation with Qt 5 with define QTSERVICE_DEBUG.
Friedemann Kleint [Tue, 13 Jan 2015 11:23:59 +0000 (12:23 +0100)]
Qt Service: Fix compilation with Qt 5 with define QTSERVICE_DEBUG.

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>
3 years agoRemove qtgui link from qtlockedfile since is not used
Fabio Alessandro Locati [Sat, 16 Aug 2014 21:25:53 +0000 (23:25 +0200)]
Remove qtgui link from qtlockedfile since is not used

Change-Id: I1bad1f36ff634193296bbe6452a865d9e8b8c708
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
3 years agoImprove error handling in Qt Mfc examples.
Friedemann Kleint [Tue, 14 Oct 2014 12:03:56 +0000 (14:03 +0200)]
Improve error handling in Qt Mfc examples.

Task-number: QTBUG-40881
Change-Id: Iada4965609209a9926b8234acc09fc8fcf79e518
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
4 years agoRemove JPEG 2000 plugin.
Jake Petroules [Wed, 13 Nov 2013 19:21:02 +0000 (14:21 -0500)]
Remove JPEG 2000 plugin.

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>
4 years agoFocus gained by mouse click handled correctly now.
Lauri Laanmets [Tue, 7 May 2013 21:11:53 +0000 (00:11 +0300)]
Focus gained by mouse click handled correctly now.

Task-number: QTSOLBUG-70
Change-Id: Id9cef80728762252542908b4fc62cb1509666da2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoQtPropertyBrowser: Allow controlling whether to show text for bool values
Thorbjørn Lindeijer [Wed, 10 Apr 2013 21:36:59 +0000 (23:36 +0200)]
QtPropertyBrowser: Allow controlling whether to show text for bool values

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>
5 years agoQtPropertyBrowser: Respond to each change of text in QtLineEditFactory
Thorbjørn Lindeijer [Sat, 13 Apr 2013 15:16:47 +0000 (17:16 +0200)]
QtPropertyBrowser: Respond to each change of text in QtLineEditFactory

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>
5 years agoQtPropertyBrowser: Document the 'echoMode' attribute for string values
Thorbjørn Lindeijer [Wed, 10 Apr 2013 21:38:26 +0000 (23:38 +0200)]
QtPropertyBrowser: Document the 'echoMode' attribute for string values

Change-Id: Ib44c79aaaa8b777a058e2591986251e2506a4ca8
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
5 years agoSet the tree widget as focus proxy of the tree property browser
Thorbjørn Lindeijer [Tue, 9 Apr 2013 19:59:37 +0000 (21:59 +0200)]
Set the tree widget as focus proxy of the tree property browser

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

Change-Id: I7b2a686e37d7a2693ec98133f3a51743aadf7cb4
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
5 years agoQtSingleApplication: Make sure client reads ack data before disconnecting
Nils Jeisecke [Tue, 8 Jan 2013 08:57:32 +0000 (09:57 +0100)]
QtSingleApplication: Make sure client reads ack data before disconnecting

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>
5 years agoChanged bool value from TRUE to lowercase true
Steven Ceuppens [Wed, 20 Mar 2013 08:16:00 +0000 (09:16 +0100)]
Changed bool value from TRUE to lowercase true

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>
5 years agoFix warning about missing config.pri in Qt 5.
Friedemann Kleint [Tue, 12 Feb 2013 15:57:45 +0000 (16:57 +0100)]
Fix warning about missing config.pri in Qt 5.

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>
5 years agoconfigure.bat: Do not print usage when invoked correctly.
Friedemann Kleint [Tue, 12 Feb 2013 15:35:57 +0000 (16:35 +0100)]
configure.bat: Do not print usage when invoked correctly.

Change-Id: Iecbb5235a7e3b7d92352784a858eed7148d648aa
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoFix compile errors for qtpropertybrowser.
Indrajit Tapadar [Tue, 12 Feb 2013 10:06:09 +0000 (11:06 +0100)]
Fix compile errors for qtpropertybrowser.

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>
5 years agoRead-only mode for string, double and integer properties
Anton Malov [Wed, 18 Jul 2012 16:01:27 +0000 (20:01 +0400)]
Read-only mode for string, double and integer properties

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>
5 years agoFix compilation of the Qt Service Solution with Qt 5.
Friedemann Kleint [Mon, 7 Jan 2013 11:53:57 +0000 (12:53 +0100)]
Fix compilation of the Qt Service Solution with Qt 5.

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>
5 years agoUpdate copyright year in Digia's license headers
Sergio Ahumada [Thu, 10 Jan 2013 16:59:48 +0000 (17:59 +0100)]
Update copyright year in Digia's license headers

Change-Id: I4520cf54a4c8d6ff6119dc3762d9aeac42b66af5
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoMake the QtWinMigrate solution work with Qt 5.0
Andy Shaw [Wed, 2 Jan 2013 14:58:08 +0000 (15:58 +0100)]
Make the QtWinMigrate solution work with Qt 5.0

Change-Id: Ia4957fc75e89665c8b187a7932bd6b41e9230ee7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoFix compilation of the QtSingleApplication solution with Qt 5.
Friedemann Kleint [Mon, 7 Jan 2013 10:29:44 +0000 (11:29 +0100)]
Fix compilation of the QtSingleApplication solution with Qt 5.

Change-Id: I48c20f8b96306d56bb6c365f6cb12dac795a0905
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
5 years agoFix usage of deprecated QCoreApplication::translate
Jonathan Liu [Fri, 28 Dec 2012 09:22:50 +0000 (20:22 +1100)]
Fix usage of deprecated QCoreApplication::translate

Based on qttools/ec87de9b8b6c7f6690f830086da542770537d4f7.

Change-Id: I65fc7d5b4b00ece6dde1ec41508868749f08ec0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoDefine QT_WA if using Qt 5
Jonathan Liu [Sat, 29 Dec 2012 01:18:09 +0000 (12:18 +1100)]
Define QT_WA if using Qt 5

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>
5 years agoChange Q_WS_WIN to Q_OS_WIN for Qt 5 compatibility
Jonathan Liu [Sat, 29 Dec 2012 00:57:40 +0000 (11:57 +1100)]
Change Q_WS_WIN to Q_OS_WIN for Qt 5 compatibility

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>
5 years agoAdd additional modules to QT variable if using Qt 5
Jonathan Liu [Fri, 28 Dec 2012 23:08:10 +0000 (10:08 +1100)]
Add additional modules to QT variable if using Qt 5

Change-Id: I4532bb7de8a8772f08257ee3a14d28b0eda4e9bf
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoRemove module prefix from includes
Jonathan Liu [Fri, 28 Dec 2012 09:42:13 +0000 (20:42 +1100)]
Remove module prefix from includes

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>
5 years agoUse "qt-project.org" instead of "trolltech" in the resource system
Jonathan Liu [Fri, 28 Dec 2012 08:48:19 +0000 (19:48 +1100)]
Use "qt-project.org" instead of "trolltech" in the resource system

Based on qttools/b97b090d620a23736d4ab5535000ce499509cac5.
Task-number: QTBUG-23272

Change-Id: I480d51909c0115efa7515cb3c4ab0a3580f2160f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoFix warnings ~QX11PixmapData(): QPixmap objects must be destroyed
Jonathan Liu [Fri, 28 Dec 2012 08:41:05 +0000 (19:41 +1100)]
Fix warnings ~QX11PixmapData(): QPixmap objects must be destroyed

Based on qt/31ba9218c63b6c0177fabae3ff33cc5f3c2df8d5 and

Task-number: QTBUG-8046
Change-Id: Icfb06eab3d3f7495278e273d70046669ed5f4a40
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoFix type conversion to QVariant with Qt 5
Jonathan Liu [Fri, 28 Dec 2012 09:15:36 +0000 (20:15 +1100)]
Fix type conversion to QVariant with Qt 5

QVariant doesn't have QKeySequence constructor in Qt 5 (effect of
the modularization project), therefore it can't be default
Based on qttools/adfa9ccb102131de9739d5d79f320f07cea196ab.

Change-Id: Ia4e69bf37bd94d2c2647128019e6d524c99a88e9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoFix warnings about assigned/unused variables
Jonathan Liu [Fri, 28 Dec 2012 07:59:56 +0000 (18:59 +1100)]
Fix warnings about assigned/unused variables

Based on qttools/5ef5c6dd2446b04dce0d418816dadf2c0917803b.

Change-Id: I604786cf54d5b62179fce5bfe3164e770ec79cf9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoDoc: Fix \sa usage
Jonathan Liu [Fri, 28 Dec 2012 09:08:00 +0000 (20:08 +1100)]
Doc: Fix \sa usage

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>
5 years agoAdd widgets to QT variable if using Qt 5
Jonathan Liu [Fri, 28 Dec 2012 09:45:28 +0000 (20:45 +1100)]
Add widgets to QT variable if using Qt 5

The QT variable needs widgets added if using Qt 5.

Change-Id: I83b63944dcadd6ee75a2103217bd90671866e811
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoEnable deprecated item view methods for Qt 5
Jonathan Liu [Fri, 28 Dec 2012 09:01:57 +0000 (20:01 +1100)]
Enable deprecated item view methods for Qt 5

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>
5 years agoReplace Q_TYPENAME by typename
Jonathan Liu [Fri, 28 Dec 2012 08:17:41 +0000 (19:17 +1100)]
Replace Q_TYPENAME by typename

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>
5 years agoChange copyright from Nokia to Digia
Sergio Ahumada [Thu, 20 Dec 2012 20:45:57 +0000 (21:45 +0100)]
Change copyright from Nokia to Digia

Change-Id: Ie75877290e0bce06c8b5a24ed664e8aceaf2cac0
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agoFix '::getuid' has not been declared compile error
Jonathan Liu [Fri, 21 Dec 2012 07:25:46 +0000 (18:25 +1100)]
Fix '::getuid' has not been declared compile error

Task-number: QTSOLBUG-102

Change-Id: Idd30a013e4b1d113531e2a90c4b15924ca005788
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoAdded multiple inclusion protection in .h files.
Sam Protsenko [Wed, 7 Sep 2011 18:01:19 +0000 (20:01 +0200)]
Added multiple inclusion protection in .h files.

Task-number: QTSOLBUG-146
Merge-request: 4
Reviewed-by: ossi
7 years agoAdded functionality to set the echo-mode on string properties (QLineEdit editor).
Christian Strømme [Fri, 27 May 2011 12:55:12 +0000 (14:55 +0200)]
Added functionality to set the echo-mode on string properties (QLineEdit editor).

Reviewed-by: Martin Pejcoch
7 years agoUse system locale for displaying double values
Martin Pejcoch [Thu, 7 Apr 2011 08:10:24 +0000 (10:10 +0200)]
Use system locale for displaying double values

The double property manager used a hardcoded conversion to QString,
this doesn't match a localized conversion used by the spinbox editor,
when the value is being edited. Since there is no connection to a widget
to provide the application's locale the default system locale is used.

Reviewed-by: Andy Shaw
7 years agoMerge branch 'master' of git@scm.dev.nokia.troll.no:qt-solutions/qt-solutions
Andy Shaw [Wed, 17 Nov 2010 13:52:52 +0000 (14:52 +0100)]
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt-solutions/qt-solutions

7 years agoEnsure that the library name is correct when creating and linking
Andy Shaw [Wed, 17 Nov 2010 13:51:27 +0000 (14:51 +0100)]
Ensure that the library name is correct when creating and linking

When a vcproj project was created then it would not create the library
names correctly when it was linking against QtService as a library and
in addition it was not defining the export define when building the
library itself.

Reviewed-by: Pierre
7 years agoIgnore CRLF in the .bat files
aavit [Wed, 6 Oct 2010 11:42:08 +0000 (13:42 +0200)]
Ignore CRLF in the .bat files

7 years agoLong live the Qt Solutions archive!
aavit [Wed, 6 Oct 2010 10:57:48 +0000 (12:57 +0200)]
Long live the Qt Solutions archive!

This commit adds the contents of distribution packages of the
relevant subset of the Qt Solutions components, generated
from the last versions in Perforce.