Compiler outputs a warning because of comparison between
QLocalSocket::LocalSocketState and QAbstractSocket::SocketState.
Change-Id: Idbae5c3c32a32324e07972e0bb0808fc40ef7624
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Based on qttools/ec87de9b8b6c7f6690f830086da542770537d4f7.
Change-Id: I65fc7d5b4b00ece6dde1ec41508868749f08ec0a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
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>
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>
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>
Based on qt/31ba9218c63b6c0177fabae3ff33cc5f3c2df8d5 and
qttools/180e84ad39cf135d5facbd43e9ea3be830b2fe1f.
Task-number: QTBUG-8046
Change-Id: Icfb06eab3d3f7495278e273d70046669ed5f4a40
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
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>
Based on qttools/5ef5c6dd2446b04dce0d418816dadf2c0917803b.
Change-Id: I604786cf54d5b62179fce5bfe3164e770ec79cf9
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
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>
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>
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>
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
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
