Re: [Development] Qt 5.6.0 header diff: QtCore.diff

[Thiago Macieira]

On Thursday 17 September 2015 18:17:01 Sune Vuorela wrote:
> > -// undocumented:
> > -static const quint64 MaxSize =3D (1 << 30) - sizeof(Data);
> > -

> Even though it is marked as undocumented, it does look slightly fishy to
> me.

You were not supposed to use it. If you did, your code is broken.

Especially so because the size changed too.
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtCore.diff

[Sune Vuorela]

On 2015-09-17, Frederik Gladhorn  wrote:
> --- a/src/corelib/tools/qbytearray.h
> +++ b/src/corelib/tools/qbytearray.h
> @@ -43,6 +43,7 @@
>  #include 
>=20
>  #include 
> +#include 
>=20
>  #ifdef truncate
>  #error qbytearray.h must be included before any header file that defin=
> es truncate
> @@ -162,9 +163,6 @@ private:
>  typedef QTypedArrayData Data;
>=20
>  public:
> -// undocumented:
> -static const quint64 MaxSize =3D (1 << 30) - sizeof(Data);
> -
>  enum Base64Option {
>  Base64Encoding =3D 0,
>  Base64UrlEncoding =3D 1,
> @@ -338,16 +336,16 @@ public:

Even though it is marked as undocumented, it does look slightly fishy to
me.

/Sune

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Bug in macdeployqt?

[Dean Floyd]

Dear all,

We have a project where we weak link our app against the Wacom framework
which on MacOSX by default gets installed in:

/Library/Frameworks/WacomMultiTouch.framework

otool -L returns the following line for the Wacom link:

@rpath/WacomMultiTouch.framework/Versions/A/WacomMultiTouch (compatibility
version 1.1.0, current version 1.1.2)

When running macdeployqt we get the following error:

ERROR: Cannot resolve rpath
"WacomMultiTouch.framework/Versions/A/WacomMultiTouch (compatibility
version 1.1.0, current version 1.1.2)"
ERROR:  using QSet("/Applications/Qt/5.5/clang_64/lib",
"/Library/Frameworks")

I took a look at the macdeployqt's source code and it looks like there's
something wrong at parseOtoolLibararyLine() in
qttools/src/macdeployqt/shared.cpp.

It looks like in line 238 a "lib/" is put after the substitution of @rpath,
which causes the Wacom framework not to be resolved properly. A comment in
line 222 suggests that macdeployqt assumes that everything which of the
QtPath state is a Qt library. In our case Wacom is not a Qt library so the
additional "/lib" insertation breaks our build.

There are other libraries in /Library/Frameworks which are not Qt libraries
which may be potential linked against a Qt application, and as far as I can
see, this is not account for in macdeployqt. Could somebody please confirm
this?

Thank you,

Dean Floyd
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff

[Knoll Lars]

That's fine. I'll go through them during the next days, but I think it's good 
if also everybody else who wants and has time can have a look and help.

Cheers,
Lars

Sendt fra min BlackBerry 10-smarttelefon.
  Opprinnelig melding
Fra: Thiago Macieira
Sendt: Thursday, September 17, 2015 6:51 PM
Til: development@qt-project.org
Kopi: Knoll Lars
Emne: Re: [Development] Qt 5.6.0 header diff


On Thursday 17 September 2015 16:34:05 Knoll Lars wrote:
> And the best tool we have to identify new apis is probably a different of
> the headers... :-)

I understand that, but I don't have the time to go look for them buried in
thousands of lines of change (the Q_NULLPTR) in each and every .diff file sent.
Not right now.

--
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff

[Thiago Macieira]

On Thursday 17 September 2015 16:34:05 Knoll Lars wrote:
> And the best tool we have to identify new apis is probably a different of
> the headers... :-)

I understand that, but I don't have the time to go look for them buried in 
thousands of lines of change (the Q_NULLPTR) in each and every .diff file sent. 
Not right now.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff

[Knoll Lars]

And the best tool we have to identify new apis is probably a different of the 
headers... :-)

Cheers,
Lars

Sendt fra min BlackBerry 10-smarttelefon.
  Opprinnelig melding
Fra: Thiago Macieira
Sendt: Thursday, September 17, 2015 6:30 PM
Til: development@qt-project.org
Emne: Re: [Development] Qt 5.6.0 header diff


On Thursday 17 September 2015 16:19:38 Knoll Lars wrote:
> We need the difference to see where apis got added, so that we can review
> those. And that should happen now, and not when we get one to the rc.

The API review should happen now, not the header diff.

--
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff

[Thiago Macieira]

On Thursday 17 September 2015 16:19:38 Knoll Lars wrote:
> We need the difference to see where apis got added, so that we can review
> those. And that should happen now, and not when we get one to the rc.

The API review should happen now, not the header diff.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff

[Knoll Lars]

We need the difference to see where apis got added, so that we can review 
those. And that should happen now, and not when we get one to the rc.

Cheers,
Lars

Sendt fra min BlackBerry 10-smarttelefon.
  Opprinnelig melding
Fra: Thiago Macieira
Sendt: Thursday, September 17, 2015 6:13 PM
Til: development@qt-project.org
Emne: Re: [Development] Qt 5.6.0 header diff


On Thursday 17 September 2015 12:29:27 Frederik Gladhorn wrote:
> we are getting close to the Qt 5.6 beta and it's time for the header diff.

No, it isn't.

Header diff is done close to the RC, when we deep freeze. Since there may still
be quite considerable changes coming in, we'll need to do this header diff
again in a month or two's time.

Please note that, due to lack of time, I will prioritise other tasks and will
not review the headers at this time. I will wait until the second round at RC
time to make the effort.

I will watch people's replies, though, and will react if anyone requests my
attention.
--
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtTest.diff

[Thiago Macieira]

On Thursday 17 September 2015 15:27:44 Milian Wolff wrote:
> +++ b/src/testlib/qtestaccessible.h
> @@ -126,7 +126,7 @@ public:
>  static void cleanup()
>  {
>  delete instance();
> -instance() = 0;
> +instance() = Q_NULLPTR;
>  }
> 
> this is wrong

Why?
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtGui.diff

[Thiago Macieira]

On Thursday 17 September 2015 14:25:25 Allan Sandfeld Jensen wrote:
> What is with all the Q_NULLPTR? I thought we decided not to do those. Not
> that  want them removed, that would be even more noise.

We decided to do them for 5.6, since compilers are getting warning switches 
about zero as null pointers. This change was decided because 5.6 is a long-
term release and we'd like to have those headers really future-proof.

-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff

[Thiago Macieira]

On Thursday 17 September 2015 12:29:27 Frederik Gladhorn wrote:
> we are getting close to the Qt 5.6 beta and it's time for the header diff. 

No, it isn't.

Header diff is done close to the RC, when we deep freeze. Since there may still 
be quite considerable changes coming in, we'll need to do this header diff 
again in a month or two's time.

Please note that, due to lack of time, I will prioritise other tasks and will 
not review the headers at this time. I will wait until the second round at RC 
time to make the effort.

I will watch people's replies, though, and will react if anyone requests my 
attention.
-- 
Thiago Macieira - thiago.macieira (AT) intel.com
  Software Architect - Intel Open Source Technology Center

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] New module for OPC UA

[Denis Shienkov]

> we considered this, but OPC UA is not a serial bus.

But Modbus is not a serial bus too, it is just an protocol. :)

I think that qtserialbus it is a bad name/place to add any of protocols. I
think that for the industrial protocols (or any protocols) can be created
the separate pero (named as qtindustrialprotocols), in which can be added
as Modbus, as DNP3, as IECxx, as OPC-UA and so on.

Or, the qtserialbus should be renamed and divided to some sub-modules, like
qt-modbus, qt-dnp, qt-iec, qt-opc-ua, qt-can, and so on.. when the user can
add it in own project like:

CONFIG += qtcan qtopcua

I think that current qtserialbus has not a good design, IMHO.

But, ideally, the OPC-UA should be merged to there..maybe.. :)


BR,
Denis


2015-09-17 17:52 GMT+03:00 Frank Meerkötter 
:

> Hi Denis,
>
> we considered this, but OPC UA is not a serial bus.
>  From my reading of the qtserialbus code this module
> has abstractions such as Devices, Busses, Frames and
> such. OPC UA is much more high-level. It has abstractions
> such as Clients (of a certain server), nodes or subscriptions.
>
> My understanding is that there is very little common ground
> (if at all) with qtserialbus.
>
> Therefore we propose a new module/repo.
>
> Kind Regards,
> Frank
>
> On 17.09.2015 16:43, Denis Shienkov wrote:
> > Hi,
> >
> > IMHO, all industrial protocols can be added to qtserialbus:
> > http://code.qt.io/cgit/qt/qtserialbus.git/
> > There already are present the Modbus and the CAN protocols.
> >
> > BR,
> > Denis
> >
> > 2015-09-17 16:54 GMT+03:00 Frank Meerkötter
> > mailto:frank.meerkoet...@basyskom.com
> >>:
> >
> > Hello,
> >
> > we as basysKom have developed a Qt API for OPC UA which we would like
> > to contribute to the Qt project.
> >
> > OPC UA is a communication protocol developed for industrial
> > machine to machine communication. The vision of OPC UA is to have
> > one uniform, vendor-independent communication protocol for all
> > industrial communication (from machine controllers up to enterprise
> > level systems).
> >
> > Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin
> > mechanism in place so different OPC UA stacks can be used through a
> > common interface. We have currently implemented an HMI focused
> sub-set
> > of the client-side.
> >
> > Our initial contribution would include a plugin for the open source
> > FreeOPCUA stack. We also have implementations for two more
> (commercial)
> > OPC UA stacks available which we might contribute at a later point
> > (depending on licence issues).
> >
> > We have reviewed the list of existing modules and did not find a
> > module with related functionality. Therefore we would like to request
> > a new module. Our preferred repo would be "qt/qtopcua".
> >
> > Kind Regards,
> > Frank
> >
> > --
> > Frank Meerkötter
> > Development Lead
> >
> > basysKom GmbH
> > Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
> > Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
> > frank.meerkoet...@basyskom.com
> >  | www.basyskom.com
> > 
> >
> > Handelsregister: Darmstadt HRB 9352
> > Geschäftsführung: Eva Brucherseifer, Heike Ziegler
> >
> > ___
> > Development mailing list
> > Development@qt-project.org 
> > http://lists.qt-project.org/mailman/listinfo/development
> >
> >
> >
> >
> > ___
> > Development mailing list
> > Development@qt-project.org
> > http://lists.qt-project.org/mailman/listinfo/development
> >
>
> --
> Frank Meerkötter
> Development Lead
>
> basysKom GmbH
> Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
> Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
> frank.meerkoet...@basyskom.com | www.basyskom.com
>
> Handelsregister: Darmstadt HRB 9352
> Geschäftsführung: Eva Brucherseifer, Heike Ziegler
>
> ___
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] New module for OPC UA

[Volny]

‎+1 for qopcua. We, in our company, have also own qt opc-ua implementation 
based on freeopcua. I really like to switch to pure Qt opcua stack 
implementation where ever it will be placed in Qt modules :) 

Regards

Fanda

Sent from my BlackBerry 10 smartphone.
  Original Message  
From: Konstantin Tokarev
Sent: Thursday, September 17, 2015 17:01
To: Frank Meerkötter; development@qt-project.org
Subject: Re: [Development] New module for OPC UA



17.09.2015, 16:54, "Frank Meerkötter" :
> Hello,
>
> we as basysKom have developed a Qt API for OPC UA which we would like
> to contribute to the Qt project.
>
> OPC UA is a communication protocol developed for industrial
> machine to machine communication. The vision of OPC UA is to have
> one uniform, vendor-independent communication protocol for all
> industrial communication (from machine controllers up to enterprise
> level systems).
>
> Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin
> mechanism in place so different OPC UA stacks can be used through a
> common interface. We have currently implemented an HMI focused sub-set
> of the client-side.
>
> Our initial contribution would include a plugin for the open source
> FreeOPCUA stack. We also have implementations for two more (commercial)
> OPC UA stacks available which we might contribute at a later point
> (depending on licence issues).
>
> We have reviewed the list of existing modules and did not find a
> module with related functionality. Therefore we would like to request
> a new module. Our preferred repo would be "qt/qtopcua".

This gets dangerously close to "qtopia" :)

-- 
Regards,
Konstantin
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] New module for OPC UA

[Konstantin Tokarev]

17.09.2015, 16:54, "Frank Meerkötter" :
> Hello,
>
> we as basysKom have developed a Qt API for OPC UA which we would like
> to contribute to the Qt project.
>
> OPC UA is a communication protocol developed for industrial
> machine to machine communication. The vision of OPC UA is to have
> one uniform, vendor-independent communication protocol for all
> industrial communication (from machine controllers up to enterprise
> level systems).
>
> Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin
> mechanism in place so different OPC UA stacks can be used through a
> common interface. We have currently implemented an HMI focused sub-set
> of the client-side.
>
> Our initial contribution would include a plugin for the open source
> FreeOPCUA stack. We also have implementations for two more (commercial)
> OPC UA stacks available which we might contribute at a later point
> (depending on licence issues).
>
> We have reviewed the list of existing modules and did not find a
> module with related functionality. Therefore we would like to request
> a new module. Our preferred repo would be "qt/qtopcua".

This gets dangerously close to "qtopia" :)

-- 
Regards,
Konstantin
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] New module for OPC UA

[Frank Meerkötter]

Hi Denis,

we considered this, but OPC UA is not a serial bus.
 From my reading of the qtserialbus code this module
has abstractions such as Devices, Busses, Frames and
such. OPC UA is much more high-level. It has abstractions
such as Clients (of a certain server), nodes or subscriptions.

My understanding is that there is very little common ground
(if at all) with qtserialbus.

Therefore we propose a new module/repo.

Kind Regards,
Frank

On 17.09.2015 16:43, Denis Shienkov wrote:
> Hi,
>
> IMHO, all industrial protocols can be added to qtserialbus:
> http://code.qt.io/cgit/qt/qtserialbus.git/
> There already are present the Modbus and the CAN protocols.
>
> BR,
> Denis
>
> 2015-09-17 16:54 GMT+03:00 Frank Meerkötter
> mailto:frank.meerkoet...@basyskom.com>>:
>
> Hello,
>
> we as basysKom have developed a Qt API for OPC UA which we would like
> to contribute to the Qt project.
>
> OPC UA is a communication protocol developed for industrial
> machine to machine communication. The vision of OPC UA is to have
> one uniform, vendor-independent communication protocol for all
> industrial communication (from machine controllers up to enterprise
> level systems).
>
> Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin
> mechanism in place so different OPC UA stacks can be used through a
> common interface. We have currently implemented an HMI focused sub-set
> of the client-side.
>
> Our initial contribution would include a plugin for the open source
> FreeOPCUA stack. We also have implementations for two more (commercial)
> OPC UA stacks available which we might contribute at a later point
> (depending on licence issues).
>
> We have reviewed the list of existing modules and did not find a
> module with related functionality. Therefore we would like to request
> a new module. Our preferred repo would be "qt/qtopcua".
>
> Kind Regards,
> Frank
>
> --
> Frank Meerkötter
> Development Lead
>
> basysKom GmbH
> Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
> Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
> frank.meerkoet...@basyskom.com
>  | www.basyskom.com
> 
>
> Handelsregister: Darmstadt HRB 9352
> Geschäftsführung: Eva Brucherseifer, Heike Ziegler
>
> ___
> Development mailing list
> Development@qt-project.org 
> http://lists.qt-project.org/mailman/listinfo/development
>
>
>
>
> ___
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>

-- 
Frank Meerkötter
Development Lead

basysKom GmbH
Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
frank.meerkoet...@basyskom.com | www.basyskom.com

Handelsregister: Darmstadt HRB 9352
Geschäftsführung: Eva Brucherseifer, Heike Ziegler

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] New module for OPC UA

[Denis Shienkov]

Hi,

IMHO, all industrial protocols can be added to qtserialbus:
http://code.qt.io/cgit/qt/qtserialbus.git/
There already are present the Modbus and the CAN protocols.

BR,
Denis


2015-09-17 16:54 GMT+03:00 Frank Meerkötter 
:

> Hello,
>
> we as basysKom have developed a Qt API for OPC UA which we would like
> to contribute to the Qt project.
>
> OPC UA is a communication protocol developed for industrial
> machine to machine communication. The vision of OPC UA is to have
> one uniform, vendor-independent communication protocol for all
> industrial communication (from machine controllers up to enterprise
> level systems).
>
> Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin
> mechanism in place so different OPC UA stacks can be used through a
> common interface. We have currently implemented an HMI focused sub-set
> of the client-side.
>
> Our initial contribution would include a plugin for the open source
> FreeOPCUA stack. We also have implementations for two more (commercial)
> OPC UA stacks available which we might contribute at a later point
> (depending on licence issues).
>
> We have reviewed the list of existing modules and did not find a
> module with related functionality. Therefore we would like to request
> a new module. Our preferred repo would be "qt/qtopcua".
>
> Kind Regards,
> Frank
>
> --
> Frank Meerkötter
> Development Lead
>
> basysKom GmbH
> Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
> Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
> frank.meerkoet...@basyskom.com | www.basyskom.com
>
> Handelsregister: Darmstadt HRB 9352
> Geschäftsführung: Eva Brucherseifer, Heike Ziegler
>
> ___
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] New module for OPC UA

[Denis Shienkov]

Hi,

IMHO, all industrial protocols can be added to qtserialbus:
http://code.qt.io/cgit/qt/qtserialbus.git/
There already are present the Modbus and the CAN protocols.

BR,
Denis

2015-09-17 16:54 GMT+03:00 Frank Meerkötter 
:

> Hello,
>
> we as basysKom have developed a Qt API for OPC UA which we would like
> to contribute to the Qt project.
>
> OPC UA is a communication protocol developed for industrial
> machine to machine communication. The vision of OPC UA is to have
> one uniform, vendor-independent communication protocol for all
> industrial communication (from machine controllers up to enterprise
> level systems).
>
> Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin
> mechanism in place so different OPC UA stacks can be used through a
> common interface. We have currently implemented an HMI focused sub-set
> of the client-side.
>
> Our initial contribution would include a plugin for the open source
> FreeOPCUA stack. We also have implementations for two more (commercial)
> OPC UA stacks available which we might contribute at a later point
> (depending on licence issues).
>
> We have reviewed the list of existing modules and did not find a
> module with related functionality. Therefore we would like to request
> a new module. Our preferred repo would be "qt/qtopcua".
>
> Kind Regards,
> Frank
>
> --
> Frank Meerkötter
> Development Lead
>
> basysKom GmbH
> Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
> Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
> frank.meerkoet...@basyskom.com | www.basyskom.com
>
> Handelsregister: Darmstadt HRB 9352
> Geschäftsführung: Eva Brucherseifer, Heike Ziegler
>
> ___
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] New module for OPC UA

[Frank Meerkötter]

Hello,

we as basysKom have developed a Qt API for OPC UA which we would like
to contribute to the Qt project.

OPC UA is a communication protocol developed for industrial
machine to machine communication. The vision of OPC UA is to have
one uniform, vendor-independent communication protocol for all
industrial communication (from machine controllers up to enterprise
level systems).

Our API is a Qt wrapper for existing OPC UA stacks. We have a plugin 
mechanism in place so different OPC UA stacks can be used through a
common interface. We have currently implemented an HMI focused sub-set
of the client-side.

Our initial contribution would include a plugin for the open source
FreeOPCUA stack. We also have implementations for two more (commercial)
OPC UA stacks available which we might contribute at a later point
(depending on licence issues).

We have reviewed the list of existing modules and did not find a
module with related functionality. Therefore we would like to request
a new module. Our preferred repo would be "qt/qtopcua".

Kind Regards,
Frank

-- 
Frank Meerkötter
Development Lead

basysKom GmbH
Robert-Bosch-Str. 7 | 64293 Darmstadt | Germany
Tel   : +49 6151 870 589 161  | Fax: +49 6151 - 870 589 162
frank.meerkoet...@basyskom.com | www.basyskom.com

Handelsregister: Darmstadt HRB 9352
Geschäftsführung: Eva Brucherseifer, Heike Ziegler

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtTest.diff

[Milian Wolff]

+++ b/src/testlib/qtestaccessible.h
@@ -126,7 +126,7 @@ public:
 static void cleanup()
 {
 delete instance();
-instance() = 0;
+instance() = Q_NULLPTR;
 }

this is wrong

+++ b/src/testlib/qtestmouse.h
@@ -45,6 +45,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -57,12 +58,15 @@
 
 QT_BEGIN_NAMESPACE
 
-Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF & local, 
const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods = 
Qt::NoModifier);
+Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF &local, const 
QPointF &global, Qt::MouseButtons b, Qt::KeyboardModifiers mods, int 
timestamp);

default arguments removed, was this on purpose?

Otherwise lgtm
-- 
Milian Wolff | milian.wo...@kdab.com | Software Engineer
KDAB (Deutschland) GmbH&Co KG, a KDAB Group company
Tel: +49-30-521325470
KDAB - The Qt Experts
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtLocation.diff

[Blasche Alexander]

All clean.

The API is in TP at this stage. Hence any change would be permitted anyway.

--

Alex


From: development-bounces+alexander.blasche=theqtcompany@qt-project.org 
 on 
behalf of Frederik Gladhorn 
Sent: Thursday, September 17, 2015 12:54
To: development@qt-project.org
Subject: [Development] Qt 5.6.0 header diff: QtLocation.diff
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtWebEngineWidgets.diff

[Allan Sandfeld Jensen]

On Thursday 17 September 2015, Frederik Gladhorn wrote:
> 

Please also note the new APIs in QtWebEngineCore. They are more important for 
API review.

`Allan


___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtGui.diff

[Allan Sandfeld Jensen]

On Thursday 17 September 2015, Frederik Gladhorn wrote:
> 

What is with all the Q_NULLPTR? I thought we decided not to do those. Not that 
want them removed, that would be even more noise.

--- a/src/gui/painting/qpaintdevice.h
+++ b/src/gui/painting/qpaintdevice.h
static inline qreal devicePixelRatioFScale() {return 1000.0; }

That is an odd scale as fraction. I would prefer something that can be 
represented accurately as a fraction 2^20 for instance, otherwise we get 
rounding issues.

Regards
`Allan


___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtGui.diff

[Gunnar Sletta]

Also looks ok.

> On 17 Sep 2015, at 12:54, Frederik Gladhorn 
>  wrote:
> 
> ___
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtWebChannel.diff

[Qi Liang]

Looks good.

Regards,
Liang


From: development-bounces+liang.qi=theqtcompany@qt-project.org 
 on behalf of 
Frederik Gladhorn 
Sent: Thursday, September 17, 2015 12:54 PM
To: development@qt-project.org
Subject: [Development] Qt 5.6.0 header diff: QtWebChannel.diff
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Qt 5.6.0 header diff: QtWebSockets.diff

[Qi Liang]

Looks good(nothing changed).

Regards,
Liang


From: development-bounces+liang.qi=theqtcompany@qt-project.org 
 on behalf of 
Frederik Gladhorn 
Sent: Thursday, September 17, 2015 12:56 PM
To: development@qt-project.org
Subject: [Development] Qt 5.6.0 header diff: QtWebSockets.diff
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] How to speed up QML for KDE5 without QML compiler

[Hausmann Simon]

Hi,

I think there's a trade-off to be made with regards source (url) vs. 
sourceComponent.

If the component your loader is trying to load is small, then you're better off 
using sourceComponent. While
the parser and the type compiler is "warm" it should take little time to do the 
one-time work of compiling it. It
would take a fair bit of additional CPU cycles to schedule a load of an 
external file, fire up the parser and the
type compiler for just a few lines. If the component is big, then it's 
definitely worth it to use source (url) instead
of sourceComponent.

So there are two "curves" that meet at some point. As long as your component is 
small, I'd keep it inline. When it
grows, move it into a separate file.

Simon


From: development-bounces+simon.hausmann=theqtcompany@qt-project.org 
 on behalf 
of Guenter Schwann 
Sent: Wednesday, September 16, 2015 12:12
To: development@qt-project.org
Subject: Re: [Development] How to speed up QML for KDE5 without QML compiler

On Wednesday 16 September 2015 12:03:38 Leslie Zhai wrote:
> Hi great Qt and KDE developers,
>
> I like QML, it is high speed development language, easy to create candy
> UI and not difficult to debug. KDE4 began to use it in some projects,
> for example, KScreen`s kcm module, it used QML to take place of
> traditional QWidget. and KDE5, it is full of QML, for example, kwin`s
> tabbox, plasma-desktop and plasma-workspace`s applet, sddm, etc.
>
> For a new PC,  there is no sharp difference between QML and QWidget, but
> in a very very old PC, how old? about 7 years ago, QML is very slow! and
> it needs to close all effects for KDE5, even that when clicked, for
> example, calendar applet, it hang about 3+ seconds to showPopup.
>
> There is commercial QML compiler, a very small example tried to use it
> https://github.com/AOSC-Dev/AOSC-VersionHelper2
> But is it suitable for huge projects just like KDE5 if bought a
> commercial license? because not all KF5 components follow the Qt Quick
> Compiler`s resource.qrc way, so is it able to compile? for example,
> kickoff applet (the start menu of KDE5).

Hi,

One generic advise is to use the Loader item a lot. So only visible/needed
items are created.
This helps a lot for the startup performance.

And in the Loader rather use the source instead of the sourceComponent
property (or use the setSource() function). As the sourceComponent still
parses all stuff (although the binding is the biggest time consumer usually).

It will make your code more complex. And of course has it's limits and might
not be your biggest bottleneck. But usually helps a lot.

--
Guenter Schwann

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Sending key events on Qt 5.5.0

[Bo Thorsen]

That's completely besides the point I was making. I'm saying you 
shouldn't abuse the shortcuts as a message system (which is exactly what 
you do). If you want to send events, find another way.

Bo.

Den 17-09-2015 kl. 12:16 skrev christian.paffhau...@ehrhardt-partner.com:
>
> Hi Bo Thorsen,
>
> thanks for that. But it's a little bit more complicated. There is no
> PushButton. We record all keyboard input events, buffer them in a own key
> event class, which is derived by QKeyEvent, and accepting the original
> events. So the original key event will never reach the action. If our
> internal states say ready for keyboard input, we sending our key event via
> QApplication::sendEvent. In this part of the code, i know nothing about a
> action somewhere. I only know about incoming key events and resending them.
>
> The PushButton was only a demonstrator :-)
>
> Regards
> Christian
>
> Mit freundlichen Grüßen / Best regards
>
> Ehrhardt + Partner GmbH & Co. KG
>
> i.A. Christian Paffhausen
> Software Developer
>
> Development Group User Interfaces
>
> **
> Ehrhardt + Partner GmbH & Co. KG
> Software - Systeme für Warehouse - Logistik
> Alte Roemerstrasse 3
> D-56154 Boppard-Buchholz
> Handelsregister Koblenz HRA 4605
> GF Marco Ehrhardt
> Tel. : (+49) 67 42 / 87 27 0
> Fax : (+49) 67 42 / 87 27 50
> E-Mail: i...@ehrhardt-partner.com
> Internet: www.ehrhardt-partner.com
>
> (Embedded image moved to file: pic13977.jpg)
>
>
>
>
> From: Bo Thorsen 
> To:   development@qt-project.org
> Date: 17.09.2015 11:37
> Subject:  Re: [Development] Sending key events on Qt 5.5.0
> Sent by:  development-bounces
>  +christian.paffhausen=ehrhardt-partner@qt-project.org
>
>
>
> Den 17-09-2015 kl. 11:21 skrev christian.paffhau...@ehrhardt-partner.com:
>> i have a problem with manually sending key events and shortcuts on Qt
>> 5.5.0.
>>
>> In our application, we have a QAction with a F5 shortcut in a toolbar.
> When
>> i press the toolbutton everything works fine. When i press the F5 key on
> my
>> keyboard too.
>> But when i press a pushbutton, where the connected slot generate a
>> QKeyEvent and send this event via QApplication::sendEvent nothing will
>> happen.
>> With Qt 5.4.1 it works, but with 5.5.0 not.
>>
>> I have attached a small example app, which describes my problem.
>>
>> Is this problem already known? Have you a patch or work around for me?
>
> Hi Christian,
>
> The solution: tAction->trigger()
>
> I'm not trying to be cute or anything. This is what you should do.
> Abusing the short cut system to send messages between widgets is a bad
> idea.
>
> That said, I also think you should report this as a bug. The behaviour
> change between 5.4 and 5.5 is bad. But I've seen 5.5 behaviour change
> bug reports closed as invalid for weird reasons, so you might not have
> any luck.
>
> I hope this helps.
>
> Bo Thorsen,
> Director, Viking Software.
>
> --
> Viking Software
> Qt and C++ developers for hire
> http://www.vikingsoft.eu
> ___
> Development mailing list
> Development@qt-project.org
> http://lists.qt-project.org/mailman/listinfo/development
>

Bo Thorsen,
Director, Viking Software.

-- 
Viking Software
Qt and C++ developers for hire
http://www.vikingsoft.eu
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtQml.diff

[Frederik Gladhorn]

diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h
index 559c492..5d65982 100644
--- a/src/qml/debugger/qqmldebug.h
+++ b/src/qml/debugger/qqmldebug.h
@@ -50,6 +50,8 @@ struct Q_QML_EXPORT QQmlDebuggingEnabler
 QQmlDebuggingEnabler(bool printWarning = true);
 static bool startTcpDebugServer(int port, StartMode mode = DoNotWaitForClient,
 const QString &hostName = QString());
+static bool connectToLocalDebugger(const QString &socketFileName,
+   StartMode mode = DoNotWaitForClient);
 };
 
 // Execute code in constructor before first QQmlEngine is instantiated
diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h
index 8c866c5..121c83d 100644
--- a/src/qml/qml/qqmlcomponent.h
+++ b/src/qml/qml/qqmlcomponent.h
@@ -63,8 +63,8 @@ class Q_QML_EXPORT QQmlComponent : public QObject
 Q_PROPERTY(QUrl url READ url CONSTANT)
 
 public:
-Q_ENUMS(CompilationMode)
 enum CompilationMode { PreferSynchronous, Asynchronous };
+Q_ENUM(CompilationMode)
 
 QQmlComponent(QObject *parent = 0);
 QQmlComponent(QQmlEngine *, QObject *parent=0);
@@ -74,8 +74,8 @@ public:
 QQmlComponent(QQmlEngine *, const QUrl &url, CompilationMode mode, QObject *parent = 0);
 virtual ~QQmlComponent();
 
-Q_ENUMS(Status)
 enum Status { Null, Ready, Loading, Error };
+Q_ENUM(Status)
 Status status() const;
 
 bool isNull() const;
@@ -125,7 +125,6 @@ private:
 
 QT_END_NAMESPACE
 
-Q_DECLARE_METATYPE(QQmlComponent::Status)
 QML_DECLARE_TYPE(QQmlComponent)
 QML_DECLARE_TYPEINFO(QQmlComponent, QML_HAS_ATTACHED_PROPERTIES)
 
diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h
index c714846..e69a2f8 100644
--- a/src/qml/qml/qqmlcontext.h
+++ b/src/qml/qml/qqmlcontext.h
@@ -72,6 +72,7 @@ public:
 void setContextProperty(const QString &, QObject *);
 void setContextProperty(const QString &, const QVariant &);
 
+// ### Qt 6: no need for a mutable object, this should become a const QObject pointer
 QString nameForObject(QObject *) const;
 
 QUrl resolvedUrl(const QUrl &);
diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h
index df673c1..61a8842 100644
--- a/src/qml/qml/qqmlengine.h
+++ b/src/qml/qml/qqmlengine.h
@@ -52,7 +52,9 @@ public:
 Image,
 Pixmap,
 Texture,
-Invalid
+Invalid,
+ImageResponse
+// ### Qt6: reorder these, and give Invalid a fixed large value
 };
 
 enum Flag {
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtNetwork.diff

[Frederik Gladhorn]

diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h
index 352daa9..326891b 100644
--- a/src/network/access/qabstractnetworkcache.h
+++ b/src/network/access/qabstractnetworkcache.h
@@ -60,9 +60,12 @@ public:
 QNetworkCacheMetaData(const QNetworkCacheMetaData &other);
 ~QNetworkCacheMetaData();
 
+#ifdef Q_COMPILER_RVALUE_REFS
+QNetworkCacheMetaData &operator=(QNetworkCacheMetaData &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
 QNetworkCacheMetaData &operator=(const QNetworkCacheMetaData &other);
 
-void swap(QNetworkCacheMetaData &other)
+void swap(QNetworkCacheMetaData &other) Q_DECL_NOTHROW
 { qSwap(d, other.d); }
 
 bool operator==(const QNetworkCacheMetaData &other) const;
@@ -121,7 +124,7 @@ public Q_SLOTS:
 virtual void clear() = 0;
 
 protected:
-explicit QAbstractNetworkCache(QObject *parent = 0);
+explicit QAbstractNetworkCache(QObject *parent = Q_NULLPTR);
 QAbstractNetworkCache(QAbstractNetworkCachePrivate &dd, QObject *parent);
 
 private:
diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h
index 2e08a3d..5f865c0 100644
--- a/src/network/access/qhttpmultipart.h
+++ b/src/network/access/qhttpmultipart.h
@@ -51,9 +51,12 @@ public:
 QHttpPart();
 QHttpPart(const QHttpPart &other);
 ~QHttpPart();
+#ifdef Q_COMPILER_RVALUE_REFS
+QHttpPart &operator=(QHttpPart &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
 QHttpPart &operator=(const QHttpPart &other);
 
-void swap(QHttpPart &other) { qSwap(d, other.d); }
+void swap(QHttpPart &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
 
 bool operator==(const QHttpPart &other) const;
 inline bool operator!=(const QHttpPart &other) const
@@ -88,8 +91,8 @@ public:
 AlternativeType
 };
 
-explicit QHttpMultiPart(QObject *parent = 0);
-explicit QHttpMultiPart(ContentType contentType, QObject *parent = 0);
+explicit QHttpMultiPart(QObject *parent = Q_NULLPTR);
+explicit QHttpMultiPart(ContentType contentType, QObject *parent = Q_NULLPTR);
 ~QHttpMultiPart();
 
 void append(const QHttpPart &httpPart);
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 988eafa..c8df213 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -90,7 +90,7 @@ public:
 };
 #endif
 
-explicit QNetworkAccessManager(QObject *parent = 0);
+explicit QNetworkAccessManager(QObject *parent = Q_NULLPTR);
 ~QNetworkAccessManager();
 
 // ### Qt 6: turn into virtual
@@ -120,7 +120,7 @@ public:
 QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
 QNetworkReply *put(const QNetworkRequest &request, QHttpMultiPart *multiPart);
 QNetworkReply *deleteResource(const QNetworkRequest &request);
-QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = 0);
+QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = Q_NULLPTR);
 
 #ifndef QT_NO_BEARERMANAGEMENT
 void setConfiguration(const QNetworkConfiguration &config);
@@ -157,7 +157,7 @@ Q_SIGNALS:
 
 protected:
 virtual QNetworkReply *createRequest(Operation op, const QNetworkRequest &request,
- QIODevice *outgoingData = 0);
+ QIODevice *outgoingData = Q_NULLPTR);
 
 protected Q_SLOTS:
 QStringList supportedSchemesImplementation() const;
diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h
index 2da86d3..27925c8 100644
--- a/src/network/access/qnetworkcookie.h
+++ b/src/network/access/qnetworkcookie.h
@@ -59,9 +59,12 @@ public:
 explicit QNetworkCookie(const QByteArray &name = QByteArray(), const QByteArray &value = QByteArray());
 QNetworkCookie(const QNetworkCookie &other);
 ~QNetworkCookie();
+#ifdef Q_COMPILER_RVALUE_REFS
+QNetworkCookie &operator=(QNetworkCookie &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
 QNetworkCookie &operator=(const QNetworkCookie &other);
 
-void swap(QNetworkCookie &other) { qSwap(d, other.d); }
+void swap(QNetworkCookie &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
 
 bool operator==(const QNetworkCookie &other) const;
 inline bool operator!=(const QNetworkCookie &other) const
diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h
index 59ba7f8..3ac78ea 100644
--- a/src/network/access/qnetworkcookiejar.h
+++ b/src/network/access/qnetworkcookiejar.h
@@ -47,7 +47,7 @@ class Q_NETWORK_EXPORT QNetworkCookieJar: public QObject
 {
 Q_OBJECT
 public:
-explicit QNetworkCookieJar(QObject *parent = 0);
+explicit QNetworkCookieJar(QObject *parent = Q_NULLPTR);
 virtual ~QNetworkCookieJar();
 
 virtual QList co

[Development] Qt 5.6.0 header diff: QtOpenGL.diff

[Frederik Gladhorn]

diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h
index 8c55cff..99abdd2 100644
--- a/src/opengl/qgl.h
+++ b/src/opengl/qgl.h
@@ -235,7 +235,7 @@ public:
 QGLContext(const QGLFormat& format);
 virtual ~QGLContext();
 
-virtual bool create(const QGLContext* shareContext = 0);
+virtual bool create(const QGLContext* shareContext = Q_NULLPTR);
 bool isValid() const;
 bool isSharing() const;
 void reset();
@@ -303,7 +303,7 @@ public:
 QOpenGLContext *contextHandle() const;
 
 protected:
-virtual bool chooseContext(const QGLContext* shareContext = 0);
+virtual bool chooseContext(const QGLContext* shareContext = Q_NULLPTR);
 
 bool deviceIsPixmap() const;
 bool windowCreated() const;
@@ -356,12 +356,12 @@ class Q_OPENGL_EXPORT QGLWidget : public QWidget
 Q_OBJECT
 Q_DECLARE_PRIVATE(QGLWidget)
 public:
-explicit QGLWidget(QWidget* parent=0,
-   const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
-explicit QGLWidget(QGLContext *context, QWidget* parent=0,
-   const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
-explicit QGLWidget(const QGLFormat& format, QWidget* parent=0,
-   const QGLWidget* shareWidget = 0, Qt::WindowFlags f=0);
+explicit QGLWidget(QWidget* parent=Q_NULLPTR,
+   const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags());
+explicit QGLWidget(QGLContext *context, QWidget* parent=Q_NULLPTR,
+   const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags());
+explicit QGLWidget(const QGLFormat& format, QWidget* parent=Q_NULLPTR,
+   const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags());
 ~QGLWidget();
 
 void qglColor(const QColor& c) const;
@@ -380,7 +380,7 @@ public:
 void setFormat(const QGLFormat& format);
 
 QGLContext* context() const;
-void setContext(QGLContext* context, const QGLContext* shareContext = 0,
+void setContext(QGLContext* context, const QGLContext* shareContext = Q_NULLPTR,
 bool deleteOldContext = true);
 
 QPixmap renderPixmap(int w = 0, int h = 0, bool useContext = false);
@@ -442,9 +442,9 @@ protected:
 
 QGLWidget(QGLWidgetPrivate &dd,
   const QGLFormat &format = QGLFormat(),
-  QWidget *parent = 0,
-  const QGLWidget* shareWidget = 0,
-  Qt::WindowFlags f = 0);
+  QWidget *parent = Q_NULLPTR,
+  const QGLWidget* shareWidget = Q_NULLPTR,
+  Qt::WindowFlags f = Qt::WindowFlags());
 private:
 Q_DISABLE_COPY(QGLWidget)
 
diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h
index e424ff2..67b1a68 100644
--- a/src/opengl/qglbuffer.h
+++ b/src/opengl/qglbuffer.h
@@ -103,7 +103,7 @@ public:
 void write(int offset, const void *data, int count);
 
 void allocate(const void *data, int count);
-inline void allocate(int count) { allocate(0, count); }
+inline void allocate(int count) { allocate(Q_NULLPTR, count); }
 
 void *map(QGLBuffer::Access access);
 bool unmap();
diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h
index f16f94c..53031fd 100644
--- a/src/opengl/qglcolormap.h
+++ b/src/opengl/qglcolormap.h
@@ -63,7 +63,7 @@ public:
 intfindNearest(QRgb color) const;
 
 protected:
-Qt::HANDLE handle() { return d ? d->cmapHandle : 0; }
+Qt::HANDLE handle() { return d ? d->cmapHandle : Q_NULLPTR; }
 void setHandle(Qt::HANDLE ahandle) { d->cmapHandle = ahandle; }
 
 private:
diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h
index 80b8596..ddb7b89 100644
--- a/src/opengl/qglfunctions.h
+++ b/src/opengl/qglfunctions.h
@@ -70,7 +70,7 @@ public:
 QGLFunctions::OpenGLFeatures openGLFeatures() const;
 bool hasOpenGLFeature(QGLFunctions::OpenGLFeature feature) const;
 
-void initializeGLFunctions(const QGLContext *context = 0);
+void initializeGLFunctions(const QGLContext *context = Q_NULLPTR);
 
 void glActiveTexture(GLenum texture);
 void glAttachShader(GLuint program, GLuint shader);
@@ -172,14 +172,14 @@ public:
 
 private:
 QGLFunctionsPrivate *d_ptr;
-static bool isInitialized(const QGLFunctionsPrivate *d) { return d != 0; }
+static bool isInitialized(const QGLFunctionsPrivate *d) { return d != Q_NULLPTR; }
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFunctions::OpenGLFeatures)
 
 struct QGLFunctionsPrivate
 {
-QGLFunctionsPrivate(const QGLContext *context = 0);
+QGLFunctionsPrivate(const QGLContext *context = Q_NULLPTR);
 QOpenGLFunctions *funcs;
 };
 
diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h
index 0f0110d..2aad76b 100644
--- a/src/opengl/qglpixelbuffer.h
+++ b/src/opengl/qglpixelbuffer.h
@@ -47,9 +47,9 @@ class Q_OPENGL_EXPORT QGLPixelBuffer : public QPaintDevice
 Q_DECLARE_PRIVATE(QGLPixelBuffer)
 public:
 QGLPixelBuffer(co

[Development] Qt 5.6.0 header diff: QtBluetooth.diff

[Frederik Gladhorn]

diff --git a/src/bluetooth/qbluetoothlocaldevice.h b/src/bluetooth/qbluetoothlocaldevice.h
index 4587bbf..40e143a 100644
--- a/src/bluetooth/qbluetoothlocaldevice.h
+++ b/src/bluetooth/qbluetoothlocaldevice.h
@@ -113,4 +113,8 @@ private:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QBluetoothLocalDevice::Pairing)
+Q_DECLARE_METATYPE(QBluetoothLocalDevice::HostMode)
+Q_DECLARE_METATYPE(QBluetoothLocalDevice::Error)
+
 #endif // QBLUETOOTHLOCALDEVICE_H
diff --git a/src/bluetooth/qbluetoothservicediscoveryagent.h b/src/bluetooth/qbluetoothservicediscoveryagent.h
index cf75650..984a408 100644
--- a/src/bluetooth/qbluetoothservicediscoveryagent.h
+++ b/src/bluetooth/qbluetoothservicediscoveryagent.h
@@ -114,6 +114,7 @@ private:
 #ifdef QT_BLUEZ_BLUETOOTH
 Q_PRIVATE_SLOT(d_func(), void _q_discoveredServices(QDBusPendingCallWatcher*))
 Q_PRIVATE_SLOT(d_func(), void _q_createdDevice(QDBusPendingCallWatcher*))
+Q_PRIVATE_SLOT(d_func(), void _q_foundDevice(QDBusPendingCallWatcher*))
 Q_PRIVATE_SLOT(d_func(), void _q_sdpScannerDone(int,QProcess::ExitStatus))
 #endif
 #ifdef QT_ANDROID_BLUETOOTH
diff --git a/src/bluetooth/qbluetoothsocket.h b/src/bluetooth/qbluetoothsocket.h
index 0ec6a59..5d686d7 100644
--- a/src/bluetooth/qbluetoothsocket.h
+++ b/src/bluetooth/qbluetoothsocket.h
@@ -36,12 +36,13 @@
 
 #include 
 
-#include 
-#include 
-#include 
+#include 
+#include 
+#include 
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
@@ -129,6 +130,9 @@ public:
 //bool waitForDisconnected(int msecs = 3);
 //virtual bool waitForReadyRead(int msecs = 3);
 
+void setPreferredSecurityFlags(QBluetooth::SecurityFlags flags);
+QBluetooth::SecurityFlags preferredSecurityFlags() const;
+
 Q_SIGNALS:
 void connected();
 void disconnected();
diff --git a/src/bluetooth/qbluetoothtransferreply.h b/src/bluetooth/qbluetoothtransferreply.h
index 428e3cd..755b9ca 100644
--- a/src/bluetooth/qbluetoothtransferreply.h
+++ b/src/bluetooth/qbluetoothtransferreply.h
@@ -96,4 +96,6 @@ private:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QBluetoothTransferReply::TransferError)
+
 #endif // QBLUETOOTHTRANSFERREPLY_H
diff --git a/src/bluetooth/qlowenergycontroller.h b/src/bluetooth/qlowenergycontroller.h
index fd23023..be729dd 100644
--- a/src/bluetooth/qlowenergycontroller.h
+++ b/src/bluetooth/qlowenergycontroller.h
@@ -119,4 +119,8 @@ private:
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QLowEnergyController::Error)
+Q_DECLARE_METATYPE(QLowEnergyController::ControllerState)
+Q_DECLARE_METATYPE(QLowEnergyController::RemoteAddressType)
+
 #endif // QLOWENERGYCONTROLLER_H
diff --git a/src/bluetooth/qlowenergyservice.h b/src/bluetooth/qlowenergyservice.h
index dc03419..524650c 100644
--- a/src/bluetooth/qlowenergyservice.h
+++ b/src/bluetooth/qlowenergyservice.h
@@ -134,4 +134,9 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLowEnergyService::ServiceTypes)
 
 QT_END_NAMESPACE
 
+Q_DECLARE_METATYPE(QLowEnergyService::ServiceError)
+Q_DECLARE_METATYPE(QLowEnergyService::ServiceState)
+Q_DECLARE_METATYPE(QLowEnergyService::ServiceType)
+Q_DECLARE_METATYPE(QLowEnergyService::WriteMode)
+
 #endif // QLOWENERGYSERVICE_H
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtWebEngineWidgets.diff

[Frederik Gladhorn]

diff --git a/src/webenginewidgets/api/qwebenginecertificateerror.h b/src/webenginewidgets/api/qwebenginecertificateerror.h
index 90b2320..7706ea3 100644
--- a/src/webenginewidgets/api/qwebenginecertificateerror.h
+++ b/src/webenginewidgets/api/qwebenginecertificateerror.h
@@ -37,10 +37,10 @@
 #ifndef QWEBENGINECERTIFICATEERROR_H
 #define QWEBENGINECERTIFICATEERROR_H
 
-#include "qtwebenginewidgetsglobal.h"
+#include 
 
-#include 
-#include 
+#include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebenginedownloaditem.h b/src/webenginewidgets/api/qwebenginedownloaditem.h
index d362131..1428ad4 100644
--- a/src/webenginewidgets/api/qwebenginedownloaditem.h
+++ b/src/webenginewidgets/api/qwebenginedownloaditem.h
@@ -37,9 +37,9 @@
 #ifndef QWEBENGINEDOWNLOADITEM_H
 #define QWEBENGINEDOWNLOADITEM_H
 
-#include "qtwebenginewidgetsglobal.h"
+#include 
 
-#include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/webenginewidgets/api/qwebenginepage.h b/src/webenginewidgets/api/qwebenginepage.h
index b4cf522..90fa62f 100644
--- a/src/webenginewidgets/api/qwebenginepage.h
+++ b/src/webenginewidgets/api/qwebenginepage.h
@@ -39,6 +39,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -56,37 +57,6 @@ class QWebEngineProfile;
 class QWebEngineScriptCollection;
 class QWebEngineSettings;
 
-namespace QtWebEnginePrivate {
-
-template 
-class QWebEngineCallbackPrivateBase : public QSharedData {
-public:
-virtual ~QWebEngineCallbackPrivateBase() {}
-virtual void operator()(T) = 0;
-};
-
-template 
-class QWebEngineCallbackPrivate : public QWebEngineCallbackPrivateBase {
-public:
-QWebEngineCallbackPrivate(F callable) : m_callable(callable) {}
-virtual void operator()(T value) Q_DECL_OVERRIDE { m_callable(value); }
-private:
-F m_callable;
-};
-
-} // namespace QtWebEnginePrivate
-
-template 
-class QWebEngineCallback {
-public:
-template 
-QWebEngineCallback(F f) : d(new QtWebEnginePrivate::QWebEngineCallbackPrivate(f)) { }
-QWebEngineCallback() { }
-private:
-QExplicitlySharedDataPointer > d;
-friend class QWebEnginePage;
-};
-
 class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
 Q_OBJECT
 Q_PROPERTY(QString selectedText READ selectedText)
@@ -98,6 +68,7 @@ class QWEBENGINEWIDGETS_EXPORT QWebEnginePage : public QObject {
 Q_PROPERTY(QString title READ title)
 Q_PROPERTY(QUrl url READ url WRITE setUrl)
 Q_PROPERTY(QUrl iconUrl READ iconUrl)
+Q_PROPERTY(QColor backgroundColor READ backgroundColor WRITE setBackgroundColor)
 
 public:
 enum WebAction {
@@ -118,6 +89,26 @@ public:
 
 PasteAndMatchStyle,
 
+OpenLinkInThisWindow,
+OpenLinkInNewWindow,
+OpenLinkInNewTab,
+CopyLinkToClipboard,
+DownloadLinkToDisk,
+
+CopyImageToClipboard,
+CopyImageUrlToClipboard,
+DownloadImageToDisk,
+
+CopyMediaUrlToClipboard,
+ToggleMediaControls,
+ToggleMediaLoop,
+ToggleMediaPlayPause,
+ToggleMediaMute,
+DownloadMediaToDisk,
+
+InspectElement,
+ExitFullScreen,
+
 WebActionCount
 };
 
@@ -174,6 +165,14 @@ public:
 ErrorMessageLevel
 };
 
+// must match WebContentsAdapterClient::RenderProcessTerminationStatus
+enum RenderProcessTerminationStatus {
+NormalTerminationStatus = 0,
+AbnormalTerminationStatus,
+CrashedTerminationStatus,
+KilledTerminationStatus
+};
+
 explicit QWebEnginePage(QObject *parent = 0);
 QWebEnginePage(QWebEngineProfile *profile, QObject *parent = 0);
 ~QWebEnginePage();
@@ -236,6 +235,8 @@ public:
 
 QWebChannel *webChannel() const;
 void setWebChannel(QWebChannel *);
+QColor backgroundColor() const;
+void setBackgroundColor(const QColor &color);
 
 Q_SIGNALS:
 void loadStarted();
@@ -244,6 +245,7 @@ Q_SIGNALS:
 
 void linkHovered(const QString &url);
 void selectionChanged();
+void fullScreenRequested(bool fullScreen);
 void geometryChangeRequested(const QRect& geom);
 void windowCloseRequested();
 
@@ -253,6 +255,8 @@ Q_SIGNALS:
 void authenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator);
 void proxyAuthenticationRequired(const QUrl &requestUrl, QAuthenticator *authenticator, const QString &proxyHost);
 
+void renderProcessTerminated(RenderProcessTerminationStatus terminationStatus, int exitCode);
+
 // Ex-QWebFrame signals
 void titleChanged(const QString &title);
 void urlChanged(const QUrl &url);
@@ -261,7 +265,6 @@ Q_SIGNALS:
 
 protected:
 virtual QWebEnginePage *createWindow(WebWindowType type);
-
 virtual QStringList chooseFiles(FileSelectionMode mode, const QStringList &oldFiles, const QStringList &acceptedMimeTypes);
 virtual void javaScriptAlert(const QUrl &securityOrigin, const QString& msg);
 virtual bool javaScriptConfirm(const QUrl &securityOrigin, const QString& ms

[Development] Qt 5.6.0 header diff: QtQuick.diff

[Frederik Gladhorn]

diff --git a/src/quick/items/qquickframebufferobject.h b/src/quick/items/qquickframebufferobject.h
index 4a0248c..7fb7262 100644
--- a/src/quick/items/qquickframebufferobject.h
+++ b/src/quick/items/qquickframebufferobject.h
@@ -49,6 +49,7 @@ class Q_QUICK_EXPORT QQuickFramebufferObject : public QQuickItem
 Q_DECLARE_PRIVATE(QQuickFramebufferObject)
 
 Q_PROPERTY(bool textureFollowsItemSize READ textureFollowsItemSize WRITE setTextureFollowsItemSize NOTIFY textureFollowsItemSizeChanged)
+Q_PROPERTY(bool mirrorVertically READ mirrorVertically WRITE setMirrorVertically NOTIFY mirrorVerticallyChanged)
 
 public:
 
@@ -73,6 +74,9 @@ public:
 bool textureFollowsItemSize() const;
 void setTextureFollowsItemSize(bool follows);
 
+bool mirrorVertically() const;
+void setMirrorVertically(bool enable);
+
 virtual Renderer *createRenderer() const = 0;
 
 bool isTextureProvider() const Q_DECL_OVERRIDE;
@@ -87,6 +91,7 @@ protected:
 
 Q_SIGNALS:
 void textureFollowsItemSizeChanged(bool);
+void mirrorVerticallyChanged(bool);
 
 private Q_SLOTS:
 void invalidateSceneGraph();
diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h
index 4631133..d92910c 100644
--- a/src/quick/items/qquickitem.h
+++ b/src/quick/items/qquickitem.h
@@ -141,7 +141,6 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus
 
 Q_PRIVATE_PROPERTY(QQuickItem::d_func(), QQuickItemLayer *layer READ layer DESIGNABLE false CONSTANT FINAL)
 
-Q_ENUMS(TransformOrigin)
 Q_CLASSINFO("DefaultProperty", "data")
 Q_CLASSINFO("qt_HasQmlAccessors", "true")
 
@@ -187,6 +186,7 @@ public:
 Left, Center, Right,
 BottomLeft, Bottom, BottomRight
 };
+Q_ENUM(TransformOrigin)
 
 QQuickItem(QQuickItem *parent = 0);
 virtual ~QQuickItem();
diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h
index 356e4a4..8c9ae2e 100644
--- a/src/quick/items/qquickpainteditem.h
+++ b/src/quick/items/qquickpainteditem.h
@@ -43,12 +43,13 @@ class QQuickPaintedItemPrivate;
 class Q_QUICK_EXPORT QQuickPaintedItem : public QQuickItem
 {
 Q_OBJECT
-Q_ENUMS(RenderTarget)
 
 Q_PROPERTY(QSize contentsSize READ contentsSize WRITE setContentsSize NOTIFY contentsSizeChanged)
 Q_PROPERTY(QColor fillColor READ fillColor WRITE setFillColor NOTIFY fillColorChanged)
 Q_PROPERTY(qreal contentsScale READ contentsScale WRITE setContentsScale NOTIFY contentsScaleChanged)
 Q_PROPERTY(RenderTarget renderTarget READ renderTarget WRITE setRenderTarget NOTIFY renderTargetChanged)
+Q_PROPERTY(QSize textureSize READ textureSize WRITE setTextureSize NOTIFY textureSizeChanged)
+
 public:
 QQuickPaintedItem(QQuickItem *parent = 0);
 virtual ~QQuickPaintedItem();
@@ -58,6 +59,7 @@ public:
 FramebufferObject,
 InvertedYFramebufferObject
 };
+Q_ENUM(RenderTarget)
 
 enum PerformanceHint {
 FastFBOResizing = 0x1
@@ -88,6 +90,9 @@ public:
 qreal contentsScale() const;
 void setContentsScale(qreal);
 
+QSize textureSize() const;
+void setTextureSize(const QSize &size);
+
 QColor fillColor() const;
 void setFillColor(const QColor&);
 
@@ -104,6 +109,7 @@ Q_SIGNALS:
 void contentsSizeChanged();
 void contentsScaleChanged();
 void renderTargetChanged();
+void textureSizeChanged();
 
 protected:
 QQuickPaintedItem(QQuickPaintedItemPrivate &dd, QQuickItem *parent = 0);
diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h
index f094c5a..80da0ba 100644
--- a/src/quick/items/qquickview.h
+++ b/src/quick/items/qquickview.h
@@ -53,7 +53,6 @@ class Q_QUICK_EXPORT QQuickView : public QQuickWindow
 Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
-Q_ENUMS(ResizeMode Status)
 public:
 explicit QQuickView(QWindow *parent = 0);
 QQuickView(QQmlEngine* engine, QWindow *parent);
@@ -68,10 +67,12 @@ public:
 QQuickItem *rootObject() const;
 
 enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
+Q_ENUM(ResizeMode)
 ResizeMode resizeMode() const;
 void setResizeMode(ResizeMode);
 
 enum Status { Null, Ready, Loading, Error };
+Q_ENUM(Status)
 Status status() const;
 
 QList errors() const;
diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h
index f7a1956..d5bf9fb 100644
--- a/src/quick/items/qquickwindow.h
+++ b/src/quick/items/qquickwindow.h
@@ -69,7 +69,8 @@ public:
 TextureHasAlphaChannel  = 0x0001,
 TextureHasMipmaps   = 0x0002,
 TextureOwnsGLTexture= 0x0004,
-TextureCanUseAtlas  = 0x0008
+TextureCanUseAtlas  = 0x0008,
+TextureIsOpaque = 0x0010
 };
 
 enum RenderStage {
@@ -77,7 +78,8 @@ public:
 AfterSynchroniz

[Development] Qt 5.6.0 header diff: QtSql.diff

[Frederik Gladhorn]

diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h
index e837576..c53e1b8 100644
--- a/src/sql/kernel/qsqldriver.h
+++ b/src/sql/kernel/qsqldriver.h
@@ -83,7 +83,7 @@ public:
 DB2
 };
 
-explicit QSqlDriver(QObject *parent=0);
+explicit QSqlDriver(QObject *parent = Q_NULLPTR);
 ~QSqlDriver();
 virtual bool isOpen() const;
 bool isOpenError() const;
@@ -133,7 +133,7 @@ Q_SIGNALS:
 void notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload);
 
 protected:
-QSqlDriver(QSqlDriverPrivate &dd, QObject *parent = 0);
+QSqlDriver(QSqlDriverPrivate &dd, QObject *parent = Q_NULLPTR);
 virtual void setOpen(bool o);
 virtual void setOpenError(bool e);
 virtual void setLastError(const QSqlError& e);
diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h
index 55b8c81..fd1a620 100644
--- a/src/sql/kernel/qsqldriverplugin.h
+++ b/src/sql/kernel/qsqldriverplugin.h
@@ -49,7 +49,7 @@ class Q_SQL_EXPORT QSqlDriverPlugin : public QObject
 {
 Q_OBJECT
 public:
-explicit QSqlDriverPlugin(QObject *parent = 0);
+explicit QSqlDriverPlugin(QObject *parent = Q_NULLPTR);
 ~QSqlDriverPlugin();
 
 virtual QSqlDriver *create(const QString &key) = 0;
diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h
index d3d4a7c..4a81d48 100644
--- a/src/sql/kernel/qsqlindex.h
+++ b/src/sql/kernel/qsqlindex.h
@@ -36,7 +36,10 @@
 
 #include 
 #include 
+#include 
+#if QT_DEPRECATED_SINCE(5,6)
 #include 
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -63,7 +66,7 @@ private:
 QString createField(int i, const QString& prefix, bool verbose) const;
 QString cursor;
 QString nm;
-QList sorts;
+QVector sorts;
 };
 
 QT_END_NAMESPACE
diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h
index 2d37b9a..5c7c22a 100644
--- a/src/sql/models/qsqlquerymodel.h
+++ b/src/sql/models/qsqlquerymodel.h
@@ -51,7 +51,7 @@ class Q_SQL_EXPORT QSqlQueryModel: public QAbstractTableModel
 Q_DECLARE_PRIVATE(QSqlQueryModel)
 
 public:
-explicit QSqlQueryModel(QObject *parent = 0);
+explicit QSqlQueryModel(QObject *parent = Q_NULLPTR);
 virtual ~QSqlQueryModel();
 
 int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
@@ -98,7 +98,7 @@ protected:
 
 virtual QModelIndex indexInQuery(const QModelIndex &item) const;
 void setLastError(const QSqlError &error);
-QSqlQueryModel(QSqlQueryModelPrivate &dd, QObject *parent = 0);
+QSqlQueryModel(QSqlQueryModelPrivate &dd, QObject *parent = Q_NULLPTR);
 };
 
 QT_END_NAMESPACE
diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h
index f747014..f2a546d 100644
--- a/src/sql/models/qsqlrelationaltablemodel.h
+++ b/src/sql/models/qsqlrelationaltablemodel.h
@@ -70,7 +70,7 @@ public:
 LeftJoin
 };
 
-explicit QSqlRelationalTableModel(QObject *parent = 0,
+explicit QSqlRelationalTableModel(QObject *parent = Q_NULLPTR,
   QSqlDatabase db = QSqlDatabase());
 virtual ~QSqlRelationalTableModel();
 
diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h
index a06abef..5481a77 100644
--- a/src/sql/models/qsqltablemodel.h
+++ b/src/sql/models/qsqltablemodel.h
@@ -53,7 +53,7 @@ class Q_SQL_EXPORT QSqlTableModel: public QSqlQueryModel
 public:
 enum EditStrategy {OnFieldChange, OnRowChange, OnManualSubmit};
 
-explicit QSqlTableModel(QObject *parent = 0, QSqlDatabase db = QSqlDatabase());
+explicit QSqlTableModel(QObject *parent = Q_NULLPTR, QSqlDatabase db = QSqlDatabase());
 virtual ~QSqlTableModel();
 
 virtual void setTable(const QString &tableName);
@@ -115,7 +115,7 @@ Q_SIGNALS:
 void beforeDelete(int row);
 
 protected:
-QSqlTableModel(QSqlTableModelPrivate &dd, QObject *parent = 0, QSqlDatabase db = QSqlDatabase());
+QSqlTableModel(QSqlTableModelPrivate &dd, QObject *parent = Q_NULLPTR, QSqlDatabase db = QSqlDatabase());
 
 virtual bool updateRowInTable(int row, const QSqlRecord &values);
 virtual bool insertRowIntoTable(const QSqlRecord &values);
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtWebSockets.diff

[Frederik Gladhorn]

diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h
index 9fdc6eb..7ee4bc6 100644
--- a/src/websockets/qwebsocket.h
+++ b/src/websockets/qwebsocket.h
@@ -36,6 +36,7 @@
 
 #include 
 #include 
+#include 
 #ifndef QT_NO_NETWORKPROXY
 #include 
 #endif
@@ -92,6 +93,7 @@ public:
 QWebSocketProtocol::Version version() const;
 QString resourceName() const;
 QUrl requestUrl() const;
+QNetworkRequest request() const;
 QString origin() const;
 QWebSocketProtocol::CloseCode closeCode() const;
 QString closeReason() const;
@@ -109,6 +111,7 @@ public Q_SLOTS:
 void close(QWebSocketProtocol::CloseCode closeCode = QWebSocketProtocol::CloseCodeNormal,
const QString &reason = QString());
 void open(const QUrl &url);
+void open(const QNetworkRequest &request);
 void ping(const QByteArray &payload = QByteArray());
 #ifndef QT_NO_SSL
 void ignoreSslErrors();
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtPrintSupport.diff

[Frederik Gladhorn]

diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h
index cf55cfa..6148502 100644
--- a/src/printsupport/dialogs/qabstractprintdialog.h
+++ b/src/printsupport/dialogs/qabstractprintdialog.h
@@ -74,7 +74,7 @@ public:
 Q_DECLARE_FLAGS(PrintDialogOptions, PrintDialogOption)
 
 #ifndef QT_NO_PRINTDIALOG
-explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = 0);
+explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR);
 ~QAbstractPrintDialog();
 
 virtual int exec() = 0;
@@ -101,7 +101,7 @@ public:
 QPrinter *printer() const;
 
 protected:
-QAbstractPrintDialog(QAbstractPrintDialogPrivate &ptr, QPrinter *printer, QWidget *parent = 0);
+QAbstractPrintDialog(QAbstractPrintDialogPrivate &ptr, QPrinter *printer, QWidget *parent = Q_NULLPTR);
 
 private:
 Q_DISABLE_COPY(QAbstractPrintDialog)
diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h
index 43b642b..824d63f 100644
--- a/src/printsupport/dialogs/qpagesetupdialog.h
+++ b/src/printsupport/dialogs/qpagesetupdialog.h
@@ -51,8 +51,8 @@ class Q_PRINTSUPPORT_EXPORT QPageSetupDialog : public QDialog
 Q_DECLARE_PRIVATE(QPageSetupDialog)
 
 public:
-explicit QPageSetupDialog(QPrinter *printer, QWidget *parent = 0);
-explicit QPageSetupDialog(QWidget *parent = 0);
+explicit QPageSetupDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR);
+explicit QPageSetupDialog(QWidget *parent = Q_NULLPTR);
 ~QPageSetupDialog();
 
 #if defined(Q_OS_MAC) || defined(Q_OS_WIN)
diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h
index 1332fcc..cf0115c 100644
--- a/src/printsupport/dialogs/qprintdialog.h
+++ b/src/printsupport/dialogs/qprintdialog.h
@@ -53,8 +53,8 @@ class Q_PRINTSUPPORT_EXPORT QPrintDialog : public QAbstractPrintDialog
 Q_PROPERTY(PrintDialogOptions options READ options WRITE setOptions)
 
 public:
-explicit QPrintDialog(QPrinter *printer, QWidget *parent = 0);
-explicit QPrintDialog(QWidget *parent = 0);
+explicit QPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR);
+explicit QPrintDialog(QWidget *parent = Q_NULLPTR);
 ~QPrintDialog();
 
 int exec() Q_DECL_OVERRIDE;
diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h
index 15e0271..228cd24 100644
--- a/src/printsupport/dialogs/qprintpreviewdialog.h
+++ b/src/printsupport/dialogs/qprintpreviewdialog.h
@@ -52,8 +52,9 @@ class Q_PRINTSUPPORT_EXPORT QPrintPreviewDialog : public QDialog
 Q_DECLARE_PRIVATE(QPrintPreviewDialog)
 
 public:
-explicit QPrintPreviewDialog(QWidget *parent = 0, Qt::WindowFlags flags = 0);
-explicit QPrintPreviewDialog(QPrinter *printer, QWidget *parent = 0, Qt::WindowFlags flags = 0);
+explicit QPrintPreviewDialog(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
+explicit QPrintPreviewDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR,
+ Qt::WindowFlags flags = Qt::WindowFlags());
 ~QPrintPreviewDialog();
 
 using QDialog::open;
diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h
index e88b421..16b388d 100644
--- a/src/printsupport/widgets/qprintpreviewwidget.h
+++ b/src/printsupport/widgets/qprintpreviewwidget.h
@@ -62,8 +62,9 @@ public:
 FitInView
 };
 
-explicit QPrintPreviewWidget(QPrinter *printer, QWidget *parent = 0, Qt::WindowFlags flags = 0);
-explicit QPrintPreviewWidget(QWidget *parent = 0, Qt::WindowFlags flags = 0);
+explicit QPrintPreviewWidget(QPrinter *printer, QWidget *parent = Q_NULLPTR,
+ Qt::WindowFlags flags = Qt::WindowFlags());
+explicit QPrintPreviewWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags());
 ~QPrintPreviewWidget();
 
 qreal zoomFactor() const;
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtXml.diff

[Frederik Gladhorn]

diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h
index 5a83659..f2bcf83 100644
--- a/src/xml/dom/qdom.h
+++ b/src/xml/dom/qdom.h
@@ -329,14 +329,14 @@ public:
 inline QDomNode::NodeType nodeType() const { return DocumentNode; }
 
 // Qt extensions
-bool setContent(const QByteArray& text, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(const QString& text, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(QXmlInputSource *source, bool namespaceProcessing, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(const QByteArray& text, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(const QString& text, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(QIODevice* dev, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
-bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg=0, int *errorLine=0, int *errorColumn=0 );
+bool setContent(const QByteArray& text, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(const QString& text, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(QIODevice* dev, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(QXmlInputSource *source, bool namespaceProcessing, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(const QByteArray& text, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(const QString& text, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(QIODevice* dev, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
+bool setContent(QXmlInputSource *source, QXmlReader *reader, QString *errorMsg=Q_NULLPTR, int *errorLine=Q_NULLPTR, int *errorColumn=Q_NULLPTR );
 
 // Qt extensions
 QString toString(int = 1) const;
diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h
index d7285fc..6bb9bfb 100644
--- a/src/xml/sax/qxml.h
+++ b/src/xml/sax/qxml.h
@@ -201,10 +201,10 @@ class Q_XML_EXPORT QXmlReader
 {
 public:
 virtual ~QXmlReader() {}
-virtual bool feature(const QString& name, bool *ok = 0) const = 0;
+virtual bool feature(const QString& name, bool *ok = Q_NULLPTR) const = 0;
 virtual void setFeature(const QString& name, bool value) = 0;
 virtual bool hasFeature(const QString& name) const = 0;
-virtual void* property(const QString& name, bool *ok = 0) const = 0;
+virtual void* property(const QString& name, bool *ok = Q_NULLPTR) const = 0;
 virtual void setProperty(const QString& name, void* value) = 0;
 virtual bool hasProperty(const QString& name) const = 0;
 virtual void setEntityResolver(QXmlEntityResolver* handler) = 0;
@@ -229,11 +229,11 @@ public:
 QXmlSimpleReader();
 virtual ~QXmlSimpleReader();
 
-bool feature(const QString& name, bool *ok = 0) const Q_DECL_OVERRIDE;
+bool feature(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE;
 void setFeature(const QString& name, bool value) Q_DECL_OVERRIDE;
 bool hasFeature(const QString& name) const Q_DECL_OVERRIDE;
 
-void* property(const QString& name, bool *ok = 0) const Q_DECL_OVERRIDE;
+void* property(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE;
 void setProperty(const QString& name, void* value) Q_DECL_OVERRIDE;
 bool hasProperty(const QString& name) const Q_DECL_OVERRIDE;
 
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtMultimedia.diff

[Frederik Gladhorn]

diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h
index 6395314..2ee66bc 100644
--- a/src/multimedia/audio/qaudio.h
+++ b/src/multimedia/audio/qaudio.h
@@ -51,12 +51,26 @@ namespace QAudio
 enum Error { NoError, OpenError, IOError, UnderrunError, FatalError };
 enum State { ActiveState, SuspendedState, StoppedState, IdleState };
 enum Mode { AudioInput, AudioOutput };
+
+enum Role {
+UnknownRole,
+MusicRole,
+VideoRole,
+VoiceCommunicationRole,
+AlarmRole,
+NotificationRole,
+RingtoneRole,
+AccessibilityRole,
+SonificationRole,
+GameRole
+};
 }
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Error error);
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::State state);
 Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Mode mode);
+Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug dbg, QAudio::Role role);
 #endif
 
 QT_END_NAMESPACE
@@ -64,5 +78,6 @@ QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QAudio::Error)
 Q_DECLARE_METATYPE(QAudio::State)
 Q_DECLARE_METATYPE(QAudio::Mode)
+Q_DECLARE_METATYPE(QAudio::Role)
 
 #endif // QAUDIO_H
diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h
index 735f111..437bf58 100644
--- a/src/multimedia/playback/qmediaplayer.h
+++ b/src/multimedia/playback/qmediaplayer.h
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -66,6 +67,7 @@ class Q_MULTIMEDIA_EXPORT QMediaPlayer : public QMediaObject
 Q_PROPERTY(qreal playbackRate READ playbackRate WRITE setPlaybackRate NOTIFY playbackRateChanged)
 Q_PROPERTY(State state READ state NOTIFY stateChanged)
 Q_PROPERTY(MediaStatus mediaStatus READ mediaStatus NOTIFY mediaStatusChanged)
+Q_PROPERTY(QAudio::Role audioRole READ audioRole WRITE setAudioRole)
 Q_PROPERTY(QString error READ errorString)
 Q_ENUMS(State)
 Q_ENUMS(MediaStatus)
@@ -151,6 +153,10 @@ public:
 
 QMultimedia::AvailabilityStatus availability() const;
 
+QAudio::Role audioRole() const;
+void setAudioRole(QAudio::Role audioRole);
+QList supportedAudioRoles() const;
+
 public Q_SLOTS:
 void play();
 void pause();
@@ -187,6 +193,8 @@ Q_SIGNALS:
 void seekableChanged(bool seekable);
 void playbackRateChanged(qreal rate);
 
+void audioRoleChanged(QAudio::Role role);
+
 void error(QMediaPlayer::Error error);
 
 void networkConfigurationChanged(const QNetworkConfiguration &configuration);
INFO - New header: src/multimedia/controls/qaudiorolecontrol.h
/
**
** Copyright (C) 2015 The Qt Company Ltd.
** Contact: http://www.qt.io/licensing/
**
** This file is part of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL21$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 2.1 or version 3 as published by the Free
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
** following information to ensure the GNU Lesser General Public License
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
**
** As a special exception, The Qt Company gives you certain additional
** rights. These rights are described in The Qt Company LGPL Exception
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
**
** $QT_END_LICENSE$
**
/

#ifndef QAUDIOROLECONTROL_H
#define QAUDIOROLECONTROL_H

#include 
#include 

QT_BEGIN_NAMESPACE

// Class forward declaration required for QDoc bug
class QString;

class Q_MULTIMEDIA_EXPORT QAudioRoleControl : public QMediaControl
{
Q_OBJECT

public:
virtual ~QAudioRoleControl();

virtual QAudio::Role audioRole() const = 0;
virtual void setAudioRole(QAudio::Role role) = 0;

virtual QList supportedAudioRoles() const = 0;

Q_SIGNALS:
void audioRoleChanged(QAudio::Role role);

protected:
explicit QAudioRoleControl(QObject *parent = 0);
};

#define QAudioRoleControl_iid "org.qt-project.qt.audiorolecontrol/5.6"
Q_MEDIA_DECLARE_CONTROL(QAudioRoleControl, QAudioRoleControl_iid)

QT_END_NAMESPACE

#endif // QAUDIOROLECONTROL_H
___

[Development] Qt 5.6.0 header diff: QtPositioning.diff

[Frederik Gladhorn]

diff --git a/src/positioning/qgeocoordinate.h b/src/positioning/qgeocoordinate.h
index a1a636d..3c08bc0 100644
--- a/src/positioning/qgeocoordinate.h
+++ b/src/positioning/qgeocoordinate.h
@@ -104,9 +104,10 @@ public:
 Q_INVOKABLE QString toString(CoordinateFormat format = DegreesMinutesSecondsWithHemisphere) const;
 
 private:
+QGeoCoordinate(QGeoCoordinatePrivate &dd);
 QSharedDataPointer d;
-
 friend class QGeoCoordinatePrivate;
+friend class QQuickGeoCoordinateAnimation;
 };
 
 Q_DECLARE_TYPEINFO(QGeoCoordinate, Q_MOVABLE_TYPE);
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtDBus.diff

[Frederik Gladhorn]

diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h
index 42b2667..a6bc396 100644
--- a/src/dbus/qdbusargument.h
+++ b/src/dbus/qdbusargument.h
@@ -70,9 +70,15 @@ public:
 
 QDBusArgument();
 QDBusArgument(const QDBusArgument &other);
+#ifdef Q_COMPILER_RVALUE_REFS
+QDBusArgument(QDBusArgument &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; }
+QDBusArgument &operator=(QDBusArgument &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
 QDBusArgument &operator=(const QDBusArgument &other);
 ~QDBusArgument();
 
+void swap(QDBusArgument &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
+
 // used for marshalling (Qt -> D-BUS)
 QDBusArgument &operator<<(uchar arg);
 QDBusArgument &operator<<(bool arg);
@@ -140,6 +146,7 @@ protected:
 friend class QDBusArgumentPrivate;
 mutable QDBusArgumentPrivate *d;
 };
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusArgument)
 
 QT_END_NAMESPACE
 Q_DECLARE_METATYPE(QDBusArgument)
@@ -147,7 +154,7 @@ QT_BEGIN_NAMESPACE
 
 template inline T qdbus_cast(const QDBusArgument &arg
 #ifndef Q_QDOC
-, T * = 0
+, T * = Q_NULLPTR
 #endif
 )
 {
@@ -158,7 +165,7 @@ template inline T qdbus_cast(const QDBusArgument &arg
 
 template inline T qdbus_cast(const QVariant &v
 #ifndef Q_QDOC
-, T * = 0
+, T * = Q_NULLPTR
 #endif
 )
 {
diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h
index 10598c0..8b2e923 100644
--- a/src/dbus/qdbusconnection.h
+++ b/src/dbus/qdbusconnection.h
@@ -99,11 +99,12 @@ public:
 ExportChildObjects = 0x1000
 // Reserved = 0xff00
 };
+Q_DECLARE_FLAGS(RegisterOptions, RegisterOption)
+
 enum UnregisterMode {
 UnregisterNode,
 UnregisterTree
 };
-Q_DECLARE_FLAGS(RegisterOptions, RegisterOption)
 
 enum VirtualObjectRegisterOption {
 SingleNode = 0x0,
@@ -121,9 +122,14 @@ public:
 
 explicit QDBusConnection(const QString &name);
 QDBusConnection(const QDBusConnection &other);
+#ifdef Q_COMPILER_RVALUE_REFS
+QDBusConnection(QDBusConnection &&other) Q_DECL_NOTHROW : d(other.d) { other.d = Q_NULLPTR; }
+QDBusConnection &operator=(QDBusConnection &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
+QDBusConnection &operator=(const QDBusConnection &other);
 ~QDBusConnection();
 
-QDBusConnection &operator=(const QDBusConnection &other);
+void swap(QDBusConnection &other) Q_DECL_NOTHROW { qSwap(d, other.d); }
 
 bool isConnected() const;
 QString baseService() const;
@@ -199,9 +205,11 @@ private:
 friend class QDBusConnectionPrivate;
 QDBusConnectionPrivate *d;
 };
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusConnection)
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::RegisterOptions)
 Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::VirtualObjectRegisterOptions)
+Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::ConnectionCapabilities)
 
 QT_END_NAMESPACE
 
diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h
index c2c0ff8..ce5275d 100644
--- a/src/dbus/qdbuserror.h
+++ b/src/dbus/qdbuserror.h
@@ -92,11 +92,25 @@ public:
 #endif
 QDBusError(ErrorType error, const QString &message);
 QDBusError(const QDBusError &other);
+#ifdef Q_COMPILER_RVALUE_REFS
+QDBusError(QDBusError &&other) Q_DECL_NOTHROW
+: code(other.code), msg(std::move(other.msg)), nm(std::move(other.nm)), unused(other.unused)
+{ other.unused = Q_NULLPTR; }
+QDBusError &operator=(QDBusError &&other) Q_DECL_NOTHROW { swap(other); return *this; }
+#endif
 QDBusError &operator=(const QDBusError &other);
 #ifndef QT_BOOTSTRAPPED
 QDBusError &operator=(const QDBusMessage &msg);
 #endif
 
+void swap(QDBusError &other) Q_DECL_NOTHROW
+{
+qSwap(code,   other.code);
+qSwap(msg,other.msg);
+qSwap(nm, other.nm);
+qSwap(unused, other.unused);
+}
+
 ErrorType type() const;
 QString name() const;
 QString message() const;
@@ -110,6 +124,7 @@ private:
 QString nm;
 void *unused;
 };
+Q_DECLARE_SHARED_NOT_MOVABLE_UNTIL_QT6(QDBusError)
 
 #ifndef QT_NO_DEBUG_STREAM
 Q_DBUS_EXPORT QDebug operator<<(QDebug, const QDBusError &);
diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h
index 390ff6c..8495b3a 100644
--- a/src/dbus/qdbusextratypes.h
+++ b/src/dbus/qdbusextratypes.h
@@ -39,7 +39,10 @@
 #include 
 #include 
 #include 
+#if QT_DEPRECATED_SINCE(5, 5)
 #include 
+#endif
+#include 
 
 #ifndef QT_NO_DBUS
 
@@ -50,11 +53,18 @@ class Q_DBUS_EXPORT QDBusObjectPath
 {
 QString m_path;
 public:
-inline QDBusObjectPath() { }
+QDBusObjectPath() Q_DECL_NOTHROW : m_path() {}
+// compiler-generated copy/move constructor/assignment operators are ok!
+// compiler-generated destructor is ok!
 
 inline explicit QDBusObjectPath(const char *path);
 inline explicit QDBusObjectPath(QLatin1String path);
 inline explicit QDBusObjectPath(const QString &path);
+#ifdef Q_COMP

[Development] Qt 5.6.0 header diff: QtSerialPort.diff

[Frederik Gladhorn]

diff --git a/src/serialport/qserialport.h b/src/serialport/qserialport.h
index 36ae788..2815ebe 100644
--- a/src/serialport/qserialport.h
+++ b/src/serialport/qserialport.h
@@ -65,9 +65,6 @@ class Q_SERIALPORT_EXPORT QSerialPort : public QIODevice
 #endif
 Q_PROPERTY(bool breakEnabled READ isBreakEnabled WRITE setBreakEnabled NOTIFY breakEnabledChanged)
 
-Q_ENUMS(BaudRate DataBits Parity StopBits FlowControl DataErrorPolicy SerialPortError)
-Q_FLAGS(Directions PinoutSignals)
-
 #if defined(Q_OS_WIN32) || defined(Q_OS_WINCE)
 typedef void* Handle;
 #else
@@ -81,6 +78,7 @@ public:
 Output = 2,
 AllDirections = Input | Output
 };
+Q_FLAG(Direction)
 Q_DECLARE_FLAGS(Directions, Direction)
 
 enum BaudRate {
@@ -94,6 +92,7 @@ public:
 Baud115200 = 115200,
 UnknownBaud = -1
 };
+Q_ENUM(BaudRate)
 
 enum DataBits {
 Data5 = 5,
@@ -102,6 +101,7 @@ public:
 Data8 = 8,
 UnknownDataBits = -1
 };
+Q_ENUM(DataBits)
 
 enum Parity {
 NoParity = 0,
@@ -111,6 +111,7 @@ public:
 MarkParity = 5,
 UnknownParity = -1
 };
+Q_ENUM(Parity)
 
 enum StopBits {
 OneStop = 1,
@@ -118,6 +119,7 @@ public:
 TwoStop = 2,
 UnknownStopBits = -1
 };
+Q_ENUM(StopBits)
 
 enum FlowControl {
 NoFlowControl,
@@ -125,6 +127,7 @@ public:
 SoftwareControl,
 UnknownFlowControl = -1
 };
+Q_ENUM(FlowControl)
 
 enum PinoutSignal {
 NoSignal = 0x00,
@@ -139,6 +142,7 @@ public:
 SecondaryTransmittedDataSignal = 0x100,
 SecondaryReceivedDataSignal = 0x200
 };
+Q_FLAG(PinoutSignal)
 Q_DECLARE_FLAGS(PinoutSignals, PinoutSignal)
 
 #if QT_DEPRECATED_SINCE(5, 2)
@@ -161,6 +165,7 @@ public:
 StopReceivingPolicy,
 UnknownPolicy = -1
 };
+Q_ENUM(DataErrorPolicy)
 #endif
 
 enum SerialPortError {
@@ -179,6 +184,7 @@ public:
 TimeoutError,
 NotOpenError
 };
+Q_ENUM(SerialPortError)
 
 explicit QSerialPort(QObject *parent = Q_NULLPTR);
 explicit QSerialPort(const QString &name, QObject *parent = Q_NULLPTR);
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtTest.diff

[Frederik Gladhorn]

diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index cfde89a..1751220 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -82,7 +82,7 @@ public:
 }
 
 if (!QMetaObject::connect(obj, sigIndex, this, memberOffset,
-Qt::DirectConnection, 0)) {
+Qt::DirectConnection, Q_NULLPTR)) {
 qWarning("QSignalSpy: QMetaObject::connect returned false. Unable to connect.");
 return;
 }
diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h
index 9941799..8da16af 100644
--- a/src/testlib/qtest.h
+++ b/src/testlib/qtest.h
@@ -51,6 +51,9 @@
 #include 
 #include 
 
+#ifdef QT_NETWORK_LIB
+#  include 
+#endif
 
 QT_BEGIN_NAMESPACE
 
@@ -162,6 +165,23 @@ template<> inline char *toString(const QVariant &v)
 return qstrdup(vstring.constData());
 }
 
+#ifdef QT_NETWORK_LIB
+template<> inline char *toString(const QHostAddress &addr)
+{
+switch (addr.protocol()) {
+case QAbstractSocket::UnknownNetworkLayerProtocol:
+return qstrdup("");
+case QAbstractSocket::AnyIPProtocol:
+return qstrdup("QHostAddress::Any");
+case QAbstractSocket::IPv4Protocol:
+case QAbstractSocket::IPv6Protocol:
+break;
+}
+
+return qstrdup(addr.toString().toLatin1().constData());
+}
+#endif
+
 template<>
 inline bool qCompare(QString const &t1, QLatin1String const &t2, const char *actual,
 const char *expected, const char *file, int line)
@@ -205,7 +225,7 @@ inline bool qCompare(QList const &t1, QList const &t2, const char *actual,
 delete [] val2;
 }
 }
-return compare_helper(isOk, msg, 0, 0, actual, expected, file, line);
+return compare_helper(isOk, msg, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 }
 
 template <>
diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h
index a474758..beae9ec 100644
--- a/src/testlib/qtest_gui.h
+++ b/src/testlib/qtest_gui.h
@@ -86,24 +86,24 @@ inline bool qCompare(QImage const &t1, QImage const &t2,
 qsnprintf(msg, 1024, "Compared QImages differ.\n"
   "   Actual   (%s).isNull(): %d\n"
   "   Expected (%s).isNull(): %d", actual, t1Null, expected, t2Null);
-return compare_helper(false, msg, 0, 0, actual, expected, file, line);
+return compare_helper(false, msg, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 }
 if (t1Null && t2Null)
-return compare_helper(true, 0, 0, 0, actual, expected, file, line);
+return compare_helper(true, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 if (t1.width() != t2.width() || t1.height() != t2.height()) {
 qsnprintf(msg, 1024, "Compared QImages differ in size.\n"
   "   Actual   (%s): %dx%d\n"
   "   Expected (%s): %dx%d",
   actual, t1.width(), t1.height(),
   expected, t2.width(), t2.height());
-return compare_helper(false, msg, 0, 0, actual, expected, file, line);
+return compare_helper(false, msg, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 }
 if (t1.format() != t2.format()) {
 qsnprintf(msg, 1024, "Compared QImages differ in format.\n"
   "   Actual   (%s): %d\n"
   "   Expected (%s): %d",
   actual, t1.format(), expected, t2.format());
-return compare_helper(false, msg, 0, 0, actual, expected, file, line);
+return compare_helper(false, msg, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 }
 return compare_helper(t1 == t2, "Compared values are not the same",
   toString(t1), toString(t2), actual, expected, file, line);
@@ -120,17 +120,17 @@ inline bool qCompare(QPixmap const &t1, QPixmap const &t2, const char *actual, c
 qsnprintf(msg, 1024, "Compared QPixmaps differ.\n"
   "   Actual   (%s).isNull(): %d\n"
   "   Expected (%s).isNull(): %d", actual, t1Null, expected, t2Null);
-return compare_helper(false, msg, 0, 0, actual, expected, file, line);
+return compare_helper(false, msg, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 }
 if (t1Null && t2Null)
-return compare_helper(true, 0, 0, 0, actual, expected, file, line);
+return compare_helper(true, Q_NULLPTR, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 if (t1.width() != t2.width() || t1.height() != t2.height()) {
 qsnprintf(msg, 1024, "Compared QPixmaps differ in size.\n"
   "   Actual   (%s): %dx%d\n"
   "   Expected (%s): %dx%d",
   actual, t1.width(), t1.height(),
   expected, t2.width(), t2.height());
-return compare_helper(false, msg, 0, 0, actual, expected, file, line);
+return compare_helper(false, msg, Q_NULLPTR, Q_NULLPTR, actual, expected, file, line);
 }
 return qCompare(t1

[Development] Qt 5.6.0 header diff: Qt3DRenderer.diff

[Frederik Gladhorn]

diff --git a/src/render/frontend/qabstracttextureprovider.h b/src/render/frontend/qabstracttextureprovider.h
index 4121e01..436e3f8 100644
--- a/src/render/frontend/qabstracttextureprovider.h
+++ b/src/render/frontend/qabstracttextureprovider.h
@@ -190,6 +190,17 @@ public:
 RGB_BP_UNSIGNED_FLOAT  = 0x8E8F,// GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB
 RGB_BP_SIGNED_FLOAT= 0x8E8E,// GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB
 RGB_BP_UNorm   = 0x8E8C,// GL_COMPRESSED_RGBA_BPTC_UNORM_ARB
+R11_EAC_UNorm  = 0x9270,// GL_COMPRESSED_R11_EAC
+R11_EAC_SNorm  = 0x9271,// GL_COMPRESSED_SIGNED_R11_EAC
+RG11_EAC_UNorm = 0x9272,// GL_COMPRESSED_RG11_EAC
+RG11_EAC_SNorm = 0x9273,// GL_COMPRESSED_SIGNED_RG11_EAC
+RGB8_ETC2  = 0x9274,// GL_COMPRESSED_RGB8_ETC2
+SRGB8_ETC2 = 0x9275,// GL_COMPRESSED_SRGB8_ETC2
+RGB8_PunchThrough_Alpha1_ETC2 = 0x9276, // GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2
+SRGB8_PunchThrough_Alpha1_ETC2 = 0x9277, // GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2
+RGBA8_ETC2_EAC = 0x9278,// GL_COMPRESSED_RGBA8_ETC2_EAC
+SRGB8_Alpha8_ETC2_EAC  = 0x9279,// GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC
+RGB8_ETC1  = 0x8D64,// GL_ETC1_RGB8_OES
 
 // sRGB formats
 SRGB8  = 0x8C41,// GL_SRGB8
diff --git a/src/render/frontend/qgeometry.h b/src/render/frontend/qgeometry.h
index 59c957d..5578f41 100644
--- a/src/render/frontend/qgeometry.h
+++ b/src/render/frontend/qgeometry.h
@@ -69,6 +69,7 @@ Q_SIGNALS:
 void verticesPerPatchChanged();
 
 protected:
+QGeometry(QGeometryPrivate &dd, QNode *parent = 0);
 void copy(const QNode *ref) Q_DECL_OVERRIDE;
 
 private:
diff --git a/src/render/io/texturedata.h b/src/render/io/texturedata.h
index a403b0e..427453d 100644
--- a/src/render/io/texturedata.h
+++ b/src/render/io/texturedata.h
@@ -67,7 +67,8 @@ public:
 void setData(const QByteArray &data,
  QOpenGLTexture::PixelFormat fmt,
  QOpenGLTexture::PixelType ptype);
-void setCompressedData(QByteArray data, QOpenGLTexture::PixelFormat fmt);
+
+bool setCompressedFile(const QString &source);
 
 QByteArray data() const
 { return m_data; }
INFO - New header: src/render/frontend/qcylindergeometry.h
/
**
** Copyright (C) 2015 Klaralvdalens Datakonsult AB (KDAB).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt3D module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free
** Software Foundation and appearing in the file LICENSE.GPL included in
** the packaging of this file. Please review the following information to
** ensure the GNU General Public License version 2.0 requirements will be
** met: http://www.gnu.org/licenses/gpl-2.0.html.
**
** $QT_END_LICENSE$
**
/

#ifndef QT3D_QCYLINDERGEOMETRY_H
#define QT3D_QCYLINDERGEOMETRY_H

#include 
#include 

QT_BEGIN_NAMESPACE

namespace Qt3D {

class QCylinderGeometryPrivate;

class QT3DRENDERERSHARED_EXPORT QCylinderGeometry : public QGeometry
{
Q_OBJECT
Q_PROPERTY(int rings READ rings WRITE setRings NOTIFY ringsChanged)
Q_PROPERTY(int slices READ slices WRITE setSlices NOTIFY slicesChanged)
Q_PROPERTY(float radius READ radius WRITE setRadius NOTIFY radiusChanged)
Q_PROPERTY(float length READ length WRITE setLength NOTIFY lengthChanged)

public:
explicit QCylinderGeometry(QNode *parent = 0);
~QCylinderGeometry();

void updateVertices();
void updateIndices();
void setRings(int rings);
void setSlices(int slices);
void setRadius(float radius);
void setLength(floa

[Development] Qt 5.6.0 header diff: Qt3DCore.diff

[Frederik Gladhorn]

diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h
index 4bf2553..e3d6b2e 100644
--- a/src/core/core-components/qcamera.h
+++ b/src/core/core-components/qcamera.h
@@ -163,6 +163,7 @@ Q_SIGNALS:
 
 protected:
 Q_DECLARE_PRIVATE(QCamera)
+QT3D_CLONEABLE(QCamera)
 QCamera(QCameraPrivate &dd, QNode *parent = 0);
 };
 
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index c44c929..cce0cb7 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #define Q_NODE_NULLPTR static_cast(Q_NULLPTR)
 
@@ -56,14 +57,15 @@ class QAspectEngine;
 typedef QList QNodeList;
 typedef QSharedPointer QNodePtr;
 
+#define QT3D_QUOTE(str) #str
 #define QT3D_CLONEABLE(Class)\
+friend class QAbstractNodeFactory;   \
 QNode *doClone() const Q_DECL_OVERRIDE { \
-Class *clone_ = new Class;\
+Class *clone_ = Qt3D::QAbstractNodeFactory::createNode(QT3D_QUOTE(Class)); \
 clone_->copy(this);   \
 return clone_;\
 }
 
-
 // Each QNode subclass should call QNode::cleanup in it dtor
 // QNode::cleanup checks that a flags wasn't set to true,
 // sets it to true and sends a clone to the backend
INFO - New header: src/core/nodes/qabstractnodefactory.h
/
**
** Copyright (C) 2015 The Qt Company Ltd and/or its subsidiary(-ies).
** Contact: http://www.qt-project.org/legal
**
** This file is part of the Qt3D module of the Qt Toolkit.
**
** $QT_BEGIN_LICENSE:LGPL3$
** Commercial License Usage
** Licensees holding valid commercial Qt licenses may use this file in
** accordance with the commercial license agreement provided with the
** Software or, alternatively, in accordance with the terms contained in
** a written agreement between you and The Qt Company. For licensing terms
** and conditions see http://www.qt.io/terms-conditions. For further
** information use the contact form at http://www.qt.io/contact-us.
**
** GNU Lesser General Public License Usage
** Alternatively, this file may be used under the terms of the GNU Lesser
** General Public License version 3 as published by the Free Software
** Foundation and appearing in the file LICENSE.LGPLv3 included in the
** packaging of this file. Please review the following information to
** ensure the GNU Lesser General Public License version 3 requirements
** will be met: https://www.gnu.org/licenses/lgpl.html.
**
** GNU General Public License Usage
** Alternatively, this file may be used under the terms of the GNU
** General Public License version 2.0 or later as published by the Free
** Software Foundation and appearing in the file LICENSE.GPL included in
** the packaging of this file. Please review the following information to
** ensure the GNU General Public License version 2.0 requirements will be
** met: http://www.gnu.org/licenses/gpl-2.0.html.
**
** $QT_END_LICENSE$
**
/

#ifndef QABSTRACTNODEFACTORY_H
#define QABSTRACTNODEFACTORY_H

#include 
#include 

QT_BEGIN_NAMESPACE

namespace Qt3D {

class QT3DCORESHARED_EXPORT QAbstractNodeFactory
{
public:
virtual ~QAbstractNodeFactory();

virtual QNode *createNode(const char *type) = 0;

static void registerNodeFactory(QAbstractNodeFactory *factory);
static QList nodeFactories();

template static T *createNode(const char *type)
{
Q_FOREACH (QAbstractNodeFactory *f, QAbstractNodeFactory::nodeFactories()) {
QNode *n = f->createNode(type);
if (n)
return qobject_cast(n);
}
return new T;
}
};

} // namespace Qt3D

QT_END_NAMESPACE

#endif // QABSTRACTNODEFACTORY_H
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtWebChannel.diff

[Frederik Gladhorn]

diff --git a/src/webchannel/qwebchannel.h b/src/webchannel/qwebchannel.h
index 0e642db..d32d017 100644
--- a/src/webchannel/qwebchannel.h
+++ b/src/webchannel/qwebchannel.h
@@ -35,8 +35,8 @@
 #ifndef QWEBCHANNEL_H
 #define QWEBCHANNEL_H
 
-#include 
-#include 
+#include 
+#include 
 
 #include 
 
diff --git a/src/webchannel/qwebchannelabstracttransport.h b/src/webchannel/qwebchannelabstracttransport.h
index 851c622..e7f2af4 100644
--- a/src/webchannel/qwebchannelabstracttransport.h
+++ b/src/webchannel/qwebchannelabstracttransport.h
@@ -34,7 +34,7 @@
 #ifndef QWEBCHANNELABSTRACTTRANSPORT_H
 #define QWEBCHANNELABSTRACTTRANSPORT_H
 
-#include 
+#include 
 #include 
 
 QT_BEGIN_NAMESPACE
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtQuickWidgets.diff

[Frederik Gladhorn]

diff --git a/src/quickwidgets/qquickwidget.h b/src/quickwidgets/qquickwidget.h
index a8bf03e..5bb6b49 100644
--- a/src/quickwidgets/qquickwidget.h
+++ b/src/quickwidgets/qquickwidget.h
@@ -56,7 +56,6 @@ class Q_QUICKWIDGETS_EXPORT QQuickWidget : public QWidget
 Q_PROPERTY(ResizeMode resizeMode READ resizeMode WRITE setResizeMode)
 Q_PROPERTY(Status status READ status NOTIFY statusChanged)
 Q_PROPERTY(QUrl source READ source WRITE setSource DESIGNABLE true)
-Q_ENUMS(ResizeMode Status)
 
 public:
 explicit QQuickWidget(QWidget *parent = 0);
@@ -72,10 +71,12 @@ public:
 QQuickItem *rootObject() const;
 
 enum ResizeMode { SizeViewToRootObject, SizeRootObjectToView };
+Q_ENUM(ResizeMode)
 ResizeMode resizeMode() const;
 void setResizeMode(ResizeMode);
 
 enum Status { Null, Ready, Loading, Error };
+Q_ENUM(Status)
 Status status() const;
 
 QList errors() const;
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtQuickTest.diff

[Frederik Gladhorn]

diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h
index 49bd7ed..b317a07 100644
--- a/src/qmltest/quicktest.h
+++ b/src/qmltest/quicktest.h
@@ -35,9 +35,12 @@
 #define QUICKTEST_H
 
 #include 
+#include 
 
 QT_BEGIN_NAMESPACE
 
+QTEST_ADD_GPU_BLACKLIST_SUPPORT_DEFS
+
 Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, const char *sourceDir);
 
 #ifdef QUICK_TEST_SOURCE_DIR
@@ -45,12 +48,16 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name,
 #define QUICK_TEST_MAIN(name) \
 int main(int argc, char **argv) \
 { \
+QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+QTEST_SET_MAIN_SOURCE_PATH \
 return quick_test_main(argc, argv, #name, QUICK_TEST_SOURCE_DIR); \
 }
 
 #define QUICK_TEST_OPENGL_MAIN(name) \
 int main(int argc, char **argv) \
 { \
+QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+QTEST_SET_MAIN_SOURCE_PATH \
 return quick_test_main(argc, argv, #name, QUICK_TEST_SOURCE_DIR); \
 }
 
@@ -59,12 +66,16 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name,
 #define QUICK_TEST_MAIN(name) \
 int main(int argc, char **argv) \
 { \
+QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+QTEST_SET_MAIN_SOURCE_PATH \
 return quick_test_main(argc, argv, #name, 0); \
 }
 
 #define QUICK_TEST_OPENGL_MAIN(name) \
 int main(int argc, char **argv) \
 { \
+QTEST_ADD_GPU_BLACKLIST_SUPPORT \
+QTEST_SET_MAIN_SOURCE_PATH \
 return quick_test_main(argc, argv, #name, 0); \
 }
 
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff: QtLocation.diff

[Frederik Gladhorn]

diff --git a/src/location/places/qplaceeditorial.h b/src/location/places/qplaceeditorial.h
index 4a7e790..ecfe8db 100644
--- a/src/location/places/qplaceeditorial.h
+++ b/src/location/places/qplaceeditorial.h
@@ -48,7 +48,7 @@ class Q_LOCATION_EXPORT QPlaceEditorial : public QPlaceContent
 public:
 QPlaceEditorial();
 #ifdef Q_QDOC
-QPlaceEditorial::QPlaceEditorial(const QPlaceContent &other)
+QPlaceEditorial(const QPlaceContent &other);
 #else
 Q_DECLARE_CONTENT_COPY_CTOR(QPlaceEditorial)
 #endif
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Qt 5.6.0 header diff

[Frederik Gladhorn]

Hi all,

we are getting close to the Qt 5.6 beta and it's time for the header diff. 
>From this point on we should be very careful in adding/changing newly 
introduced API.

I'll send the actual header diffs as attachments in follow-up mails, it will 
probably take a few hours until they actually get sent.
As an addition to the previous process, we'll have new headers in existing 
modules included, so that we don't accidentally ship new classes that somehow 
slipped through the cracks earlier.

For entirely new modules, I don't think that this will work though, so let's 
start one thread for each module that will be added to Qt 5.6 (even for tech 
previews) so that everyone interested in the module is aware of it and can 
chime in to the discussion. For the new modules, use https://code.qt.io or git 
to do the review.

For Enginio, I just checked manually - there is no change in any headers in 
the 1.2.1 branch vs 5.6.

Cheers,
Frederik

qtsdk/packaging-tools/header-diff.pl origin/5.5.1..origin/5.6

Found module Qt3DCollision in ./qt3d/src/collision/collision.pro
 - Module has 7 public headers now
 - No changes!
Found module Qt3DCore in ./qt3d/src/core/core.pro
 - Module has 45 public headers now
 - Qt3DCore.diff created
 - New header: src/core/nodes/qabstractnodefactory.h
Found module Qt3DInput in ./qt3d/src/input/input.pro
 - Module has 9 public headers now
 - No changes!
Found module Qt3DLogic in ./qt3d/src/logic/logic.pro
 - Module has 3 public headers now
 - No changes!
Found module Qt3DRenderer in ./qt3d/src/render/render.pro
 - Module has 88 public headers now
 - Qt3DRenderer.diff created
 - New header: src/render/frontend/qcylindergeometry.h
Found module QtAndroidExtras in 
./qtandroidextras/src/androidextras/androidextras.pro
 - No public headers for module QtAndroidExtras
Found module QtConcurrent in ./qtbase/src/concurrent/concurrent.pro
 - Module has 15 public headers now
 - No changes!
Found module QtCore in ./qtbase/src/corelib/corelib.pro
 - Module has 193 public headers now
 - QtCore.diff created
 - New header: src/corelib/tools/qhashfunctions.h
 - New header: src/corelib/tools/qversionnumber.h
Found module QtDBus in ./qtbase/src/dbus/dbus.pro
 - Module has 19 public headers now
 - QtDBus.diff created
Found module QtGui in ./qtbase/src/gui/gui.pro
 - Module has 130 public headers now
 - QtGui.diff created
 - New header: src/gui/opengl/qopenglextrafunctions.h
 - New header: src/gui/painting/qrgba64.h
Found module QtNetwork in ./qtbase/src/network/network.pro
 - Module has 34 public headers now
 - QtNetwork.diff created
Found module QtOpenGL in ./qtbase/src/opengl/opengl.pro
 - Module has 8 public headers now
 - QtOpenGL.diff created
Found module QtOpenGLExtensions in 
./qtbase/src/openglextensions/openglextensions.pro
 - Module has 1 public headers now
 - No changes!
Found module QtPlatformSupport in 
./qtbase/src/platformsupport/platformsupport.pro
 - Module has 4 public headers now
 - No changes!
Found module QtPrintSupport in ./qtbase/src/printsupport/printsupport.pro
 - Module has 9 public headers now
 - QtPrintSupport.diff created
Found module QtSql in ./qtbase/src/sql/sql.pro
 - Module has 14 public headers now
 - QtSql.diff created
Found module QtTest in ./qtbase/src/testlib/testlib.pro
 - Module has 18 public headers now
 - QtTest.diff created
Found module QtWidgets in ./qtbase/src/widgets/widgets.pro
 - Module has 135 public headers now
 - QtWidgets.diff created
 - New header: src/widgets/accessible/complexwidgets.h
 - New header: src/widgets/accessible/itemviews.h
 - New header: src/widgets/accessible/qaccessiblemenu.h
 - New header: src/widgets/accessible/qaccessiblewidgets.h
 - New header: src/widgets/accessible/rangecontrols.h
 - New header: src/widgets/accessible/simplewidgets.h
Found module qtmain in ./qtbase/src/winmain/winmain.pro
 - No public headers for module qtmain
Found module QtXml in ./qtbase/src/xml/xml.pro
 - Module has 3 public headers now
 - QtXml.diff created
Found module QtBluetooth in ./qtconnectivity/src/bluetooth/bluetooth.pro
 - Module has 19 public headers now
 - QtBluetooth.diff created
Found module QtNfc in ./qtconnectivity/src/nfc/nfc.pro
 - Module has 12 public headers now
 - No changes!
Found module QtQuickParticles in ./qtdeclarative/src/particles/particles.pro
 - No public headers for module QtQuickParticles
Found module QtQml in ./qtdeclarative/src/qml/qml.pro
 - Module has 27 public headers now
 - QtQml.diff created
Found module QtQmlDevTools in ./qtdeclarative/src/qmldevtools/qmldevtools.pro
 - No public headers for module QtQmlDevTools
Found module QtQuickTest in ./qtdeclarative/src/qmltest/qmltest.pro
 - Module has 2 public headers now
 - QtQuickTest.diff created
Found module QtQuick in ./qtdeclarative/src/quick/quick.pro
 - Module has 23 public headers now
 - QtQuick.diff created
Found module QtQuickWidgets in 
./qtdeclarative/src/quickwidgets/quickwidgets.pro
 - Module has 2 public headers now
 - QtQuickWidgets.diff created
Found module Engini

Re: [Development] Sending key events on Qt 5.5.0

[Christian . Paffhausen]

Hi Bo Thorsen,

thanks for that. But it's a little bit more complicated. There is no
PushButton. We record all keyboard input events, buffer them in a own key
event class, which is derived by QKeyEvent, and accepting the original
events. So the original key event will never reach the action. If our
internal states say ready for keyboard input, we sending our key event via
QApplication::sendEvent. In this part of the code, i know nothing about a
action somewhere. I only know about incoming key events and resending them.

The PushButton was only a demonstrator :-)

Regards
Christian

Mit freundlichen Grüßen / Best regards

Ehrhardt + Partner GmbH & Co. KG

i.A. Christian Paffhausen
Software Developer

Development Group User Interfaces

**
Ehrhardt + Partner GmbH & Co. KG
Software - Systeme für Warehouse - Logistik
Alte Roemerstrasse 3
D-56154 Boppard-Buchholz
Handelsregister Koblenz HRA 4605
GF Marco Ehrhardt
Tel. : (+49) 67 42 / 87 27 0
Fax : (+49) 67 42 / 87 27 50
E-Mail: i...@ehrhardt-partner.com
Internet: www.ehrhardt-partner.com

(Embedded image moved to file: pic13977.jpg)




From:   Bo Thorsen 
To: development@qt-project.org
Date:   17.09.2015 11:37
Subject:Re: [Development] Sending key events on Qt 5.5.0
Sent by:development-bounces
+christian.paffhausen=ehrhardt-partner@qt-project.org



Den 17-09-2015 kl. 11:21 skrev christian.paffhau...@ehrhardt-partner.com:
> i have a problem with manually sending key events and shortcuts on Qt
> 5.5.0.
>
> In our application, we have a QAction with a F5 shortcut in a toolbar.
When
> i press the toolbutton everything works fine. When i press the F5 key on
my
> keyboard too.
> But when i press a pushbutton, where the connected slot generate a
> QKeyEvent and send this event via QApplication::sendEvent nothing will
> happen.
> With Qt 5.4.1 it works, but with 5.5.0 not.
>
> I have attached a small example app, which describes my problem.
>
> Is this problem already known? Have you a patch or work around for me?

Hi Christian,

The solution: tAction->trigger()

I'm not trying to be cute or anything. This is what you should do.
Abusing the short cut system to send messages between widgets is a bad
idea.

That said, I also think you should report this as a bug. The behaviour
change between 5.4 and 5.5 is bad. But I've seen 5.5 behaviour change
bug reports closed as invalid for weird reasons, so you might not have
any luck.

I hope this helps.

Bo Thorsen,
Director, Viking Software.

--
Viking Software
Qt and C++ developers for hire
http://www.vikingsoft.eu
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Sending key events on Qt 5.5.0

[Bo Thorsen]

Den 17-09-2015 kl. 11:21 skrev christian.paffhau...@ehrhardt-partner.com:
> i have a problem with manually sending key events and shortcuts on Qt
> 5.5.0.
>
> In our application, we have a QAction with a F5 shortcut in a toolbar. When
> i press the toolbutton everything works fine. When i press the F5 key on my
> keyboard too.
> But when i press a pushbutton, where the connected slot generate a
> QKeyEvent and send this event via QApplication::sendEvent nothing will
> happen.
> With Qt 5.4.1 it works, but with 5.5.0 not.
>
> I have attached a small example app, which describes my problem.
>
> Is this problem already known? Have you a patch or work around for me?

Hi Christian,

The solution: tAction->trigger()

I'm not trying to be cute or anything. This is what you should do. 
Abusing the short cut system to send messages between widgets is a bad idea.

That said, I also think you should report this as a bug. The behaviour 
change between 5.4 and 5.5 is bad. But I've seen 5.5 behaviour change 
bug reports closed as invalid for weird reasons, so you might not have 
any luck.

I hope this helps.

Bo Thorsen,
Director, Viking Software.

-- 
Viking Software
Qt and C++ developers for hire
http://www.vikingsoft.eu
___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

[Development] Sending key events on Qt 5.5.0

[Christian . Paffhausen]

Hi all,

i have a problem with manually sending key events and shortcuts on Qt
5.5.0.

In our application, we have a QAction with a F5 shortcut in a toolbar. When
i press the toolbutton everything works fine. When i press the F5 key on my
keyboard too.
But when i press a pushbutton, where the connected slot generate a
QKeyEvent and send this event via QApplication::sendEvent nothing will
happen.
With Qt 5.4.1 it works, but with 5.5.0 not.

I have attached a small example app, which describes my problem.

Is this problem already known? Have you a patch or work around for me?

Thanks in advance.

Regards
Christian


---

Mit freundlichen Grüßen / Best regards

Ehrhardt + Partner GmbH & Co. KG

i.A. Christian Paffhausen
Software Developer

Development Group User Interfaces

**
Ehrhardt + Partner GmbH & Co. KG
Software - Systeme für Warehouse - Logistik
Alte Roemerstrasse 3
D-56154 Boppard-Buchholz
Handelsregister Koblenz HRA 4605
GF Marco Ehrhardt
Tel. : (+49) 67 42 / 87 27 0
Fax : (+49) 67 42 / 87 27 50
E-Mail: i...@ehrhardt-partner.com
Internet: www.ehrhardt-partner.com

(Embedded image moved to file: pic00292.jpg)___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development

Re: [Development] Adding Microsoft-licensed library in Qt Multimedia

[Knoll Lars]

On 16/09/15 19:11, "Thiago Macieira"  wrote:

>On Wednesday 16 September 2015 15:59:25 Lopes Yoann wrote:
>> >> iii. Distribution Restrictions.  You may not
>> >> ·   modify or distribute the source code of any Distributable Code so
>> >> that any part of it becomes subject to an Excluded License.  An
>>Excluded
>> >> License is one that requires, as a condition of use, modification or
>> >> distribution, that ·   the code be disclosed or distributed in source
>> >> code form; or
>> >> ·   others have the right to modify it.
>> >>
>> >> 
>> >>
>> > ah, the good old ms. i think the express purpose of that clause is to
>> > forbid usage in (l)gpl code, which means we would have to distribute
>>at
>> > least that plugin under BSD or proprietary only.
>> 
>> You might be right… in that case this is probably a no-go.
>
>It is.
>
>And even if it weren't for this reason, the licence of this code is not
>OSI-
>approved and not compliant with the DFSG, so please don't import it into
>Qt.

Yes, unfortunately we can’t use any of this code.

Cheers,
Lars

___
Development mailing list
Development@qt-project.org
http://lists.qt-project.org/mailman/listinfo/development