From james.turner at kdab.com Sat Jun 1 11:05:43 2013 From: james.turner at kdab.com (James Turner) Date: Sat, 1 Jun 2013 10:05:43 +0100 Subject: [Development] New online installers available for testing In-Reply-To: References: Message-ID: On 31 May 2013, at 10:50, Heikkinen Jani wrote: > There is new online installers available in http://download.qt-project.org/online/qt5/online_installers/ > At the moment content is Qt5.0.2 but it will be updated to Qt5.1 RC1 when it is published (hopefully really soon). Please try those and give us feedback if those work or if you face some issues. > Mac installer seems good to me on 10.8.3, Creator works and I can build and run apps against 5.1. Regards, James -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 5178 bytes Desc: not available URL: From andre at familiesomers.nl Sat Jun 1 11:37:00 2013 From: andre at familiesomers.nl (Andre Somers) Date: Sat, 01 Jun 2013 11:37:00 +0200 Subject: [Development] New online installers available for testing In-Reply-To: References: Message-ID: <51A9C0BC.3010908@familiesomers.nl> Op 31-5-2013 11:50, Heikkinen Jani schreef: > > Hi all! > > There is new online installers available in > http://download.qt-project.org/online/qt5/online_installers/ > > > At the moment content is Qt5.0.2 but it will be updated to Qt5.1 RC1 > when it is published (hopefully really soon). Please try those and > give us feedback if those work or if you face some issues. > > Br, > > Jani > > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development MinGW on windows 7 seems to work. André -------------- next part -------------- An HTML attachment was scrubbed... URL: From Tuukka.Turunen at digia.com Sat Jun 1 12:09:01 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Sat, 1 Jun 2013 10:09:01 +0000 Subject: [Development] New online installers available for testing In-Reply-To: References: Message-ID: <1B00CEBCD57FD445BD8228C9300DAE294D82C3F5@IT-EXMB02-HKI.it.local> Hi, Please also let us know where you tested from. There may (at least in theory) be issues related to mirrors. Yours, -- Tuukka James Turner kirjoitti 1.6.2013 12:06: On 31 May 2013, at 10:50, Heikkinen Jani > wrote: > There is new online installers available in http://download.qt-project.org/online/qt5/online_installers/ > At the moment content is Qt5.0.2 but it will be updated to Qt5.1 RC1 when it is published (hopefully really soon). Please try those and give us feedback if those work or if you face some issues. > Mac installer seems good to me on 10.8.3, Creator works and I can build and run apps against 5.1. Regards, James -------------- next part -------------- An HTML attachment was scrubbed... URL: From Simon.Hausmann at digia.com Sat Jun 1 13:27:58 2013 From: Simon.Hausmann at digia.com (Hausmann Simon) Date: Sat, 1 Jun 2013 11:27:58 +0000 Subject: [Development] New online installers available for testing In-Reply-To: References: Message-ID: Hi, Tested in Linux x86 from Oslo, installation worked great (although a few times the installer wrote "This shouldn't happen!" onto the terminal a few times) Simon Heikkinen Jani wrote: Hi all! There is new online installers available in http://download.qt-project.org/online/qt5/online_installers/ At the moment content is Qt5.0.2 but it will be updated to Qt5.1 RC1 when it is published (hopefully really soon). Please try those and give us feedback if those work or if you face some issues. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From franciscoraulortega at gmail.com Sat Jun 1 18:37:03 2013 From: franciscoraulortega at gmail.com (Francisco Ortega) Date: Sat, 1 Jun 2013 12:37:03 -0400 Subject: [Development] Request: QTouchEvents Message-ID: Hi, I notice that QTouchEvent::TouchPoint does not have the ID given by the Platform device. In qwindowsmousehandler.cpp I found the following: const TOUCHINPUT &winTouchInput = winTouchInputs[i]; int id = m_touchInputIDToTouchPointID.value(winTouchInput.dwID, -1); if (id == -1) { id = m_touchInputIDToTouchPointID.size(); m_touchInputIDToTouchPointID.insert(winTouchInput.dwID, id); } However, the platform ID may be important to some people working in Touch. It is important to me. I could augment the data structure, but I think this should be a unified approach for all platform. Math.Max if no ID can be found.... type unsigned long or something like that... I'm going to add it as a suggestion. Thanks, Francisco R. Ortega Ph.D. Candidate in Computer Science Florida International University http://www.FranciscoRaulOrtega.com "No me quieras por que gane, necesito que me quieras para ganar" -- Marcelo Bielsa -------------- next part -------------- An HTML attachment was scrubbed... URL: From sean.harmer at kdab.com Sat Jun 1 19:08:17 2013 From: sean.harmer at kdab.com (Sean Harmer) Date: Sat, 01 Jun 2013 18:08:17 +0100 Subject: [Development] Nested Mousearea don't pass events In-Reply-To: References: Message-ID: <51AA2A81.3070306@kdab.com> On 20/05/2013 13:36, Matteo Brichese wrote: > Hi everyone, I'm having some issue on passing the right event from a mousearea to another. > > This is a sample of my code: > > import QtQuick 2.0 > > Rectangle { > width: 1024 > height: 768 > > MouseArea { > anchors.fill: parent; > onClicked: console.log("Click") > } > > MouseArea { > anchors.fill: parent; > onDoubleClicked: console.log("Double Click") > } > } > > I can only see logs of the double click. > I was hoping that if I single click the last mousearea the event passed to the second one, but it don't work, is that a bug? > > I'm using Qt5.0.2 You need to set propagateComposedEvents: true on the top MouseArea and in the signal handler of the top MouseArea set mouse.accepted = false so that it propagates clicks, doubleClicks etc to the underlying MouseArea. See http://doc-snapshot.qt-project.org/qt5-release/qtquick/qml-qtquick2-mousearea.html#propagateComposedEvents-prop Cheers, Sean -- Dr Sean Harmer | sean.harmer at kdab.com | Senior Software Engineer Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions From thiago.macieira at intel.com Sat Jun 1 19:26:35 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Sun, 02 Jun 2013 02:26:35 +0900 Subject: [Development] Request: QTouchEvents In-Reply-To: References: Message-ID: <1726132.hg4sb5orXI@tjmaciei-mobl2> On sábado, 1 de junho de 2013 12.37.03, Francisco Ortega wrote: > However, the platform ID may be important to some people working in Touch. Why? You need to tell us why the platform ID might be important. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From sirspudd at gmail.com Sat Jun 1 21:45:00 2013 From: sirspudd at gmail.com (Donald Carr) Date: Sat, 1 Jun 2013 12:45:00 -0700 Subject: [Development] New online installers available for testing In-Reply-To: References: Message-ID: Best debugging message eva: Might I suggest: "Ah, sweet Jesus I have so much to give!" for future installer debugging inclusion . On Jun 1, 2013 4:28 AM, "Hausmann Simon" wrote: > Hi, > > Tested in Linux x86 from Oslo, installation worked great (although a few times the installer wrote "This shouldn't happen!" onto the terminal a few times) > > > Simon > > Heikkinen Jani wrote: > > > Hi all! > > There is new online installers available in > http://download.qt-project.org/online/qt5/online_installers/ > > At the moment content is Qt5.0.2 but it will be updated to Qt5.1 RC1 when > it is published (hopefully really soon). Please try those and give us > feedback if those work or if you face some issues. > > > > Br, > > Jani > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From joaodeusmorgado at yahoo.com Sun Jun 2 03:09:38 2013 From: joaodeusmorgado at yahoo.com (joao morgado) Date: Sat, 1 Jun 2013 18:09:38 -0700 (PDT) Subject: [Development] Nested Mousearea don't pass events In-Reply-To: <51AA2A81.3070306@kdab.com> References: <51AA2A81.3070306@kdab.com> Message-ID: <1370135378.28400.YahooMailNeo@web165005.mail.bf1.yahoo.com> Hi Thanks for this solution, I was having the same problem. But it only works for  QtQuick 2.0, it seems propagateComposedEvents it's not available in QtQuick 1.1   : ( Regards João de Deus ________________________________ De: Sean Harmer Para: development at qt-project.org Enviadas: Sábado, 1 de Junho de 2013 18:08 Assunto: Re: [Development] Nested Mousearea don't pass events On 20/05/2013 13:36, Matteo Brichese wrote: > Hi everyone, I'm having some issue on passing the right event from a mousearea to another. > > This is a sample of my code: > > import QtQuick 2.0 > > Rectangle { >      width: 1024 >      height: 768 > >      MouseArea { >          anchors.fill: parent; >          onClicked: console.log("Click") >      } > >      MouseArea { >          anchors.fill: parent; >          onDoubleClicked: console.log("Double Click") >      } > } > > I can only see logs of the double click. > I was hoping that if I single click the last mousearea the event passed to the second one, but it don't work, is that a bug? > > I'm using Qt5.0.2 You need to set propagateComposedEvents: true on the top MouseArea and in the signal handler of the top MouseArea set mouse.accepted = false so that it propagates clicks, doubleClicks etc to the underlying MouseArea. See http://doc-snapshot.qt-project.org/qt5-release/qtquick/qml-qtquick2-mousearea.html#propagateComposedEvents-prop Cheers, Sean -- Dr Sean Harmer | sean.harmer at kdab.com | Senior Software Engineer Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From mumtazahmad2504 at gmail.com Sun Jun 2 06:34:24 2013 From: mumtazahmad2504 at gmail.com (Mumtaz Ahmad) Date: Sun, 2 Jun 2013 09:34:24 +0500 Subject: [Development] Visual Studio Paths in Makefile Message-ID: I am tying to build QT 5 on Mingw . I had Visual Studio Installed and somehow the lib and include paths of Visual Studio are appearing in Makefiles generated by Qmake to build moc tool. I have uninstalled Visual Studio now but still the compilation of moc fails due to presence of Visual Studio Paths. Configure detects Visual Studio in Environment as well. Can anyone help me in this regard. Thanks -------------- next part -------------- An HTML attachment was scrubbed... URL: From Lars.Knoll at digia.com Mon Jun 3 13:04:41 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Mon, 3 Jun 2013 11:04:41 +0000 Subject: [Development] (Re-)Introducing Alex Blasche Message-ID: Hi, I'm happy to tell you all that Alex Blasche has started working for us today. Alex used to head most of the Qt mobility efforts from Nokia's Brisbane office. He is still (and will continue as) the maintainer for Qt Location, Qt Connectivity and Qt Systems. Alex will start his work by going through the modules that were part of Qt mobility in 4.x times and that we haven't made a part of Qt 5 yet. We then hope to have a good understanding of how we'd like to proceed with these modules within a few weeks from now, and when and how we can bring these modules back as an integral part of Qt 5.x. Alex will work out of our Berlin office. He'll also come to the Qt Contributor Days in Bilbao. Welcome back Alex! Cheers, Lars From thiago.macieira at intel.com Mon Jun 3 16:15:12 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Mon, 03 Jun 2013 07:15:12 -0700 Subject: [Development] (Re-)Introducing Alex Blasche In-Reply-To: References: Message-ID: <4694205.4KXix9eZE7@tjmaciei-mobl2> On segunda-feira, 3 de junho de 2013 11.04.41, Knoll Lars wrote: > Hi, > > I'm happy to tell you all that Alex Blasche has started working for us > today. Alex used to head most of the Qt mobility efforts from Nokia's > Brisbane office. He is still (and will continue as) the maintainer for Qt > Location, Qt Connectivity and Qt Systems. > > Alex will start his work by going through the modules that were part of Qt > mobility in 4.x times and that we haven't made a part of Qt 5 yet. We then > hope to have a good understanding of how we'd like to proceed with these > modules within a few weeks from now, and when and how we can bring these > modules back as an integral part of Qt 5.x. > > Alex will work out of our Berlin office. He'll also come to the Qt > Contributor Days in Bilbao. Welcome back Alex! It was great working with you in the past and I hope that we can continue that now. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From lorn.potter at gmail.com Mon Jun 3 20:11:08 2013 From: lorn.potter at gmail.com (Lorn Potter) Date: Tue, 04 Jun 2013 04:11:08 +1000 Subject: [Development] (Re-)Introducing Alex Blasche In-Reply-To: References: Message-ID: <51ACDC3C.7060302@gmail.com> Hey Alex! Welcome back to the Qt world! On 03/06/13 21:04, Knoll Lars wrote: > Hi, > > I'm happy to tell you all that Alex Blasche has started working for us > today. Alex used to head most of the Qt mobility efforts from Nokia's > Brisbane office. He is still (and will continue as) the maintainer for Qt > Location, Qt Connectivity and Qt Systems. Good to see you back working with Qt. > > Alex will start his work by going through the modules that were part of Qt > mobility in 4.x times and that we haven't made a part of Qt 5 yet. We then > hope to have a good understanding of how we'd like to proceed with these > modules within a few weeks from now, and when and how we can bring these > modules back as an integral part of Qt 5.x. Good news here. As maintainer of qsysteminfo, please try and include me in any discussions regarding this. As I have a few ideas. -- Lorn Potter Senior Software Engineer, QtSensors/QtSensorGestures/QtSystemInfo From Alexander.Blasche at digia.com Tue Jun 4 08:39:21 2013 From: Alexander.Blasche at digia.com (Blasche Alexander) Date: Tue, 4 Jun 2013 06:39:21 +0000 Subject: [Development] (Re-)Introducing Alex Blasche In-Reply-To: <51ACDC3C.7060302@gmail.com> References: ,<51ACDC3C.7060302@gmail.com> Message-ID: Hi Lorn, >Good to see you back working with Qt. Thank you for all the well wishes I have received. It definitely provides a warm welcome. >________________________________________ >From: Lorn Potter [lorn.potter at gmail.com] > >> Alex will start his work by going through the modules that were part of Qt >> mobility in 4.x times and that we haven't made a part of Qt 5 yet. We then >> hope to have a good understanding of how we'd like to proceed with these >> modules within a few weeks from now, and when and how we can bring these >> modules back as an integral part of Qt 5.x. >Good news here. >As maintainer of qsysteminfo, please try and include me in any >discussions regarding this. As I have a few ideas. Nothing would be further from my mind than not involving you. Please keep an eye on the #qt-mobility channel. -- Alex From Tony.Sarajarvi at digia.com Tue Jun 4 12:13:16 2013 From: Tony.Sarajarvi at digia.com (=?iso-8859-1?Q?Saraj=E4rvi_Tony?=) Date: Tue, 4 Jun 2013 10:13:16 +0000 Subject: [Development] Introducing QtMetrics Message-ID: Hi We are ready to launch our QtMetrics page for the public now. Description from its wiki page: Purpose of the Qt Metrics web portal is to visualize and communicate the progress of Qt quality, focusing first to Continuous Integration (CI) but to cover e.g. code coverage, autotest, release test automation and manual test metrics and reports later on. Goal is to automate laborious manual work that is required e.g. in the CI release cycle to report the key information, as well as providing real time data with good performance. Target audience is Qt integration teams (in Digia) and the global Qt developer community. The main page can be found here: http://testresults.qt-project.org/qtmetrics/index.php And the wiki page describing it in more detail can be found here: http://qt-project.org/wiki/Qt_Metrics_Page_Description Note 1: Loading it the first time can take a while. It caches data in your current session, making browsing more user friendly. If it hasn't loaded the windows in a minute, hit reload. It sometimes keeps trying to load when it's indexing new data in the background. Note 2: The data you see is currently manually kept up to date about once a day. This will be changed as soon as we have time to implement an automated function for this that triggers after a build. Regards, -Tony & Juha Tony Sarajärvi Senior Software Designer Digia, Qt Digia Plc Elektroniikkatie 10 FI-90590 Oulu Email: tony.sarajarvi at digia.com Mobile: +358 050 482 1416 http://qt.digia.com | Blog | Twitter | LinkedIn | YouTube | Facebook | ------------------------------------------------------------------ PRIVACY AND CONFIDENTIALITY NOTICE This message and any attachments are intended only for use by the named addressee and may contain privileged and/or confidential information. If you are not the named addressee you should not disseminate, copy or take any action in reliance on it. If you have received this message in error, please contact the sender immediately and delete the message and any attachments accompanying it. Digia Plc does not accept liability for any corruption, interception, amendment, tampering or viruses occurring to this message. ------------------------------------------------------------------ -------------- next part -------------- An HTML attachment was scrubbed... URL: From Caroline.Chao at digia.com Tue Jun 4 12:14:33 2013 From: Caroline.Chao at digia.com (Chao Caroline) Date: Tue, 4 Jun 2013 10:14:33 +0000 Subject: [Development] QtQml/QtQuick in Jira Message-ID: Hello, The components structure in the bug tracker for Qt Qml and Qt Quick 2 (qtdeclarative repository) under the Qt project has been changed. https://bugreports.qt-project.org/browse/QTBUG#selectedTab=com.atlassian.jira.plugin.system.project%3Acomponents-panel The Qt component 'Declarative(QML)' has been split into QtQml and QtQuick components. A - QtQml (Alan) The Qt Qml modules defines and implements the QML language and engine infrastructure. If you encounter issues using the QtQml API you should now log bugs in the QtQml component. - QtQml (Alan) - https://bugreports.qt-project.org/browse/QTBUG/component/19204 B - QtQuick The Qt Quick module provides all the basic types necessary for creating user interfaces with QML. If you need to report an issue against QtQuick, please choose one of the following components: - QtQuick: Core (Alan) (https://bugreports.qt-project.org/browse/QTBUG/component/20121) For issues regarding the C++ API and the elements in the QtQuick import - QtQuick: Particles (Alan) - QtQuick: Dialogs (Shawn - new in Qt 5.1) - QtQuick: Other (Alan) For the elements in the other QtQuick imports, such as QtQuick.Window, QtQuick.LocalStorage, QtQuick.XmlListModel... For info some QtQuick APIs are provided by other modules and you can also find: - QtQuick: Controls (Jens - new in Qt 5.1) - QtQuick: Layouts (Jan-Arve new in Qt 5.1) - QtQuick: SceneGraph (Gunnar) - QtQuick: Graphical Effect (Gunnar) Hopefully it will make it easier to find the right component and to search for issues. Note the Declarative (QML1/QtQuick1) component is still used to report bugs against Qt Qml and Qt Quick 1 (qtquick1 repository) Regards, Caroline From perezmeyer at gmail.com Tue Jun 4 20:13:22 2013 From: perezmeyer at gmail.com (Lisandro =?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer) Date: Tue, 04 Jun 2013 15:13:22 -0300 Subject: [Development] Correct way to create Qt5's doc when packaging from submodules sources. Message-ID: <3253318.VgByaD4dMm@tonks> Hi! I'm one of Debian's Qt maintainers and I have some questions on how to properly build the Qt5 documentation. We are compiling everything from the submodules tarballs, as it makes maintainance much easier. While packaging qtdoc, I noticed that I needed qt-module-defaults.qdocconf shipped by qtbase, so far so good. But then I got messages like: addons.qdoc:28: warning: Can't link to 'Qt ActiveQt' addons.qdoc:28: warning: Can't link to 'Qt Concurrent' addons.qdoc:28: warning: Can't link to 'Concurrent Programming' [many more] The same happens for other sources too. We are using method 2 as described in qtdoc/README, ie, using qmake make docs So the questions are: am I missing something, or maybe I just got the wrong method? Kinds regards, Lisandro. -- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 5 00:55:10 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 04 Jun 2013 15:55:10 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 Message-ID: <1712636.K8dc6PyfMS@tjmaciei-mobl2> Hello all As of 3d0a60aaa4077a8 in Qt 5.2, Qt requires libc++ in order to build on Mac with clang. That means the minimum deployment target for macx-clang is Mac OS X 10.7 now. Question: do we want to keep supporting Mac OS X 10.6? If so, for how long? And if not, can we drop macx-g++? The g++ compiler that comes bundled with XCode is broken and horribly outdated. What do you think? PS: OS X 10.9 is expected to be announced at WWDC this month. That means Qt 5.2 will need to support 10.9. At the same time, 10.6's last update will be over 2 years old when 5.2 ships. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From jake.petroules at petroules.com Wed Jun 5 01:32:57 2013 From: jake.petroules at petroules.com (Jake Thomas Petroules) Date: Tue, 4 Jun 2013 19:32:57 -0400 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1712636.K8dc6PyfMS@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> Message-ID: <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> Well, Xcode 5.0 will be dropping support for GCC, so the only way to target 10.6 or below will be with clang + libstc++. Supporting 10.6 is a huge priority given that version has the largest market share of all OS X versions (about 35%). Do we really want to wipe out over a third of potential end-users of Qt-based products? Dropping support for it at this point is an absolutely terrible idea, and 10.9 is not even revealed yet. Secondly, it appears that the patch in question does not force use of libc++ ("Users who wish to deploy to 10.6 need to build their own Qt, passing -no-c++11 to configure.") unless I am missing something. It would be irrelevant if Snow Leopard were 10 years old; what really matters is the fact it maintains a massive 35% market share of OS X versions and therefore is critical to provide support for. Most popular software packages seem to have recently switched to 10.6 as a minimum (Firefox, Chrome, Skype, to name a few). 10.5 came out in 2007 and was dropped by Qt in 2012. 10.6 came out in 2009 so let's drop 10.6 somewhere around 2015 or even 2016 (I add a year because of its higher market share). We should have 10.11 by then. -- Jake Petroules Chief Technology Officer Petroules Corporation · www.petroules.com Email: jake.petroules at petroules.com On Jun 4, 2013, at 6:55 PM, Thiago Macieira wrote: > Hello all > > As of 3d0a60aaa4077a8 in Qt 5.2, Qt requires libc++ in order to build on Mac > with clang. That means the minimum deployment target for macx-clang is > Mac OS X 10.7 now. > > Question: do we want to keep supporting Mac OS X 10.6? If so, for how long? > > And if not, can we drop macx-g++? The g++ compiler that comes bundled with > XCode is broken and horribly outdated. > > What do you think? > > PS: OS X 10.9 is expected to be announced at WWDC this month. That means Qt > 5.2 will need to support 10.9. At the same time, 10.6's last update will be > over 2 years old when 5.2 ships. > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From jfaust at suitabletech.com Wed Jun 5 02:48:01 2013 From: jfaust at suitabletech.com (Josh Faust) Date: Tue, 4 Jun 2013 17:48:01 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> Message-ID: > Supporting 10.6 is a huge priority given that version has the largest > market share of all OS X versions (about 35%). Do we really want to wipe > out over a third of potential end-users of Qt-based products? Dropping > support for it at this point is an absolutely terrible idea, and 10.9 is > not even revealed yet. > +1. If Qt drops support for OSX 10.6 we'll be unable to upgrade to 5.2+ for the foreseeable future. Unfortunately 10.6 is looking like Mac's XP. Josh -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Wed Jun 5 05:26:10 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 04 Jun 2013 20:26:10 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> Message-ID: <1974045.ozbSzzqN8G@tjmaciei-mobl2> On terça-feira, 4 de junho de 2013 19.32.57, Jake Thomas Petroules wrote: > Well, Xcode 5.0 will be dropping support for GCC, so the only way to target > 10.6 or below will be with clang + libstc++. Right, I missed that clang + libstdc++ was still possible with -no-c++11. It's a non-default option. I guess we conclude then: a) we can keep support for 10.6 for the time being, with macx-clang b) we should deprecate macx-g++, since XCode 5.0 will not have that anymore > 10.5 came out in 2007 and was dropped by Qt in 2012. 10.6 came out in 2009 > so let's drop 10.6 somewhere around 2015 or even 2016 (I add a year because > of its higher market share). We should have 10.11 by then. I'm not sure I like that idea. We've always kept support for the past 3 versions of Mac OS X. Until 10.9 now, that meant roughly 6 years of support from us. If we keep that rate, we should support 10.6 at least until June 2014. So, if we keep current practice, Qt 5.3 or 5.4 will drop support for it anyway. That's 2014, not 2015 or 2016. Also, please note we're talking about software that switches to Qt 5.2. That is, we're talking about software released in 2014. And people keep telling me that they can't upgrade Qt after a cycle started. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From jake.petroules at petroules.com Wed Jun 5 06:03:14 2013 From: jake.petroules at petroules.com (Jake Thomas Petroules) Date: Wed, 5 Jun 2013 00:03:14 -0400 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1974045.ozbSzzqN8G@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> <1974045.ozbSzzqN8G@tjmaciei-mobl2> Message-ID: On Jun 4, 2013, at 11:26 PM, Thiago Macieira wrote: > On terça-feira, 4 de junho de 2013 19.32.57, Jake Thomas Petroules wrote: >> Well, Xcode 5.0 will be dropping support for GCC, so the only way to target >> 10.6 or below will be with clang + libstc++. > > Right, I missed that clang + libstdc++ was still possible with -no-c++11. It's > a non-default option. > > I guess we conclude then: > a) we can keep support for 10.6 for the time being, with macx-clang > b) we should deprecate macx-g++, since XCode 5.0 will not have that anymore That sounds fine. >> 10.5 came out in 2007 and was dropped by Qt in 2012. 10.6 came out in 2009 >> so let's drop 10.6 somewhere around 2015 or even 2016 (I add a year because >> of its higher market share). We should have 10.11 by then. > > I'm not sure I like that idea. We've always kept support for the past 3 > versions of Mac OS X. Until 10.9 now, that meant roughly 6 years of support > from us. If we keep that rate, we should support 10.6 at least until June > 2014. > > So, if we keep current practice, Qt 5.3 or 5.4 will drop support for it > anyway. That's 2014, not 2015 or 2016. > > Also, please note we're talking about software that switches to Qt 5.2. That > is, we're talking about software released in 2014. And people keep telling me > that they can't upgrade Qt after a cycle started. I was being half-sarcastic about 2016, but I do strongly disagree that we should indiscriminately support only N number of versions of OS X at a time; it's too rigid. I think significantly more weight should be given to the version's market share. PS - adding new OS versions to QSysInfo and such: dev or stable? > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Jake Petroules Chief Technology Officer Petroules Corporation · www.petroules.com Email: jake.petroules at petroules.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From lpapp at kde.org Wed Jun 5 06:26:47 2013 From: lpapp at kde.org (Laszlo Papp) Date: Wed, 5 Jun 2013 07:26:47 +0300 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> <1974045.ozbSzzqN8G@tjmaciei-mobl2> Message-ID: On Wed, Jun 5, 2013 at 7:03 AM, Jake Thomas Petroules < jake.petroules at petroules.com> wrote: > I was being half-sarcastic about 2016, but I do strongly disagree that we > should indiscriminately support only N number of versions of OS X at a > time; it's too rigid. I think significantly more weight should be given to > the version's market share. > Yes, I fully agree. Time is not really a good measure (especially in this case IMHO) at all as what matters in the end of the day is the end users. :-) Laszlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From olivier at woboq.com Wed Jun 5 09:32:03 2013 From: olivier at woboq.com (Olivier Goffart) Date: Wed, 05 Jun 2013 09:32:03 +0200 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1712636.K8dc6PyfMS@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> Message-ID: <2032291.TEUGFMpsSG@gargamel> On Tuesday 04 June 2013 15:55:10 Thiago Macieira wrote: > Hello all > > As of 3d0a60aaa4077a8 in Qt 5.2, Qt requires libc++ in order to build on Mac > with clang. That means the minimum deployment target for macx-clang is Mac > OS X 10.7 now. > > Question: do we want to keep supporting Mac OS X 10.6? If so, for how long? > > And if not, can we drop macx-g++? The g++ compiler that comes bundled with > XCode is broken and horribly outdated. > > What do you think? > > PS: OS X 10.9 is expected to be announced at WWDC this month. That means Qt > 5.2 will need to support 10.9. At the same time, 10.6's last update will be > over 2 years old when 5.2 ships. This was already mentioned in the thread "[Announce] Changes to building Qt on Mac OS X" Can we not still target OS X 10.6 while using libc++? (provided of course that libc++ is also shipped with that application in addition to Qt for that platform) That way we can still support os x 10.6 while stopping supporting obsolete gcc. (Then we could start using C++11 features in Qt, such as auto or lambda, which I think are worth it) -- Olivier Woboq - Qt services and support - http://woboq.com - http://code.woboq.org From Martin.Smith at digia.com Wed Jun 5 10:12:04 2013 From: Martin.Smith at digia.com (Martin Smith) Date: Wed, 5 Jun 2013 10:12:04 +0200 Subject: [Development] Correct way to create Qt5's doc when packaging from submodules sources. In-Reply-To: <3253318.VgByaD4dMm@tonks> References: <3253318.VgByaD4dMm@tonks> Message-ID: On Jun 4, 2013, at 8:13 PM, Lisandro Damián Nicanor Pérez Meyer wrote: > Hi! I'm one of Debian's Qt maintainers and I have some questions on how to > properly build the Qt5 documentation. We are compiling everything from the > submodules tarballs, as it makes maintainance much easier. > > While packaging qtdoc, I noticed that I needed qt-module-defaults.qdocconf > shipped by qtbase, so far so good. > > But then I got messages like: > > addons.qdoc:28: warning: Can't link to 'Qt ActiveQt' > addons.qdoc:28: warning: Can't link to 'Qt Concurrent' > addons.qdoc:28: warning: Can't link to 'Concurrent Programming' > [many more] Yes, there remain many qdoc warnings/errors left over from the modularisation period. Depending on which Qt5 you have, you might be seeing on the order of 3000 of these. We continue to work to correct them, but it will take some time. The ones you list above are part of that problem, so I believe you are generating the docs correctly. To confirm, just load some pages in one module that link to pages in another module. e.g. load index.html in doc/qtdoc and navigate from there to almost anywhere and you will be using cross-module links. If those are working, then the docs are correct unless you find some major failure, like a missing module. Feel free to report in JIRA any errors you run into that are important for your users. If we know which broken links etc people are seeing most often, we fix those first. Otherwise we just grind through the qdoc output. martin > > The same happens for other sources too. > > We are using method 2 as described in qtdoc/README, ie, using > > qmake > make docs > > So the questions are: am I missing something, or maybe I just got the wrong > method? > > Kinds regards, Lisandro. > > -- > > Lisandro Damián Nicanor Pérez Meyer > http://perezmeyer.com.ar/ > http://perezmeyer.blogspot.com/_______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From oswald.buddenhagen at digia.com Wed Jun 5 11:02:30 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Wed, 5 Jun 2013 11:02:30 +0200 Subject: [Development] Correct way to create Qt5's doc when packaging from submodules sources. In-Reply-To: <3253318.VgByaD4dMm@tonks> References: <3253318.VgByaD4dMm@tonks> Message-ID: <20130605090230.GC23796@troll08.it.local> On Tue, Jun 04, 2013 at 03:13:22PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > We are compiling everything from the submodules tarballs, as it makes > maintainance much easier. > i have bad news for you ... the full qt doc generation is a two-pass process which only works with the aggregate source tree. otherwise forward references don't work. in principle it should be possible to do the reference validation only after everything has been built, but that's not how qdoc & co. currently work, and it would be a bit annoying for the doc writers, so the system would need to support both early and delayed link validation. also, automatic generation of cross-module class hierarchy diagrams would become *really* challenging, if we ever tried it ... From robertknight at gmail.com Wed Jun 5 11:05:23 2013 From: robertknight at gmail.com (Robert Knight) Date: Wed, 5 Jun 2013 10:05:23 +0100 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <2032291.TEUGFMpsSG@gargamel> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <2032291.TEUGFMpsSG@gargamel> Message-ID: > Supporting 10.6 is a huge priority given that version has the largest market share of all OS X versions (about 35%). > Do we really want to wipe out over a third of potential end-users of Qt-based products? > Dropping support for it at this point is an absolutely terrible idea, and 10.9 is not even revealed yet. For our website (where the main audience is students and researchers and consequently quite Mac-biased) the OS X version split for the previous month for OS X 10.5/6/7/8 was 4%, 23%, 28%, 45%. I believe the usage split for the Mac version of our app is similar, though I'd have to confirm. Similar numbers to what Jake reported in other words and in our case, the proportion of OS X users on 10.6 is higher than the proportion of Windows users still on XP. I can see that a lot of work has gone into platform integration improvements in Qt 5 so it would be great if we could benefit from that without having to drop support for a large proportion of Mac users. > +1. If Qt drops support for OSX 10.6 we'll be unable to upgrade to 5.2+ for the foreseeable future. > Unfortunately 10.6 is looking like Mac's XP. The migration from OS X 10.5/6 to newer versions looks steadier than for Windows for us at least. On the other hand, Apple makes it somewhat harder to support old versions of OS X compared to Windows. Regards, Rob. On 5 June 2013 08:32, Olivier Goffart wrote: > On Tuesday 04 June 2013 15:55:10 Thiago Macieira wrote: >> Hello all >> >> As of 3d0a60aaa4077a8 in Qt 5.2, Qt requires libc++ in order to build on Mac >> with clang. That means the minimum deployment target for macx-clang is Mac >> OS X 10.7 now. >> >> Question: do we want to keep supporting Mac OS X 10.6? If so, for how long? >> >> And if not, can we drop macx-g++? The g++ compiler that comes bundled with >> XCode is broken and horribly outdated. >> >> What do you think? >> >> PS: OS X 10.9 is expected to be announced at WWDC this month. That means Qt >> 5.2 will need to support 10.9. At the same time, 10.6's last update will be >> over 2 years old when 5.2 ships. > > This was already mentioned in the thread > "[Announce] Changes to building Qt on Mac OS X" > > Can we not still target OS X 10.6 while using libc++? > (provided of course that libc++ is also shipped with that application in > addition to Qt for that platform) > > That way we can still support os x 10.6 while stopping supporting obsolete > gcc. > > (Then we could start using C++11 features in Qt, such as auto or lambda, which > I think are worth it) > > -- > Olivier > > Woboq - Qt services and support - http://woboq.com - http://code.woboq.org > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From tor.arne.vestbo at digia.com Wed Jun 5 12:44:16 2013 From: tor.arne.vestbo at digia.com (=?ISO-8859-1?Q?Tor_Arne_Vestb=F8?=) Date: Wed, 5 Jun 2013 12:44:16 +0200 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <2032291.TEUGFMpsSG@gargamel> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <2032291.TEUGFMpsSG@gargamel> Message-ID: <51AF1680.6000201@digia.com> On 6/5/13 9:32 , Olivier Goffart wrote: > Can we not still target OS X 10.6 while using libc++? > (provided of course that libc++ is also shipped with that application in > addition to Qt for that platform) Building upstream libc++ for 10.6 is not really supported from what I can tell, so we would have to use an older libc++ that still supported it. Also, the Xcode toolchain's clang has a hard-coded check that you're targeting 10.7+ if you're using libc++, so you'd have to use upstream llvm without the check as well :/ So perhaps possible, but not really practical AFAICT. tor arne From Richard.Gustavsen at digia.com Wed Jun 5 12:49:14 2013 From: Richard.Gustavsen at digia.com (Gustavsen Richard) Date: Wed, 5 Jun 2013 10:49:14 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1974045.ozbSzzqN8G@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> <1974045.ozbSzzqN8G@tjmaciei-mobl2> Message-ID: On Jun 5, 2013, at 5:26 AM, Thiago Macieira wrote: > On terça-feira, 4 de junho de 2013 19.32.57, Jake Thomas Petroules wrote: >> Well, Xcode 5.0 will be dropping support for GCC, so the only way to target >> 10.6 or below will be with clang + libstc++. > > Right, I missed that clang + libstdc++ was still possible with -no-c++11. It's > a non-default option. > > I guess we conclude then: > a) we can keep support for 10.6 for the time being, with macx-clang > b) we should deprecate macx-g++, since XCode 5.0 will not have that anymore >From reading this thread, it seems that 10.6 support is pretty important. But right now you need to build Qt from sources yourself to get it. Is this good enough? It sounds like it would be better if the binary package continued with 10.6 support when so many users still has that version. Those that need C++11 and don't need to target 10.6 could still build Qt themselves (rather than the opposite)... -Richard > >> 10.5 came out in 2007 and was dropped by Qt in 2012. 10.6 came out in 2009 >> so let's drop 10.6 somewhere around 2015 or even 2016 (I add a year because >> of its higher market share). We should have 10.11 by then. > > I'm not sure I like that idea. We've always kept support for the past 3 > versions of Mac OS X. Until 10.9 now, that meant roughly 6 years of support > from us. If we keep that rate, we should support 10.6 at least until June > 2014. > > So, if we keep current practice, Qt 5.3 or 5.4 will drop support for it > anyway. That's 2014, not 2015 or 2016. > > Also, please note we're talking about software that switches to Qt 5.2. That > is, we're talking about software released in 2014. And people keep telling me > that they can't upgrade Qt after a cycle started. > > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From jake.petroules at petroules.com Wed Jun 5 14:31:36 2013 From: jake.petroules at petroules.com (Jake Thomas Petroules) Date: Wed, 5 Jun 2013 08:31:36 -0400 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> <1974045.ozbSzzqN8G@tjmaciei-mobl2> Message-ID: <01861B82-E6AD-460B-967E-ACBEBFB8D359@petroules.com> On Jun 5, 2013, at 6:49 AM, Gustavsen Richard wrote: > > On Jun 5, 2013, at 5:26 AM, Thiago Macieira wrote: > >> On terça-feira, 4 de junho de 2013 19.32.57, Jake Thomas Petroules wrote: >>> Well, Xcode 5.0 will be dropping support for GCC, so the only way to target >>> 10.6 or below will be with clang + libstc++. >> >> Right, I missed that clang + libstdc++ was still possible with -no-c++11. It's >> a non-default option. >> >> I guess we conclude then: >> a) we can keep support for 10.6 for the time being, with macx-clang >> b) we should deprecate macx-g++, since XCode 5.0 will not have that anymore > >> From reading this thread, it seems that 10.6 support is pretty important. But right now you need to build Qt from sources yourself to get it. > Is this good enough? It sounds like it would be better if the binary package continued with 10.6 support when so many users still > has that version. > Those that need C++11 and don't need to target 10.6 could still build Qt themselves (rather than the opposite)... > > -Richard Perhaps the Qt Project could distribute two different packages: one libc++ based for 10.7+, and one libstdc++ based for 10.6+? >> >>> 10.5 came out in 2007 and was dropped by Qt in 2012. 10.6 came out in 2009 >>> so let's drop 10.6 somewhere around 2015 or even 2016 (I add a year because >>> of its higher market share). We should have 10.11 by then. >> >> I'm not sure I like that idea. We've always kept support for the past 3 >> versions of Mac OS X. Until 10.9 now, that meant roughly 6 years of support >> from us. If we keep that rate, we should support 10.6 at least until June >> 2014. >> >> So, if we keep current practice, Qt 5.3 or 5.4 will drop support for it >> anyway. That's 2014, not 2015 or 2016. >> >> Also, please note we're talking about software that switches to Qt 5.2. That >> is, we're talking about software released in 2014. And people keep telling me >> that they can't upgrade Qt after a cycle started. >> >> >> -- >> Thiago Macieira - thiago.macieira (AT) intel.com >> Software Architect - Intel Open Source Technology Center >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Jake Petroules Chief Technology Officer Petroules Corporation · www.petroules.com Email: jake.petroules at petroules.com -------------- next part -------------- An HTML attachment was scrubbed... URL: From perezmeyer at gmail.com Wed Jun 5 15:16:13 2013 From: perezmeyer at gmail.com (Lisandro =?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer) Date: Wed, 05 Jun 2013 10:16:13 -0300 Subject: [Development] Correct way to create Qt5's doc when packaging from submodules sources. In-Reply-To: <20130605090230.GC23796@troll08.it.local> References: <3253318.VgByaD4dMm@tonks> <20130605090230.GC23796@troll08.it.local> Message-ID: <1779712.1bQO7I130D@luna> On Wednesday 05 June 2013 11:02:30 Oswald Buddenhagen wrote: > On Tue, Jun 04, 2013 at 03:13:22PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > > We are compiling everything from the submodules tarballs, as it makes > > maintainance much easier. > > i have bad news for you ... > > the full qt doc generation is a two-pass process which only works with > the aggregate source tree. otherwise forward references don't work. > > in principle it should be possible to do the reference validation only > after everything has been built, but that's not how qdoc & co. currently > work, and it would be a bit annoying for the doc writers, so the system > would need to support both early and delayed link validation. > also, automatic generation of cross-module class hierarchy diagrams > would become *really* challenging, if we ever tried it ... Thank you both for the answers. We will see what we can do then :-) -- Q. How did the programmer die in the shower? A. He read the shampoo bottle instructions: Lather. Rinse. Repeat. http://www.devtopics.com/best-programming-jokes/ Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: From tor.arne.vestbo at digia.com Wed Jun 5 15:49:53 2013 From: tor.arne.vestbo at digia.com (=?ISO-8859-1?Q?Tor_Arne_Vestb=F8?=) Date: Wed, 5 Jun 2013 15:49:53 +0200 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <965E79AE-828B-44C7-87D4-E4F4CDEC5EEF@petroules.com> <1974045.ozbSzzqN8G@tjmaciei-mobl2> Message-ID: <51AF4201.6050506@digia.com> On 6/5/13 12:49 , Gustavsen Richard wrote: >> From reading this thread, it seems that 10.6 support is pretty >> important. But right now you need to build Qt from sources yourself >> to get it. > Is this good enough? It sounds like it would be better if the binary > package continued with 10.6 support when so many users still has that > version. Those that need C++11 and don't need to target 10.6 could > still build Qt themselves (rather than the opposite)... I agree that the SDK should perhaps span to include 10.6 deployment support. Technically that's up to the people building the binary SDK packages, if they configure with -no-c++11 or not. Qt's configure will by default detect if it's supported, and adjusts the deployment target accordingly. tor arne From jfaust at suitabletech.com Wed Jun 5 19:22:59 2013 From: jfaust at suitabletech.com (Josh Faust) Date: Wed, 5 Jun 2013 10:22:59 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <2032291.TEUGFMpsSG@gargamel> Message-ID: > The migration from OS X 10.5/6 to newer versions looks steadier than > for Windows for us at least. On the other hand, Apple makes it > somewhat harder to support old versions of OS X compared to Windows. > The analogy isn't perfect, that's for sure -- Microsoft still supports XP ~11 years later, while Apple does everything they can to stop support as quickly as they can. Unfortunately it seems like those of our customers on 10.6 are not inclined to upgrade, though our product hasn't been out long enough to have clear data on migration. Josh -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Wed Jun 5 19:45:43 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 05 Jun 2013 10:45:43 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <51AF4201.6050506@digia.com> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <51AF4201.6050506@digia.com> Message-ID: <2059205.XD0WAx5kYd@tjmaciei-mobl2> On quarta-feira, 5 de junho de 2013 15.49.53, Tor Arne Vestbø wrote: > On 6/5/13 12:49 , Gustavsen Richard wrote: > >> From reading this thread, it seems that 10.6 support is pretty > >> important. But right now you need to build Qt from sources yourself > >> to get it. > > > > Is this good enough? It sounds like it would be better if the binary > > package continued with 10.6 support when so many users still has that > > version. Those that need C++11 and don't need to target 10.6 could > > still build Qt themselves (rather than the opposite)... > > I agree that the SDK should perhaps span to include 10.6 deployment support. > > Technically that's up to the people building the binary SDK packages, if > they configure with -no-c++11 or not. Qt's configure will by default > detect if it's supported, and adjusts the deployment target accordingly. Since changing to libc++ could be a binary incompatible change[*], we should probably stick to libstdc++ for now and disable C++11 in Qt's build for OS X. Since we're right now building with GCC 4.2, no C++11 is in use in those builds anyway, so there's no loss. And there will probably be a gain, by upgrading the compiler. [*] it does not affect Qt's ABI, but it might affect other libraries that the user is compiling against. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From olszak.tomasz at gmail.com Thu Jun 6 00:00:25 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Wed, 5 Jun 2013 22:00:25 +0000 Subject: [Development] Jira components for Qt for Tizen project Message-ID: Hi, I have created jira task[1] for creating new components within Qt jira project. We would like to use jira for Qt for Tizen development. We believe that having tasks will have positive impact on potential developers (just pick up a task and code) and progress of work will be easier to check. If initiative in such early stage does not fit into jira we will use a table on wiki. What do you think? [1] https://bugreports.qt-project.org/browse/QTJIRA-211 -- Regards, Tomasz Olszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Thu Jun 6 00:08:33 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 05 Jun 2013 15:08:33 -0700 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: References: Message-ID: <2448734.qNSaX3qMb6@tjmaciei-mobl2> On quarta-feira, 5 de junho de 2013 22.00.25, Tomasz Olszak wrote: > Hi, > I have created jira task[1] for creating new components within Qt jira > project. > > We would like to use jira for Qt for Tizen development. We believe that > having tasks will have positive impact on potential developers (just pick > up a task and code) and progress of work will be easier to check. If > initiative in such early stage does not fit into jira we will use a table > on wiki. > > What do you think? > > [1] https://bugreports.qt-project.org/browse/QTJIRA-211 How are we organising for the other platforms / adaptations? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From oliver.wolff at digia.com Thu Jun 6 07:27:53 2013 From: oliver.wolff at digia.com (Oliver Wolff) Date: Thu, 6 Jun 2013 07:27:53 +0200 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: <2448734.qNSaX3qMb6@tjmaciei-mobl2> References: <2448734.qNSaX3qMb6@tjmaciei-mobl2> Message-ID: <51B01DD9.3040306@digia.com> Am 06/06/2013 00:08, schrieb Thiago Macieira: > On quarta-feira, 5 de junho de 2013 22.00.25, Tomasz Olszak wrote: >> Hi, >> I have created jira task[1] for creating new components within Qt jira >> project. >> >> We would like to use jira for Qt for Tizen development. We believe that >> having tasks will have positive impact on potential developers (just pick >> up a task and code) and progress of work will be easier to check. If >> initiative in such early stage does not fit into jira we will use a table >> on wiki. >> >> What do you think? >> >> [1] https://bugreports.qt-project.org/browse/QTJIRA-211 > > How are we organising for the other platforms / adaptations? > At least for the WinRT port we create bugs for the existing components and use a label ("winrt") to be able to identify "our" bugs. > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > From nicolas.arnaud-cormos at kdab.com Thu Jun 6 08:31:34 2013 From: nicolas.arnaud-cormos at kdab.com (Nicolas Arnaud-Cormos) Date: Thu, 06 Jun 2013 08:31:34 +0200 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: <51B01DD9.3040306@digia.com> References: <2448734.qNSaX3qMb6@tjmaciei-mobl2> <51B01DD9.3040306@digia.com> Message-ID: <51B02CC6.2080200@kdab.com> On 06/06/2013 07:27, Oliver Wolff wrote: > Am 06/06/2013 00:08, schrieb Thiago Macieira: >> On quarta-feira, 5 de junho de 2013 22.00.25, Tomasz Olszak wrote: >>> Hi, >>> I have created jira task[1] for creating new components within Qt jira >>> project. >>> >>> We would like to use jira for Qt for Tizen development. We believe that >>> having tasks will have positive impact on potential developers (just pick >>> up a task and code) and progress of work will be easier to check. If >>> initiative in such early stage does not fit into jira we will use a table >>> on wiki. >>> >>> What do you think? >>> >>> [1] https://bugreports.qt-project.org/browse/QTJIRA-211 >> >> How are we organising for the other platforms / adaptations? >> > > At least for the WinRT port we create bugs for the existing components > and use a label ("winrt") to be able to identify "our" bugs. Same for BlackBerry, there's a "BlackBerry10" label used. Nicolas -- Nicolas Arnaud-Cormos | nicolas.arnaud-cormos at kdab.com | Senior Software Engineer KDAB (France) S.A.S., a KDAB Group company Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-independent software solutions From olszak.tomasz at gmail.com Thu Jun 6 08:35:05 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Thu, 6 Jun 2013 08:35:05 +0200 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: <51B02CC6.2080200@kdab.com> References: <2448734.qNSaX3qMb6@tjmaciei-mobl2> <51B01DD9.3040306@digia.com> <51B02CC6.2080200@kdab.com> Message-ID: 2013/6/6 Nicolas Arnaud-Cormos > On 06/06/2013 07:27, Oliver Wolff wrote: > > Am 06/06/2013 00:08, schrieb Thiago Macieira: > >> On quarta-feira, 5 de junho de 2013 22.00.25, Tomasz Olszak wrote: > >>> Hi, > >>> I have created jira task[1] for creating new components within Qt jira > >>> project. > >>> > >>> We would like to use jira for Qt for Tizen development. We believe that > >>> having tasks will have positive impact on potential developers (just > pick > >>> up a task and code) and progress of work will be easier to check. If > >>> initiative in such early stage does not fit into jira we will use a > table > >>> on wiki. > >>> > >>> What do you think? > >>> > >>> [1] https://bugreports.qt-project.org/browse/QTJIRA-211 > >> > >> How are we organising for the other platforms / adaptations? > >> > > > > At least for the WinRT port we create bugs for the existing components > > and use a label ("winrt") to be able to identify "our" bugs. > > Same for BlackBerry, there's a "BlackBerry10" label used. > > Nicolas > > -- > Nicolas Arnaud-Cormos | nicolas.arnaud-cormos at kdab.com | Senior Software > Engineer > KDAB (France) S.A.S., a KDAB Group company > Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090 > KDAB - Qt Experts - Platform-independent software solutions > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > If task filters used by other teams are based on labels instead of components It should be no problem for us. Who is the person responsible and can give me green light for that? I don't want spam jira... Regards, Tomasz Olszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From Eike.Ziller at digia.com Thu Jun 6 09:52:53 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Thu, 6 Jun 2013 07:52:53 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <2059205.XD0WAx5kYd@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <51AF4201.6050506@digia.com>,<2059205.XD0WAx5kYd@tjmaciei-mobl2> Message-ID: > ________________________________________ > From: Thiago Macieira [thiago.macieira at intel.com] > Sent: 05 June 2013 19:45 > To: development at qt-project.org > Subject: Re: [Development] Clarification on Mac 10.6 support for Qt 5.2 > > On quarta-feira, 5 de junho de 2013 15.49.53, Tor Arne Vestbø wrote: > > On 6/5/13 12:49 , Gustavsen Richard wrote: > > >> From reading this thread, it seems that 10.6 support is pretty > > >> important. But right now you need to build Qt from sources yourself > > >> to get it. > > > > > > Is this good enough? It sounds like it would be better if the binary > > > package continued with 10.6 support when so many users still has that > > > version. Those that need C++11 and don't need to target 10.6 could > > > still build Qt themselves (rather than the opposite)... > > > > I agree that the SDK should perhaps span to include 10.6 deployment support. AFAIK QtWebKit no longer supports video on 10.6, so that would mean that there would need to be a 10.6 specific SDK version, or the SDK would not support this on *any* Mac OS version (since you can't configure QtWebKit in a way that it would support that on 10.7+ and still run on 10.6). I don't know if the latter would be acceptable or not. > > Technically that's up to the people building the binary SDK packages, if > > they configure with -no-c++11 or not. Qt's configure will by default > > detect if it's supported, and adjusts the deployment target accordingly. > > Since changing to libc++ could be a binary incompatible change[*], we should > probably stick to libstdc++ for now and disable C++11 in Qt's build for OS X. > Since we're right now building with GCC 4.2, no C++11 is in use in those > builds anyway, so there's no loss. And there will probably be a gain, by > upgrading the compiler. Just for clarification, the default mkspec of Qt 5 on Mac is clang (without libc++), not gcc/g++ . > [*] it does not affect Qt's ABI, but it might affect other libraries that the > user is compiling against. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center -- Eike Ziller Senior Software Engineer Digia Germany GmbH Rudower Chaussee 13, D-12489 Berlin Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B, Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius From thiago.macieira at intel.com Thu Jun 6 10:06:46 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 06 Jun 2013 01:06:46 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1712636.K8dc6PyfMS@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> Message-ID: <1539632.iBMIV3QNep@tjmaciei-mobl2> On terça-feira, 4 de junho de 2013 15.55.10, Thiago Macieira wrote: > As of 3d0a60aaa4077a8 in Qt 5.2 That change is in 5.1. That means we need to change the Qt 5.1 RC1 build scripts to pass -no-c++11. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Thu Jun 6 10:07:42 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 06 Jun 2013 01:07:42 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <2059205.XD0WAx5kYd@tjmaciei-mobl2> Message-ID: <5439982.uQCgGCbZen@tjmaciei-mobl2> On quinta-feira, 6 de junho de 2013 07.52.53, Ziller Eike wrote: > Just for clarification, the default mkspec of Qt 5 on Mac is clang (without > libc++), not gcc/g++ . The default mkspec on Mac is now clang *with* libc++. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Kai.Koehne at digia.com Thu Jun 6 13:22:28 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Thu, 6 Jun 2013 11:22:28 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1539632.iBMIV3QNep@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <1539632.iBMIV3QNep@tjmaciei-mobl2> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08BE9C8@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On > Behalf Of Thiago Macieira > Sent: Thursday, June 06, 2013 10:07 AM > To: development at qt-project.org > Subject: Re: [Development] Clarification on Mac 10.6 support for Qt 5.2 > > On terça-feira, 4 de junho de 2013 15.55.10, Thiago Macieira wrote: > > As of 3d0a60aaa4077a8 in Qt 5.2 > > That change is in 5.1. > > That means we need to change the Qt 5.1 RC1 build scripts to pass -no-c++11. Isn't the lower risk approach to just revert the change in the release branch? That is, we'd have the same behavior as with 5.0. I understand that passing -no-c++11 explicitly would be more invasive. Regards Kai > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center From thiago.macieira at intel.com Thu Jun 6 17:15:47 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 06 Jun 2013 08:15:47 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08BE9C8@IT-EXMB01-HKI.it.local> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <1539632.iBMIV3QNep@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BE9C8@IT-EXMB01-HKI.it.local> Message-ID: <1976295.ivTszu0qBe@tjmaciei-mobl2> On quinta-feira, 6 de junho de 2013 11.22.28, Koehne Kai wrote: > > That means we need to change the Qt 5.1 RC1 build scripts to pass > > -no-c++11. > Isn't the lower risk approach to just revert the change in the release > branch? That is, we'd have the same behavior as with 5.0. I understand that > passing -no-c++11 explicitly would be more invasive. To be honest, it might be. Liang found an issue yesterday when compiling QtLocation, since it has a .pro file with CONFIG -= qt. The problem is that the revert needs investigation. I'm not sure that reverting this commit alone is enough or won't break other things out there. Passing -no-c++11 should be easy. But it doesn't fix Liang's problem. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From perezmeyer at gmail.com Thu Jun 6 17:25:18 2013 From: perezmeyer at gmail.com (Lisandro =?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer) Date: Thu, 06 Jun 2013 12:25:18 -0300 Subject: [Development] Making docs being built for every module Message-ID: <3845656.8OqHZ9G1fQ@tonks> Hi! I have seen that many options from qtbase get inherited by other submodules when building them from separate tarballs. Is there a way to tell qtbase to build it's documentation when make is called? It would be awesome if this could also be inherited by the other submodules. Kinds regards, Lisandro. -- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: From oswald.buddenhagen at digia.com Thu Jun 6 17:38:53 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Thu, 6 Jun 2013 17:38:53 +0200 Subject: [Development] Making docs being built for every module In-Reply-To: <3845656.8OqHZ9G1fQ@tonks> References: <3845656.8OqHZ9G1fQ@tonks> Message-ID: <20130606153853.GC24564@troll08.it.local> On Thu, Jun 06, 2013 at 12:25:18PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > Is there a way to tell qtbase to build it's documentation when make is called? > It would be awesome if this could also be inherited by the other submodules. > no. docs is a separate target, and there is no intention to change that (in fact, i could not even work, because a full doc build in qtbase requires qttools having already been built). From thiago.macieira at intel.com Thu Jun 6 17:44:21 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 06 Jun 2013 08:44:21 -0700 Subject: [Development] Making docs being built for every module In-Reply-To: <20130606153853.GC24564@troll08.it.local> References: <3845656.8OqHZ9G1fQ@tonks> <20130606153853.GC24564@troll08.it.local> Message-ID: <1769896.87oTTDbapJ@tjmaciei-mobl2> On quinta-feira, 6 de junho de 2013 17.38.53, Oswald Buddenhagen wrote: > On Thu, Jun 06, 2013 at 12:25:18PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > > Is there a way to tell qtbase to build it's documentation when make is > > called? It would be awesome if this could also be inherited by the other > > submodules. > no. docs is a separate target, and there is no intention to change that > (in fact, i could not even work, because a full doc build in qtbase > requires qttools having already been built). Can we simply ship a qtdocs tarball with all documentation pre-built? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From perezmeyer at gmail.com Thu Jun 6 17:45:15 2013 From: perezmeyer at gmail.com (Lisandro =?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer) Date: Thu, 06 Jun 2013 12:45:15 -0300 Subject: [Development] Making docs being built for every module In-Reply-To: <20130606153853.GC24564@troll08.it.local> References: <3845656.8OqHZ9G1fQ@tonks> <20130606153853.GC24564@troll08.it.local> Message-ID: <2118391.mbracr73Sp@tonks> On Thursday 06 June 2013 17:38:53 Oswald Buddenhagen wrote: > On Thu, Jun 06, 2013 at 12:25:18PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > > Is there a way to tell qtbase to build it's documentation when make is > > called? It would be awesome if this could also be inherited by the other > > submodules. > no. docs is a separate target, and there is no intention to change that > (in fact, i could not even work, because a full doc build in qtbase > requires qttools having already been built). Indeed, it would need bootstrapping. I guess the best we can do is to use the full source tarball just to build the doc. Thanks! -- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: From perezmeyer at gmail.com Thu Jun 6 17:49:53 2013 From: perezmeyer at gmail.com (Lisandro =?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer) Date: Thu, 06 Jun 2013 12:49:53 -0300 Subject: [Development] Making docs being built for every module In-Reply-To: <1769896.87oTTDbapJ@tjmaciei-mobl2> References: <3845656.8OqHZ9G1fQ@tonks> <20130606153853.GC24564@troll08.it.local> <1769896.87oTTDbapJ@tjmaciei-mobl2> Message-ID: <2025089.aPUHHaFil6@tonks> On Thursday 06 June 2013 08:44:21 Thiago Macieira wrote: [snip] > Can we simply ship a qtdocs tarball with all documentation pre-built? At least in Debian's case, it wouldn't be useful, as we need the sources (preferred way of modification) to build them. Of course, if it helps other people, could be an option. Thanks! -- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: From oswald.buddenhagen at digia.com Thu Jun 6 17:57:08 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Thu, 6 Jun 2013 17:57:08 +0200 Subject: [Development] Making docs being built for every module In-Reply-To: <1769896.87oTTDbapJ@tjmaciei-mobl2> References: <3845656.8OqHZ9G1fQ@tonks> <20130606153853.GC24564@troll08.it.local> <1769896.87oTTDbapJ@tjmaciei-mobl2> Message-ID: <20130606155708.GD24564@troll08.it.local> On Thu, Jun 06, 2013 at 08:44:21AM -0700, Thiago Macieira wrote: > On quinta-feira, 6 de junho de 2013 17.38.53, Oswald Buddenhagen wrote: > > On Thu, Jun 06, 2013 at 12:25:18PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > > > Is there a way to tell qtbase to build it's documentation when make is > > > called? It would be awesome if this could also be inherited by the other > > > submodules. > > no. docs is a separate target, and there is no intention to change that > > (in fact, i could not even work, because a full doc build in qtbase > > requires qttools having already been built). > > Can we simply ship a qtdocs tarball with all documentation pre-built? > for the packagers, it would be the best solution to simply include the docs directly into the particular source tarballs. we have been doing that in ancient times. and its consistent with shipping the syncqt'd headers, and configure.exe, even if for somewhat different reasons (the general theme being "simplicity for the user"). From thiago.macieira at intel.com Thu Jun 6 17:58:53 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 06 Jun 2013 08:58:53 -0700 Subject: [Development] Making docs being built for every module In-Reply-To: <20130606155708.GD24564@troll08.it.local> References: <3845656.8OqHZ9G1fQ@tonks> <1769896.87oTTDbapJ@tjmaciei-mobl2> <20130606155708.GD24564@troll08.it.local> Message-ID: <8409652.BZx1pTp4ZI@tjmaciei-mobl2> On quinta-feira, 6 de junho de 2013 17.57.08, Oswald Buddenhagen wrote: > for the packagers, it would be the best solution to simply include the > docs directly into the particular source tarballs. we have been doing > that in ancient times. and its consistent with shipping the syncqt'd > headers, and configure.exe, even if for somewhat different reasons (the > general theme being "simplicity for the user"). Right. The drawback is a major increase in the size of those tarballs. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From perezmeyer at gmail.com Thu Jun 6 18:07:06 2013 From: perezmeyer at gmail.com (Lisandro =?ISO-8859-1?Q?Dami=E1n_Nicanor_P=E9rez?= Meyer) Date: Thu, 06 Jun 2013 13:07:06 -0300 Subject: [Development] Making docs being built for every module In-Reply-To: <8409652.BZx1pTp4ZI@tjmaciei-mobl2> References: <3845656.8OqHZ9G1fQ@tonks> <20130606155708.GD24564@troll08.it.local> <8409652.BZx1pTp4ZI@tjmaciei-mobl2> Message-ID: <1497962.ytYCiBCgst@tonks> On Thursday 06 June 2013 08:58:53 Thiago Macieira wrote: > On quinta-feira, 6 de junho de 2013 17.57.08, Oswald Buddenhagen wrote: > > for the packagers, it would be the best solution to simply include the > > docs directly into the particular source tarballs. we have been doing > > that in ancient times. and its consistent with shipping the syncqt'd > > headers, and configure.exe, even if for somewhat different reasons (the > > general theme being "simplicity for the user"). > > Right. > > The drawback is a major increase in the size of those tarballs. And some of us would be required to re generate in order to asset that we can build it from source, so it wouldn't help a lot. Once again, this is our specific case, some other may benefit from this. -- Lisandro Damián Nicanor Pérez Meyer http://perezmeyer.com.ar/ http://perezmeyer.blogspot.com/ -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: This is a digitally signed message part. URL: From vincentb1981 at gmail.com Thu Jun 6 18:20:51 2013 From: vincentb1981 at gmail.com (Vincent) Date: Thu, 6 Jun 2013 18:20:51 +0200 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 Message-ID: Hello, I would like to be able to deploy Qt applications on Mac OS X 10.6. The development environment is on 10.7. I tried with Qt 5.0.2 and Qt 5.1.0 Beta 1 (downloaded binaries from qt-project.org) and none of the compiled applications run on Mac OS X 10.6. Then I tried to compile Qt 5.1.0 Beta 1 on 10.7, with the following configure options: ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos Still, applications don't run on 10.6. Note that I've then compiled Qt against 10.8 sdk. After discussing with Tor it seems that I need to provide to ./configure the no-c+11 option. I would like to be sure that the Qt build I'll be compiling is as close as possible as the standard Qt available through binary download at qt-project.org. What is the full set of options for the configure script used by Qt Team in order release binaries? Thanks, Cosmo Note: here are the runtime errors on 10.6: * Output of running on 10.6 an app built against Qt 5.0.2: dyld: Symbol not found: _kCFWebServicesProviderDefaultDisplayNameKey Referenced from: /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit Expected in: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation in /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit Trace/BPT trap * And running on 10.6 an app built against 5.1.0 Beta 1 (Qt was compiled on Mac OS X 10.7 with ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos): dyld: Library not loaded: /usr/lib/libc++.1.dylib Referenced from: /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets Reason: image not found Trace/BPT trap -------------- next part -------------- An HTML attachment was scrubbed... URL: From Sergio.Ahumada at digia.com Thu Jun 6 18:34:52 2013 From: Sergio.Ahumada at digia.com (Ahumada Sergio) Date: Thu, 6 Jun 2013 16:34:52 +0000 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 In-Reply-To: References: Message-ID: <9B4D1DADF5006F4DB6666312421B98E5FFEA29@IT-EXMB01-HKI.it.local> On 06/06/2013 06:20 PM, Vincent wrote:> > I would like to be sure that the Qt build I'll be compiling is as close > as possible as the standard Qt available through binary download at > qt-project.org . > > What is the full set of options for the configure script used by Qt Team > in order release binaries? > Hi, Here you can find the configure options used to build the release binaries. http://qt.gitorious.org/qtsdk/qtsdk/trees/master/release-tools/bld_config For Mac in particular we use http://qt.gitorious.org/qtsdk/qtsdk/blobs/master/release-tools/bld_config/configure_mac_opensource + ' -prefix /some/directory/somewhere' Hope this helps. Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt From oswald.buddenhagen at digia.com Thu Jun 6 18:51:44 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Thu, 6 Jun 2013 18:51:44 +0200 Subject: [Development] Making docs being built for every module In-Reply-To: <1497962.ytYCiBCgst@tonks> References: <3845656.8OqHZ9G1fQ@tonks> <20130606155708.GD24564@troll08.it.local> <8409652.BZx1pTp4ZI@tjmaciei-mobl2> <1497962.ytYCiBCgst@tonks> Message-ID: <20130606165144.GA32400@troll08.it.local> On Thu, Jun 06, 2013 at 01:07:06PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > On Thursday 06 June 2013 08:58:53 Thiago Macieira wrote: > > On quinta-feira, 6 de junho de 2013 17.57.08, Oswald Buddenhagen wrote: > > > for the packagers, it would be the best solution to simply include the > > > docs directly into the particular source tarballs. > > > > The drawback is a major increase in the size of those tarballs. > hmm, yeah. what are the numbers? > And some of us would be required to re generate in order to asset that > we can build it from source, so it wouldn't help a lot. > that seems like absurd puritanism to me. are you also required to run autoconf even though each source tarball contains a pre-made configure? also, some time ago, qt didn't come with all the sources, so you were forced to use pre-generated artificats. did you refuse to ship that? regards From Eike.Ziller at digia.com Thu Jun 6 20:54:10 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Thu, 6 Jun 2013 18:54:10 +0000 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 In-Reply-To: References: Message-ID: > From: development-bounces+eike.ziller=digia.com at qt-project.org [development-bounces+eike.ziller=digia.com at qt-project.org] on behalf of Vincent [vincentb1981 at gmail.com] > Sent: 06 June 2013 18:20 > To: development at qt-project.org > Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 > > Hello, > > I would like to be able to deploy Qt applications on Mac OS X 10.6. The development environment is on 10.7. > > I tried with Qt 5.0.2 and Qt 5.1.0 Beta 1 (downloaded binaries from qt-project.org) and none of the compiled applications run on Mac OS X 10.6. > > Then I tried to compile Qt 5.1.0 Beta 1 on 10.7, with the following configure options: > ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos > > Still, applications don't run on 10.6. Note that I've then compiled Qt against 10.8 sdk. > > After discussing with Tor it seems that I need to provide to ./configure the no-c+11 option. > > I would like to be sure that the Qt build I'll be compiling is as close as possible as the standard Qt available through binary download at qt-project.org. > > What is the full set of options for the configure script used by Qt Team in order release binaries? > > Thanks, > > Cosmo > > > Note: here are the runtime errors on 10.6: > > * Output of running on 10.6 an app built against Qt 5.0.2: > > dyld: Symbol not found: _kCFWebServicesProviderDefaultDisplayNameKey > Referenced from: /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit > Expected in: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation > in /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit > Trace/BPT trap This is the weird way of QtWebKit to tell you that you need to build Qt directly against a Mac 10.6 SDK if you want to deploy Qt applications that use webkit on Mac OS X 10.6... > * And running on 10.6 an app built against 5.1.0 Beta 1 (Qt was compiled on Mac OS X 10.7 with ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos): > > dyld: Library not loaded: /usr/lib/libc++.1.dylib > Referenced from: /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets > Reason: image not found > Trace/BPT trap -- Eike Ziller Senior Software Engineer Digia Germany GmbH Rudower Chaussee 13, D-12489 Berlin Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B, Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Thu Jun 6 19:59:17 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 06 Jun 2013 10:59:17 -0700 Subject: [Development] Making docs being built for every module In-Reply-To: <20130606165144.GA32400@troll08.it.local> References: <3845656.8OqHZ9G1fQ@tonks> <1497962.ytYCiBCgst@tonks> <20130606165144.GA32400@troll08.it.local> Message-ID: <2856760.LWqjWrcDym@tjmaciei-mobl2> On quinta-feira, 6 de junho de 2013 18.51.44, Oswald Buddenhagen wrote: > On Thu, Jun 06, 2013 at 01:07:06PM -0300, Lisandro Damián Nicanor Pérez Meyer wrote: > > On Thursday 06 June 2013 08:58:53 Thiago Macieira wrote: > > > On quinta-feira, 6 de junho de 2013 17.57.08, Oswald Buddenhagen wrote: > > > > for the packagers, it would be the best solution to simply include the > > > > docs directly into the particular source tarballs. > > > > > > The drawback is a major increase in the size of those tarballs. > > hmm, yeah. what are the numbers? Back in Qt 4 days, the increase for the full document set was about 60-70 MB. After compression (the QCH file doesn't compress well, and the HTML help files compress to the size of the QCH file). > > And some of us would be required to re generate in order to asset that > > we can build it from source, so it wouldn't help a lot. > > that seems like absurd puritanism to me. are you also required to run > autoconf even though each source tarball contains a pre-made configure? > also, some time ago, qt didn't come with all the sources, so you were > forced to use pre-generated artificats. did you refuse to ship that? I agree here. You have the option and the ability to rebuild from sources if you need to, but you don't have to. You don't need to re-generate cross-platform pre- generated files. I recommend simply accepting the pre-built documentation. However, tarballs where the "preferred form for making modifications" isn't present are in violation of OSS licenses and, in specific, the DFSG. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Jani.Heikkinen at digia.com Fri Jun 7 11:03:25 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Fri, 7 Jun 2013 09:03:25 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1976295.ivTszu0qBe@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <1539632.iBMIV3QNep@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BE9C8@IT-EXMB01-HKI.it.local> <1976295.ivTszu0qBe@tjmaciei-mobl2> Message-ID: Hi! >The problem is that the revert needs investigation. I'm not sure that >reverting this commit alone is enough or won't break other things out there. For me this sounds quite risky move. Is it really so that we have to do this for Qt5.1 and even Qt5.1 RC1? Or is it possible to make Qt5.1.0 with this and solve this in Qt5.1.1? Br, Jani -----Original Message----- From: development-bounces+jani.heikkinen=digia.com at qt-project.org [mailto:development-bounces+jani.heikkinen=digia.com at qt-project.org] On Behalf Of Thiago Macieira Sent: 6. kesäkuuta 2013 18:16 To: development at qt-project.org Subject: Re: [Development] Clarification on Mac 10.6 support for Qt 5.2 On quinta-feira, 6 de junho de 2013 11.22.28, Koehne Kai wrote: > > That means we need to change the Qt 5.1 RC1 build scripts to pass > > -no-c++11. > Isn't the lower risk approach to just revert the change in the release > branch? That is, we'd have the same behavior as with 5.0. I understand that > passing -no-c++11 explicitly would be more invasive. To be honest, it might be. Liang found an issue yesterday when compiling QtLocation, since it has a .pro file with CONFIG -= qt. The problem is that the revert needs investigation. I'm not sure that reverting this commit alone is enough or won't break other things out there. Passing -no-c++11 should be easy. But it doesn't fix Liang's problem. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center From Kai.Koehne at digia.com Fri Jun 7 12:22:56 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Fri, 7 Jun 2013 10:22:56 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <1539632.iBMIV3QNep@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BE9C8@IT-EXMB01-HKI.it.local> <1976295.ivTszu0qBe@tjmaciei-mobl2> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On > Behalf Of Heikkinen Jani > Sent: Friday, June 07, 2013 11:03 AM > To: Thiago Macieira; development at qt-project.org > Subject: Re: [Development] Clarification on Mac 10.6 support for Qt 5.2 > > Hi! > > >The problem is that the revert needs investigation. I'm not sure that > >reverting this commit alone is enough or won't break other things out there. > > For me this sounds quite risky move. Is it really so that we have to do this for > Qt5.1 and even Qt5.1 RC1? Or is it possible to make Qt5.1.0 with this and > solve this in Qt5.1.1? Alright, let's get this straight. After talking to Eike I understand the following: Situation with Qt 5.0.x - binary installers are compiled with OS X 10.7 - You can deploy with them to 10.6, except QtWebKit (missing symbol) - If you want to deploy QtWebKit with 10.6 you have to compile Qt yourself on OS X 10.6 So, the 10.6 story is already broken somewhat for QtWebKit, even with Qt 5.0.x ... Situation with Qt 5.1 as it is - Binary installer is compiled with OS X 10.7 - You cannot deploy with them to 10.6 - If you want to deploy to 10.6 without QtWebKit you have to compile Qt yourself, on OS X 10.6, or on OS X 10.7 and above with -no-c++11 (to be verified) - If you want to deploy to 10.6 including QtWebKit you have to compile Qt yourself, on OS X 10.6 My suggestion: - Leave Qt 5.1.0 as it is right now, move on with the release process - Investigate providing an additional binary installer with Qt compiled 10.6 (e.g. with 5.1.1) - Thoroughly document the problem for people compiling their own Qt Regards Kai From Tuukka.Turunen at digia.com Fri Jun 7 13:55:03 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Fri, 7 Jun 2013 11:55:03 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> Message-ID: On 7.6.2013 13.22, "Koehne Kai" wrote: > > >> -----Original Message----- >> From: development-bounces+kai.koehne=digia.com at qt-project.org >> [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On >> Behalf Of Heikkinen Jani >> Sent: Friday, June 07, 2013 11:03 AM >> To: Thiago Macieira; development at qt-project.org >> Subject: Re: [Development] Clarification on Mac 10.6 support for Qt 5.2 >> >> Hi! >> >> >The problem is that the revert needs investigation. I'm not sure that >> >reverting this commit alone is enough or won't break other things out >>there. >> >> For me this sounds quite risky move. Is it really so that we have to do >>this for >> Qt5.1 and even Qt5.1 RC1? Or is it possible to make Qt5.1.0 with this >>and >> solve this in Qt5.1.1? > > >Alright, let's get this straight. After talking to Eike I understand the >following: > >Situation with Qt 5.0.x > - binary installers are compiled with OS X 10.7 > - You can deploy with them to 10.6, except QtWebKit (missing symbol) > - If you want to deploy QtWebKit with 10.6 you have to compile Qt >yourself on OS X 10.6 > >So, the 10.6 story is already broken somewhat for QtWebKit, even with Qt >5.0.x ... > >Situation with Qt 5.1 as it is > - Binary installer is compiled with OS X 10.7 > - You cannot deploy with them to 10.6 > - If you want to deploy to 10.6 without QtWebKit you have to compile Qt >yourself, on OS X 10.6, or on OS X 10.7 and above with -no-c++11 (to be >verified) > - If you want to deploy to 10.6 including QtWebKit you have to compile >Qt yourself, on OS X 10.6 > >My suggestion: > - Leave Qt 5.1.0 as it is right now, move on with the release process > - Investigate providing an additional binary installer with Qt compiled >10.6 (e.g. with 5.1.1) > - Thoroughly document the problem for people compiling their own Qt +1 for this suggestion Yours, Tuukka From vincentb1981 at gmail.com Fri Jun 7 14:40:41 2013 From: vincentb1981 at gmail.com (Vincent) Date: Fri, 7 Jun 2013 14:40:41 +0200 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 In-Reply-To: References: Message-ID: OK, now I'm trying to build Qt against 10.6 sdk on the 10.7 machine. I've copied from XCode 4.3.3 the macosx10.6 sdk along 10.7 & 10.8 SDK's. Then configuring with: ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos -no-c++11 -sdk macosx10.6 -v It seems to accept the value of the argument -sdk (if I provide a wrong value, a warning is raised). However, when looking at the clang++ option run during configure step, it seems MacOSX10.8 sdk is used (see -isysroot argument): /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -c -o qcore_mac.o -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -mmacosx-version-min=10.6 -g -gdwarf-2 -fconstant-cfstrings -g -DQMAKE_OPENSOURCE_EDITION -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/library -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/unix -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/win32 -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/mac -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/integrity -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore/5.1.0 -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore/5.1.0/QtCore -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/src/corelib/global -DHAVE_QCONFIG_CPP -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/mkspecs/macx-clang -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/tools/shared -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL -DPROEVALUATOR_DEBUG -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM /Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/src/corelib/kernel/qcore_mac.cpp and the configure step ends up with an error (here 10.6 sdk seems at work): /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -headerpad_max_install_names -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -o stl stltest.o ld: library not found for -lstdc++ clang: error: linker command failed with exit code 1 (use -v to see invocation) make: *** [stl] Error 1 STL disabled. STL functionality check failed! Cannot build Qt with this STL library. Turn on verbose messaging (-v) to /Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/configure to see the final report. *** qtbase/configure exited with non-zero status. 2013/6/6 Ziller Eike > > > From: development-bounces+eike.ziller=digia.com at qt-project.org[development-bounces+eike.ziller= > digia.com at qt-project.org] on behalf of Vincent [vincentb1981 at gmail.com] > > Sent: 06 June 2013 18:20 > > To: development at qt-project.org > > Subject: [Development] Standard options & deploying on Mac OS X 10.6 > while building on 10.7 > > > > Hello, > > > > I would like to be able to deploy Qt applications on Mac OS X 10.6. The > development environment is on 10.7. > > > > I tried with Qt 5.0.2 and Qt 5.1.0 Beta 1 (downloaded binaries from > qt-project.org) and none of the compiled applications run on Mac OS X > 10.6. > > > > Then I tried to compile Qt 5.1.0 Beta 1 on 10.7, with the following > configure options: > > ./configure -prefix $PWD/qtbase -opensource -debug-and-release > -nomake examples -nomake demos > > > > Still, applications don't run on 10.6. Note that I've then compiled Qt > against 10.8 sdk. > > > > After discussing with Tor it seems that I need to provide to ./configure > the no-c+11 option. > > > > I would like to be sure that the Qt build I'll be compiling is as close > as possible as the standard Qt available through binary download at > qt-project.org. > > > > What is the full set of options for the configure script used by Qt Team > in order release binaries? > > > > Thanks, > > > > Cosmo > > > > > > Note: here are the runtime errors on 10.6: > > > > * Output of running on 10.6 an app built against Qt 5.0.2: > > > > dyld: Symbol not found: _kCFWebServicesProviderDefaultDisplayNameKey > > Referenced from: > /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit > > Expected in: > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation > > in > /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit > > Trace/BPT trap > > This is the weird way of QtWebKit to tell you that you need to build Qt > directly against a Mac 10.6 SDK if you want to > deploy Qt applications that use webkit on Mac OS X 10.6... > > > * And running on 10.6 an app built against 5.1.0 Beta 1 (Qt was > compiled on Mac OS X 10.7 with ./configure -prefix $PWD/qtbase -opensource > -debug-and-release -nomake examples -nomake demos): > > > > dyld: Library not loaded: /usr/lib/libc++.1.dylib > > Referenced from: > /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets > > Reason: image not found > > Trace/BPT trap > > > -- > Eike Ziller > Senior Software Engineer > > Digia Germany GmbH > Rudower Chaussee 13, D-12489 Berlin > Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht > Charlottenburg, HRB 144331 B, > Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From vincentb1981 at gmail.com Fri Jun 7 14:41:30 2013 From: vincentb1981 at gmail.com (Vincent) Date: Fri, 7 Jun 2013 14:41:30 +0200 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 In-Reply-To: References: Message-ID: Hi, Good news :-) I was able to deploy on MacOS X 10.6 a Qt application linked against Qt 5.1.0 Beta 1 built by myself on MacOS X 10.7 with the following configure step (i.e.: -no-c++11 and against 10.8 sdk) ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos -no-c++11 While it was not working with qt-project.org's binary Qt 5.0.2 (problem with QtWebKit, see mails above) and qt-project.org's binary Qt 5.1.0 Beta 1. Note that links of QtWebKit framework to MacOS X frameworks is different for 5.0.2 and my compiled version of 5.1.0 Beta 1 (see below). My next step is to configure & compile Qt 5.1.0 Beta 1 with the same options as qt-project.org's version (except for C++11 support). Cheers, Cosmo Here is the shared libraries in use by QtWebKit. Applications were bundled with the same macdeployqt utility. * qt-project.org's binary Qt 5.0.2: $ otool -L QtWebKit.framework/Versions/5/QtWebKit QtWebKit.framework/Versions/5/QtWebKit: @executable_path/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit (compatibility version 5.0.0, current version 5.0.2) @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork (compatibility version 5.0.0, current version 5.0.2) @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore (compatibility version 5.0.0, current version 5.0.2) @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui (compatibility version 5.0.0, current version 5.0.2) /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 153.0.0) /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 1138.32.0) /usr/lib/libxml2.2.dylib (compatibility version 10.0.0, current version 10.3.0) /usr/lib/libxslt.1.dylib (compatibility version 3.0.0, current version 3.24.0) /usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.5) /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore (compatibility version 1.2.0, current version 1.7.0) /System/Library/Frameworks/QTKit.framework/Versions/A/QTKit (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 55110.0.0) /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit (compatibility version 1.0.0, current version 275.0.0) /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 635.19.0) /usr/lib/libsqlite3.dylib (compatibility version 9.0.0, current version 9.6.0) /usr/lib/libicucore.A.dylib (compatibility version 1.0.0, current version 46.1.0) @executable_path/../Frameworks/QtQuick.framework/Versions/5/QtQuick (compatibility version 5.0.0, current version 5.0.2) @executable_path/../Frameworks/QtQml.framework/Versions/5/QtQml (compatibility version 5.0.0, current version 5.0.2) @executable_path/../Frameworks/QtSql.framework/Versions/5/QtSql (compatibility version 5.0.0, current version 5.0.2) /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility version 1.0.0, current version 1.0.0) /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 52.0.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 159.1.0) /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices (compatibility version 1.0.0, current version 53.0.0) /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices (compatibility version 1.0.0, current version 41.0.0) /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 833.24.0) * Qt 5.1.0 Beta 1 compiled with the following options ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos -no-c++11 $ otool -L QtWebKit.framework/Versions/5/QtWebKit QtWebKit.framework/Versions/5/QtWebKit: @executable_path/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit (compatibility version 5.1.0, current version 5.1.0) @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork (compatibility version 5.1.0, current version 5.1.0) @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore (compatibility version 5.1.0, current version 5.1.0) @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui (compatibility version 5.1.0, current version 5.1.0) /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 155.0.0) /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 1187.37.0) /usr/lib/libxml2.2.dylib (compatibility version 10.0.0, current version 10.8.0) /usr/lib/libxslt.1.dylib (compatibility version 3.0.0, current version 3.26.0) /usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.5) /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 744.18.0) /usr/lib/libsqlite3.dylib (compatibility version 9.0.0, current version 9.6.0) /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit (compatibility version 1.0.0, current version 275.0.0) /usr/lib/libicucore.A.dylib (compatibility version 1.0.0, current version 49.1.0) @executable_path/../Frameworks/QtQuick.framework/Versions/5/QtQuick (compatibility version 5.1.0, current version 5.1.0) @executable_path/../Frameworks/QtQml.framework/Versions/5/QtQml (compatibility version 5.1.0, current version 5.1.0) @executable_path/../Frameworks/QtSql.framework/Versions/5/QtSql (compatibility version 5.1.0, current version 5.1.0) @executable_path/../Frameworks/QtSensors.framework/Versions/5/QtSensors (compatibility version 5.1.0, current version 5.1.0) /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0) /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility version 1.0.0, current version 1.0.0) /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 56.0.0) /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 169.3.0) /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) 2013/6/7 Vincent > OK, now I'm trying to build Qt against 10.6 sdk on the 10.7 machine. I've > copied from XCode 4.3.3 the macosx10.6 sdk along 10.7 & 10.8 SDK's. > > Then configuring with: > ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake > examples -nomake demos -no-c++11 -sdk macosx10.6 -v > > It seems to accept the value of the argument -sdk (if I provide a wrong > value, a warning is raised). > > However, when looking at the clang++ option run during configure step, it > seems MacOSX10.8 sdk is used (see -isysroot argument): > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ > -c -o qcore_mac.o -pipe -isysroot > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk > -mmacosx-version-min=10.6 -g -gdwarf-2 -fconstant-cfstrings -g > -DQMAKE_OPENSOURCE_EDITION > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/library > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/unix > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/win32 > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/mac > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/integrity > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore/5.1.0 > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore/5.1.0/QtCore > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/src/corelib/global > -DHAVE_QCONFIG_CPP > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/mkspecs/macx-clang > -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/tools/shared > -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL -DPROEVALUATOR_DEBUG > -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS > -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM > /Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/src/corelib/kernel/qcore_mac.cpp > > and the configure step ends up with an error (here 10.6 sdk seems at work): > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ > -headerpad_max_install_names > -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk > -mmacosx-version-min=10.6 -o stl stltest.o > ld: library not found for -lstdc++ > clang: error: linker command failed with exit code 1 (use -v to see > invocation) > make: *** [stl] Error 1 > STL disabled. > STL functionality check failed! Cannot build Qt with this STL library. > Turn on verbose messaging (-v) to > /Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/configure > to see the final report. > *** qtbase/configure exited with non-zero status. > > > 2013/6/6 Ziller Eike > >> >> > From: development-bounces+eike.ziller=digia.com at qt-project.org[development-bounces+eike.ziller= >> digia.com at qt-project.org] on behalf of Vincent [vincentb1981 at gmail.com] >> > Sent: 06 June 2013 18:20 >> > To: development at qt-project.org >> > Subject: [Development] Standard options & deploying on Mac OS X 10.6 >> while building on 10.7 >> > >> > Hello, >> > >> > I would like to be able to deploy Qt applications on Mac OS X 10.6. The >> development environment is on 10.7. >> > >> > I tried with Qt 5.0.2 and Qt 5.1.0 Beta 1 (downloaded binaries from >> qt-project.org) and none of the compiled applications run on Mac OS X >> 10.6. >> > >> > Then I tried to compile Qt 5.1.0 Beta 1 on 10.7, with the following >> configure options: >> > ./configure -prefix $PWD/qtbase -opensource -debug-and-release >> -nomake examples -nomake demos >> > >> > Still, applications don't run on 10.6. Note that I've then compiled Qt >> against 10.8 sdk. >> > >> > After discussing with Tor it seems that I need to provide to >> ./configure the no-c+11 option. >> > >> > I would like to be sure that the Qt build I'll be compiling is as close >> as possible as the standard Qt available through binary download at >> qt-project.org. >> > >> > What is the full set of options for the configure script used by Qt >> Team in order release binaries? >> > >> > Thanks, >> > >> > Cosmo >> > >> > >> > Note: here are the runtime errors on 10.6: >> > >> > * Output of running on 10.6 an app built against Qt 5.0.2: >> > >> > dyld: Symbol not found: _kCFWebServicesProviderDefaultDisplayNameKey >> > Referenced from: >> /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit >> > Expected in: >> /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation >> > in >> /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit >> > Trace/BPT trap >> >> This is the weird way of QtWebKit to tell you that you need to build Qt >> directly against a Mac 10.6 SDK if you want to >> deploy Qt applications that use webkit on Mac OS X 10.6... >> >> > * And running on 10.6 an app built against 5.1.0 Beta 1 (Qt was >> compiled on Mac OS X 10.7 with ./configure -prefix $PWD/qtbase -opensource >> -debug-and-release -nomake examples -nomake demos): >> > >> > dyld: Library not loaded: /usr/lib/libc++.1.dylib >> > Referenced from: >> /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets >> > Reason: image not found >> > Trace/BPT trap >> >> >> -- >> Eike Ziller >> Senior Software Engineer >> >> Digia Germany GmbH >> Rudower Chaussee 13, D-12489 Berlin >> Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht >> Charlottenburg, HRB 144331 B, >> Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius >> >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Akseli.Salovaara at digia.com Fri Jun 7 14:56:34 2013 From: Akseli.Salovaara at digia.com (Salovaara Akseli) Date: Fri, 7 Jun 2013 12:56:34 +0000 Subject: [Development] Qt 5.1 installers during weekend... Message-ID: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB04F@IT-EXMB02-HKI.it.local> Hi, It has been few days since previous Qt 5.1 installer packages were available for testing. We believe that we have fixes going in today which will enable installers to be available again. Since we are very near to have Qt 5.1 RC1 content in we would appreciate if you could participate testing during the weekend and give us feedback. You can use http://testresults.qt-project.org/forms/release-testing/ for reporting your test results or just reply your result to development at qt-project.org -mailing list. As before new installers will be available http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ with date and build number on folder name. Br, Akseli -- Akseli Salovaara Digia, Qt -------------- next part -------------- An HTML attachment was scrubbed... URL: From Akseli.Salovaara at digia.com Fri Jun 7 15:19:15 2013 From: Akseli.Salovaara at digia.com (Salovaara Akseli) Date: Fri, 7 Jun 2013 13:19:15 +0000 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: References: <2448734.qNSaX3qMb6@tjmaciei-mobl2> <51B01DD9.3040306@digia.com> <51B02CC6.2080200@kdab.com> Message-ID: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB0A8@IT-EXMB02-HKI.it.local> > From: Tomasz Olszak > Sent: 6. kesäkuuta 2013 9:35 >To: Nicolas Arnaud-Cormos > Cc: development at qt-project.org > Subject: Re: [Development] Jira components for Qt for Tizen project > [.] > > If task filters used by other teams are based on labels instead of components It should be no problem for us.  > Who is the person responsible and can give me green light for that? I don't want spam jira...   >From JIRA technical point of view there is no reason why you couldn't start using labels on Qt for Tizen -development. Since labels are already working practice in other activities and recommended on this mailing list I would say you have green light. Br, Akseli > Regards, > Tomasz Olszak From sergio.ahumada at digia.com Fri Jun 7 15:29:40 2013 From: sergio.ahumada at digia.com (Sergio Ahumada) Date: Fri, 7 Jun 2013 15:29:40 +0200 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB0A8@IT-EXMB02-HKI.it.local> References: <2448734.qNSaX3qMb6@tjmaciei-mobl2> <51B01DD9.3040306@digia.com> <51B02CC6.2080200@kdab.com> <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB0A8@IT-EXMB02-HKI.it.local> Message-ID: <51B1E044.90605@digia.com> On 06/07/2013 03:19 PM, Salovaara Akseli wrote: >> From: Tomasz Olszak >> Sent: 6. kesäkuuta 2013 9:35 >> To: Nicolas Arnaud-Cormos >> Cc: development at qt-project.org >> Subject: Re: [Development] Jira components for Qt for Tizen project >> > [.] >> >> If task filters used by other teams are based on labels instead of components It should be no problem for us. >> Who is the person responsible and can give me green light for that? I don't want spam jira... > >>From JIRA technical point of view there is no reason why you couldn't start using labels on Qt for Tizen -development. > Since labels are already working practice in other activities and recommended on this mailing list I would say you have green light. > For Android and iOS these are actual components: - https://bugreports.qt-project.org/browse/QTBUG/component/19927 - https://bugreports.qt-project.org/browse/QTBUG/component/20020 because it was noted that labels didn't work quite well - https://bugreports.qt-project.org/browse/QTJIRA-208 I know that some people are against of having a ports' components (discussed on IRC) and that it might actually be a policy about not to have them, so I think this is a good opportunity to find an agreement and fix whatever might be wrong. Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt From liuyanghejerry at 126.com Fri Jun 7 15:50:31 2013 From: liuyanghejerry at 126.com (liuyanghejerry) Date: Fri, 07 Jun 2013 21:50:31 +0800 Subject: [Development] Advice for Wacom Tablet support Message-ID: <51B1E527.1020104@126.com> Hi, I'm new here. I heard about Qt 5 has incomplete support, espcially in Windows, for wacom tablet. And that is important to me. I've written a simple support helper via QAbstractNativeEventFilter. This all what I got now: https://github.com/liuyanghejerry/Qt-TabletSupport Still have bugs to fix and many incomplete functions, but may help a little? From Eike.Ziller at digia.com Fri Jun 7 15:57:15 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Fri, 7 Jun 2013 13:57:15 +0000 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 In-Reply-To: References: Message-ID: On 07.06.2013, at 14:41, Vincent wrote: > Hi, > > > > Good news :-) > > > > I was able to deploy on MacOS X 10.6 a Qt application linked against Qt 5.1.0 Beta 1 built by myself on MacOS X 10.7 with the following configure step (i.e.: -no-c++11 and against 10.8 sdk) > > ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos -no-c++11 Right. I had a longer look at the sources, and in Qt 5.1 video support in QtWebKit is disabled if your "Qt deployment target" is different from the "Mac OS SDK". And disabled video support means that it is deployable on the "Qt deployment target". The configure option -no-c++11 sets the deployment target to 10.6 != your Mac SDK. (without -no-c++11 the deployment target would be 10.7 != your Mac SDK too btw, so no video support in webkit either…) Br, Eike > While it was not working with qt-project.org's binary Qt 5.0.2 (problem with QtWebKit, see mails above) and qt-project.org's binary Qt 5.1.0 Beta 1. > > Note that links of QtWebKit framework to MacOS X frameworks is different for 5.0.2 and my compiled version of 5.1.0 Beta 1 (see below). > > > > My next step is to configure & compile Qt 5.1.0 Beta 1 with the same options as qt-project.org's version (except for C++11 support). > > > > Cheers, > > > > Cosmo > > > > Here is the shared libraries in use by QtWebKit. Applications were bundled with the same macdeployqt utility. > > > > * qt-project.org's binary Qt 5.0.2: > > > > $ otool -L QtWebKit.framework/Versions/5/QtWebKit > > QtWebKit.framework/Versions/5/QtWebKit: > > @executable_path/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit (compatibility version 5.0.0, current version 5.0.2) > > @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork (compatibility version 5.0.0, current version 5.0.2) > > @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore (compatibility version 5.0.0, current version 5.0.2) > > @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui (compatibility version 5.0.0, current version 5.0.2) > > /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 153.0.0) > > /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 1138.32.0) > > /usr/lib/libxml2.2.dylib (compatibility version 10.0.0, current version 10.3.0) > > /usr/lib/libxslt.1.dylib (compatibility version 3.0.0, current version 3.24.0) > > /usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.5) > > /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore (compatibility version 1.2.0, current version 1.7.0) > > /System/Library/Frameworks/QTKit.framework/Versions/A/QTKit (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/Security.framework/Versions/A/Security (compatibility version 1.0.0, current version 55110.0.0) > > /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit (compatibility version 1.0.0, current version 275.0.0) > > /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 635.19.0) > > /usr/lib/libsqlite3.dylib (compatibility version 9.0.0, current version 9.6.0) > > /usr/lib/libicucore.A.dylib (compatibility version 1.0.0, current version 46.1.0) > > @executable_path/../Frameworks/QtQuick.framework/Versions/5/QtQuick (compatibility version 5.0.0, current version 5.0.2) > > @executable_path/../Frameworks/QtQml.framework/Versions/5/QtQml (compatibility version 5.0.0, current version 5.0.2) > > @executable_path/../Frameworks/QtSql.framework/Versions/5/QtSql (compatibility version 5.0.0, current version 5.0.2) > > /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility version 1.0.0, current version 1.0.0) > > /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 52.0.0) > > /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 159.1.0) > > /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) > > /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices (compatibility version 1.0.0, current version 53.0.0) > > /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices (compatibility version 1.0.0, current version 41.0.0) > > /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation (compatibility version 300.0.0, current version 833.24.0) > > > > > > * Qt 5.1.0 Beta 1 compiled with the following options > > ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos -no-c++11 > > > > $ otool -L QtWebKit.framework/Versions/5/QtWebKit > > QtWebKit.framework/Versions/5/QtWebKit: > > @executable_path/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit (compatibility version 5.1.0, current version 5.1.0) > > @executable_path/../Frameworks/QtNetwork.framework/Versions/5/QtNetwork (compatibility version 5.1.0, current version 5.1.0) > > @executable_path/../Frameworks/QtCore.framework/Versions/5/QtCore (compatibility version 5.1.0, current version 5.1.0) > > @executable_path/../Frameworks/QtGui.framework/Versions/5/QtGui (compatibility version 5.1.0, current version 5.1.0) > > /System/Library/Frameworks/Carbon.framework/Versions/A/Carbon (compatibility version 2.0.0, current version 155.0.0) > > /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit (compatibility version 45.0.0, current version 1187.37.0) > > /usr/lib/libxml2.2.dylib (compatibility version 10.0.0, current version 10.8.0) > > /usr/lib/libxslt.1.dylib (compatibility version 3.0.0, current version 3.26.0) > > /usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.5) > > /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation (compatibility version 150.0.0, current version 744.18.0) > > /usr/lib/libsqlite3.dylib (compatibility version 9.0.0, current version 9.6.0) > > /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit (compatibility version 1.0.0, current version 275.0.0) > > /usr/lib/libicucore.A.dylib (compatibility version 1.0.0, current version 49.1.0) > > @executable_path/../Frameworks/QtQuick.framework/Versions/5/QtQuick (compatibility version 5.1.0, current version 5.1.0) > > @executable_path/../Frameworks/QtQml.framework/Versions/5/QtQml (compatibility version 5.1.0, current version 5.1.0) > > @executable_path/../Frameworks/QtSql.framework/Versions/5/QtSql (compatibility version 5.1.0, current version 5.1.0) > > @executable_path/../Frameworks/QtSensors.framework/Versions/5/QtSensors (compatibility version 5.1.0, current version 5.1.0) > > /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL (compatibility version 1.0.0, current version 1.0.0) > > /System/Library/Frameworks/AGL.framework/Versions/A/AGL (compatibility version 1.0.0, current version 1.0.0) > > /usr/lib/libstdc++.6.dylib (compatibility version 7.0.0, current version 56.0.0) > > /usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 169.3.0) > > /usr/lib/libobjc.A.dylib (compatibility version 1.0.0, current version 228.0.0) > > > > 2013/6/7 Vincent > OK, now I'm trying to build Qt against 10.6 sdk on the 10.7 machine. I've copied from XCode 4.3.3 the macosx10.6 sdk along 10.7 & 10.8 SDK's. > > Then configuring with: > ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos -no-c++11 -sdk macosx10.6 -v > > It seems to accept the value of the argument -sdk (if I provide a wrong value, a warning is raised). > > However, when looking at the clang++ option run during configure step, it seems MacOSX10.8 sdk is used (see -isysroot argument): > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -c -o qcore_mac.o -pipe -isysroot /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk -mmacosx-version-min=10.6 -g -gdwarf-2 -fconstant-cfstrings -g -DQMAKE_OPENSOURCE_EDITION -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/library -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/unix -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/win32 -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/mac -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/qmake/generators/integrity -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore/5.1.0 -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/include/QtCore/5.1.0/QtCore -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/src/corelib/global -DHAVE_QCONFIG_CPP -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/mkspecs/macx-clang -I/Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/tools/shared -DQT_BUILD_QMAKE -DQT_BOOTSTRAPPED -DPROEVALUATOR_FULL -DPROEVALUATOR_DEBUG -DQT_NO_TEXTCODEC -DQT_NO_UNICODETABLES -DQT_NO_COMPONENT -DQT_NO_COMPRESS -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM /Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/src/corelib/kernel/qcore_mac.cpp > > and the configure step ends up with an error (here 10.6 sdk seems at work): > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/clang++ -headerpad_max_install_names -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -o stl stltest.o > ld: library not found for -lstdc++ > clang: error: linker command failed with exit code 1 (use -v to see invocation) > make: *** [stl] Error 1 > STL disabled. > STL functionality check failed! Cannot build Qt with this STL library. > Turn on verbose messaging (-v) to /Users/user/Tools/2ndqt/qt-everywhere-opensource-src-5.1.0-beta1/qtbase/configure to see the final report. > *** qtbase/configure exited with non-zero status. > > > 2013/6/6 Ziller Eike > > > From: development-bounces+eike.ziller=digia.com at qt-project.org [development-bounces+eike.ziller=digia.com at qt-project.org] on behalf of Vincent [vincentb1981 at gmail.com] > > Sent: 06 June 2013 18:20 > > To: development at qt-project.org > > Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 > > > > Hello, > > > > I would like to be able to deploy Qt applications on Mac OS X 10.6. The development environment is on 10.7. > > > > I tried with Qt 5.0.2 and Qt 5.1.0 Beta 1 (downloaded binaries from qt-project.org) and none of the compiled applications run on Mac OS X 10.6. > > > > Then I tried to compile Qt 5.1.0 Beta 1 on 10.7, with the following configure options: > > ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos > > > > Still, applications don't run on 10.6. Note that I've then compiled Qt against 10.8 sdk. > > > > After discussing with Tor it seems that I need to provide to ./configure the no-c+11 option. > > > > I would like to be sure that the Qt build I'll be compiling is as close as possible as the standard Qt available through binary download at qt-project.org. > > > > What is the full set of options for the configure script used by Qt Team in order release binaries? > > > > Thanks, > > > > Cosmo > > > > > > Note: here are the runtime errors on 10.6: > > > > * Output of running on 10.6 an app built against Qt 5.0.2: > > > > dyld: Symbol not found: _kCFWebServicesProviderDefaultDisplayNameKey > > Referenced from: /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit > > Expected in: /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation > > in /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKit.framework/Versions/5/QtWebKit > > Trace/BPT trap > > This is the weird way of QtWebKit to tell you that you need to build Qt directly against a Mac 10.6 SDK if you want to > deploy Qt applications that use webkit on Mac OS X 10.6... > > > * And running on 10.6 an app built against 5.1.0 Beta 1 (Qt was compiled on Mac OS X 10.7 with ./configure -prefix $PWD/qtbase -opensource -debug-and-release -nomake examples -nomake demos): > > > > dyld: Library not loaded: /usr/lib/libc++.1.dylib > > Referenced from: /Users//Desktop/myapp/myapp.app/Contents/MacOS/../Frameworks/QtWebKitWidgets.framework/Versions/5/QtWebKitWidgets > > Reason: image not found > > Trace/BPT trap > > > -- > Eike Ziller > Senior Software Engineer > > Digia Germany GmbH > Rudower Chaussee 13, D-12489 Berlin > Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B, > Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius > > > -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From boud at valdyas.org Fri Jun 7 16:01:46 2013 From: boud at valdyas.org (Boudewijn Rempt) Date: Fri, 07 Jun 2013 16:01:46 +0200 Subject: [Development] Advice for Wacom Tablet support In-Reply-To: <51B1E527.1020104@126.com> References: <51B1E527.1020104@126.com> Message-ID: <10626168.N0A3fPUXjI@linux-ixka.site> On Friday 07 June 2013 Jun 21:50:31 liuyanghejerry wrote: > Hi, I'm new here. > > I heard about Qt 5 has incomplete support, espcially in Windows, for > wacom tablet. And that is important to me. > > I've written a simple support helper via QAbstractNativeEventFilter. > > This all what I got now: https://github.com/liuyanghejerry/Qt-TabletSupport > > Still have bugs to fix and many incomplete functions, but may help a little? Oh! I'll check it out! It might be very useful if I manage to port my app to Qt 5.2 this year. -- Boudewijn Rempt http://www.valdyas.org, http://www.krita.org, http://www.boudewijnrempt.nl From liuyanghejerry at 126.com Fri Jun 7 16:12:24 2013 From: liuyanghejerry at 126.com (liuyanghejerry) Date: Fri, 07 Jun 2013 22:12:24 +0800 Subject: [Development] Advice for Wacom Tablet support In-Reply-To: <10626168.N0A3fPUXjI@linux-ixka.site> References: <51B1E527.1020104@126.com> <10626168.N0A3fPUXjI@linux-ixka.site> Message-ID: <51B1EA48.8090304@126.com> On 2013/6/7 22:01, Boudewijn Rempt wrote: > On Friday 07 June 2013 Jun 21:50:31 liuyanghejerry wrote: >> Hi, I'm new here. >> >> I heard about Qt 5 has incomplete support, espcially in Windows, for >> wacom tablet. And that is important to me. >> >> I've written a simple support helper via QAbstractNativeEventFilter. >> >> This all what I got now: https://github.com/liuyanghejerry/Qt-TabletSupport >> >> Still have bugs to fix and many incomplete functions, but may help a little? > Oh! I'll check it out! It might be very useful if I manage to port my app to Qt 5.2 this year. > Thanks, it supports only simple painting. But may be a way to work;) Currently, it works with WinTab. But I think native message filtering is the way to go even in other platforms. From thiago.macieira at intel.com Fri Jun 7 17:21:40 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 07 Jun 2013 08:21:40 -0700 Subject: [Development] [Releasing] Qt 5.1 installers during weekend... In-Reply-To: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB04F@IT-EXMB02-HKI.it.local> References: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB04F@IT-EXMB02-HKI.it.local> Message-ID: <2180509.g5xo3O37YU@tjmaciei-mobl2> On sexta-feira, 7 de junho de 2013 12.56.34, Salovaara Akseli wrote: > Hi, > > It has been few days since previous Qt 5.1 installer packages were available > for testing. We believe that we have fixes going in today which will enable > installers to be available again. Since we are very near to have Qt 5.1 RC1 > content in we would appreciate if you could participate testing during the > weekend and give us feedback. You can use > http://testresults.qt-project.org/forms/release-testing/ for reporting your > test results or just reply your result to > development at qt-project.org -mailing > list. > > As before new installers will be available > http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ with > date and build number on folder name. Remember: we're looking for a "smoke test" or "sanity test" type of testing right now. We need to know whether the packages built correctly, contain all the necessary changes, install and don't contain any embarrassing bugs. We're not asking you to test whether these packages are "final 5.1 release quality". That testing is what happens after RC1 is released. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Fri Jun 7 17:31:15 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 07 Jun 2013 08:31:15 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> Message-ID: <3428013.JGyjOSOZJI@tjmaciei-mobl2> On sexta-feira, 7 de junho de 2013 10.22.56, Koehne Kai wrote: > Situation with Qt 5.1 as it is > - Binary installer is compiled with OS X 10.7 > - You cannot deploy with them to 10.6 > - If you want to deploy to 10.6 without QtWebKit you have to compile Qt > yourself, on OS X 10.6, or on OS X 10.7 and above with -no-c++11 (to be > verified) - If you want to deploy to 10.6 including QtWebKit you have to > compile Qt yourself, on OS X 10.6 You forgot one detail here: - QtLocation does not compile on Mac (as of yesterday morning) Similarly, any user program that tries to compile a library with CONFIG -= qt with another that is CONFIG += qt will fail. We need a fix somewhere. > My suggestion: > - Leave Qt 5.1.0 as it is right now, move on with the release process > - Investigate providing an additional binary installer with Qt compiled > 10.6 (e.g. with 5.1.1) > - Thoroughly document the problem for people > compiling their own Qt I'd rather our default package produced binaries that work on 10.6. There needs to be very good reasons why the standard binaries produce applications for 10.7+. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Fri Jun 7 17:33:54 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 07 Jun 2013 08:33:54 -0700 Subject: [Development] Jira components for Qt for Tizen project In-Reply-To: <51B1E044.90605@digia.com> References: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB0A8@IT-EXMB02-HKI.it.local> <51B1E044.90605@digia.com> Message-ID: <4338868.8UJjbTWcNC@tjmaciei-mobl2> On sexta-feira, 7 de junho de 2013 15.29.40, Sergio Ahumada wrote: > For Android and iOS these are actual components: > > - https://bugreports.qt-project.org/browse/QTBUG/component/19927 > - https://bugreports.qt-project.org/browse/QTBUG/component/20020 > > because it was noted that labels didn't work quite well > > - https://bugreports.qt-project.org/browse/QTJIRA-208 We need both, I guess. The component is used for the adaptation layer, and I guess principally for the QPA plugin for that specific platform. Now, Tizen doesn't need anything special, it's X and Wayland. The only Tizen-specific codebase is the Qt Quick Controls for Tizen. The label is used when there are bugs in other parts of the codebase that are specific to that OS (example, file access). Here, again, since it's just a standard Linux with a non-crippled libc, there should be hardly any need. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Fri Jun 7 17:38:11 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 07 Jun 2013 08:38:11 -0700 Subject: [Development] Standard options & deploying on Mac OS X 10.6 while building on 10.7 In-Reply-To: References: Message-ID: <11519276.zxArFMFpVk@tjmaciei-mobl2> On sexta-feira, 7 de junho de 2013 14.40.41, Vincent wrote: > However, when looking at the clang++ option run during configure step, it > seems MacOSX10.8 sdk is used (see -isysroot argument): > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolcha > in/usr/bin/clang++ -c -o qcore_mac.o -pipe -isysroot > /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Develop > er/SDKs/MacOSX10.8.sdk -mmacosx-version-min=10.6 -g -gdwarf-2 [cut] Min 10.6 and SDK 10.8 is weird, but not entirely wrong. But this command-line here is not relevant. You're looking at the qmake build. Host tools like qmake, moc and uic are never run on the target and are never deployed to 10.6. You need to look at the build of the libraries. > and the configure step ends up with an error (here 10.6 sdk seems at work): > > /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolcha > in/usr/bin/clang++ -headerpad_max_install_names > -Wl,-syslibroot,/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX. > platform/Developer/SDKs/MacOSX10.6.sdk -mmacosx-version-min=10.6 -o stl > stltest.o > ld: library not found for -lstdc++ So it looks like the build is correct. The stltest is done with the same flags as the libraries would be built. Now, it seems your 10.6 SDK is broken. Can you compile regular C++ applications with it? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From olivier at woboq.com Fri Jun 7 18:50:52 2013 From: olivier at woboq.com (Olivier Goffart) Date: Fri, 07 Jun 2013 18:50:52 +0200 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> Message-ID: <3393088.prRq4eQrUf@gargamel> On Friday 07 June 2013 10:22:56 Koehne Kai wrote: > My suggestion: > - Leave Qt 5.1.0 as it is right now, move on with the release process > - Investigate providing an additional binary installer with Qt compiled > 10.6 (e.g. with 5.1.1) - Thoroughly document the problem for people > compiling their own Qt But what about the binary compatibility break? Since libstdc++ and libc++ are not binary compatible, if one use third party library that uses the standard library, his application will no longer work unless that 3rd party library is also re-compiled against the same standard library. Is it not an important issue? -- Olivier Woboq - Qt services and support - http://woboq.com - http://code.woboq.org From thiago.macieira at intel.com Fri Jun 7 19:28:50 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 07 Jun 2013 10:28:50 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <3393088.prRq4eQrUf@gargamel> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> <3393088.prRq4eQrUf@gargamel> Message-ID: <1494522.lJojprPIAW@tjmaciei-mobl2> On sexta-feira, 7 de junho de 2013 18.50.52, Olivier Goffart wrote: > On Friday 07 June 2013 10:22:56 Koehne Kai wrote: > > My suggestion: > > - Leave Qt 5.1.0 as it is right now, move on with the release process > > - Investigate providing an additional binary installer with Qt compiled > > > > 10.6 (e.g. with 5.1.1) - Thoroughly document the problem for people > > compiling their own Qt > > But what about the binary compatibility break? > > Since libstdc++ and libc++ are not binary compatible, if one use third party > library that uses the standard library, his application will no longer work > unless that 3rd party library is also re-compiled against the same standard > library. > > Is it not an important issue? Yes, it is. However, we need to be compatible with what 5.0 shipped with. What was it? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From daiweili at gmail.com Fri Jun 7 23:18:49 2013 From: daiweili at gmail.com (Daiwei Li) Date: Fri, 7 Jun 2013 14:18:49 -0700 Subject: [Development] OSX CMake broken in 5.1.1 Message-ID: Hello, I recently my version of Qt to 5.1.1 and it seems to have broken CMake on OSX. I get the following error message: CMake Error at > /Users/daiweili/.bacon/thirdparty/qt/9d86cdfb2d648428afd462d5062571b5adef377c-osx/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake:15 > (message): > The imported target "Qt5::Widgets" references the file > > "/Users/daiweili/.bacon/thirdparty/qt/9d86cdfb2d648428afd462d5062571b5adef377c-osx/lib/QtWidgets.framework/QtWidgets/5.1.1" > but this file does not exist. Possible reasons include: > * The file was deleted, renamed, or moved to another location. > * An install or uninstall procedure did not complete successfully. > * The installation package was faulty and contained > > "/Users/daiweili/.bacon/thirdparty/qt/9d86cdfb2d648428afd462d5062571b5adef377c-osx/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake" > but not all the files it references. > Call Stack (most recent call first): > > /Users/daiweili/.bacon/thirdparty/qt/9d86cdfb2d648428afd462d5062571b5adef377c-osx/lib/cmake/Qt5Widgets/Qt5WidgetsConfig.cmake:49 > (_qt5_Widgets_check_file_exists) > vcclient/find_qt.cmake:36 (find_package) > vcclient/CMakeLists.txt:60 (include) It seems that frameworks on OSX breaks some assumptions about where files should be located. I compared the generated Qt5WidgetConfig.cmake with a previous version and it seems that the check is the only addition. I tried commenting out the lines in qtbase/mkspecs/features/data/cmake/ Qt5BasicConfig.cmake.in and now my project builds fine, though that's obviously not the right thing to do. Should I go ahead and file a ticket for this problem, or was there some user error on my part? Daiwei -------------- next part -------------- An HTML attachment was scrubbed... URL: From stephen.kelly at kdab.com Sat Jun 8 09:45:49 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Sat, 08 Jun 2013 09:45:49 +0200 Subject: [Development] OSX CMake broken in 5.1.1 In-Reply-To: References: Message-ID: <2841210.9vLU2H3IrN@hal> On Friday, June 07, 2013 14:18:49 Daiwei Li wrote: > Hello, > > I recently my version of Qt to 5.1.1 and it seems to have broken CMake on > OSX. I get the following error message: > > > The imported target "Qt5::Widgets" references the file > > > > "/Users/daiweili/.bacon/thirdparty/qt/9d86cdfb2d648428afd462d5062571b5ade > > f377c-osx/lib/QtWidgets.framework/QtWidgets/5.1.1"> > > but this file does not exist. > It seems that frameworks on OSX breaks some assumptions about where files > should be located. Thanks for reporting! Can you confirm that the equivalent happens when you use find_package(Qt5Core REQUIRED) ? What flags did you pass to configure Qt? Can you confirm that the paths referenced in Qt5Core_PRIVATE_INCLUDE_DIRS do not exist? Where actually are the private headers? Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From Akseli.Salovaara at digia.com Sat Jun 8 18:28:45 2013 From: Akseli.Salovaara at digia.com (Salovaara Akseli) Date: Sat, 8 Jun 2013 16:28:45 +0000 Subject: [Development] Qt 4.8.5 Release Candidate 2 available & new sha1 Message-ID: <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB481@IT-EXMB02-HKI.it.local> Hi, Due to problem found from previous release candidate we have created Qt 4.8.5 Release Candidate 2 to fix issue and sha1 is now freeze on commit 0529dc9b2542dcb46c2e2cc1a3422fc83c6ae6ef. Qt 4.8.5 Release Candidate 2 packages are available for you http://download.qt-project.org/snapshots/qt/4.8/4.8.5-rc2. Changes-4.8.5 file inside source packages and installers is not yet updated but it can be found from http://download.qt-project.org/snapshots/qt/4.8/4.8.5-rc2/changes-4.8.5-RC2.txt If you find some problems and especially regression from Qt 4.8.5 Release Candidate 2 please report those to http://bugreports.qt-project.org or send email to releasing at qt-project.org . Br, Akseli From: Salovaara Akseli Sent: 31. toukokuuta 2013 20:44 To: development at qt-project.org; releasing at qt-project.org Subject: [Development] Qt 4.8.5 sha1 freeze & Qt 4.8.5 Release Candidate available Hi, Qt 4.8.5 sha1 is now freeze against commit 466930aa3c942dada0139b73dbcbab71d9d39489 and Qt 4.8.5 Release Candidate packages are available for you http://download.qt-project.org/snapshots/qt/4.8/4.8.5-rc. Changes-4.8.5 file inside source packages and installers is not yet updated but it can be found from http://download.qt-project.org/snapshots/qt/4.8/4.8.5-rc/changes-4.8.5_RC.txt There are 380 improvements since Qt 4.8.4 release which is more than on any previous Qt 4.8 release. Please test Qt 4.8.5 Release Candidate and give us feedback how you see the quality and functionality. If you find some problems and especially regression from Qt 4.8.5 Release Candidate please report those to http://bugreports.qt-project.org or send email to releasing at qt-project.org . Br, Akseli -------------- next part -------------- An HTML attachment was scrubbed... URL: From franciscoraulortega at gmail.com Sat Jun 8 19:06:20 2013 From: franciscoraulortega at gmail.com (Francisco Ortega) Date: Sat, 8 Jun 2013 13:06:20 -0400 Subject: [Development] Touch Points Update Message-ID: Hello all, I spoke to Oliver Wolf this past Monday (6/3/2013) and a few other members (#qt-labs) about the qtbase/src/plugins/platforms dealing with Touch. Like always, everyone is extremely helpful. I started talking about Windows having a few additional data members for a given touch point. Most importantly, I spoke about the unsigned long ID given by windows, which is not the same. Without going into much explanation here, I spoke in IRC that I used that unique ID to store touch points to a database to later reply them. The current id for a windows app running Qt does not does the same, since it can go from 0,1,2... and later 0,1,2,3 in the same moment. As most of you may guess, I could do something to fix this for me. However, I was thinking at a larger scale. Therefore, I went and check the three platforms that I have accessed to. Windows, Linux (Debian 7), and Mac OS X 10.8. Windows is the only platform that I know well. With the search, I found that Linux and MacOSX has what is already given by Qt. x,y,state. Linux also has a timestamp, which I didn't no see in QTouchEvents::TouchPoint (in linux is under time, but I think is a timestamp). Windows has the timestamp as well. Windows also has Cx,Cy which is the contact area. Not the most useful data at least with my Multi-Touch monitors (3M) because it gives me two values... but nevertheless, a value that is no there. With all this preamble, I would like to get to the meet of the change that I will submit and see if it gets reviewed. First, let me tell you what I discarded. I hope your feedback about all. (First ideas, that I decided not to go for) 1) Returning a void * to a platform structure, it is not a good idea, so is out. 2) Changing the current id (int) to unsigned long can have multiple unintended consequences to current code, that is best not to do it. So is out. 3) setting the platform id (windows) to the int by moding with a "MAX_INT" does not feel right to me. What I will change in the code and submit when ready is the following: 1) Create an interface to used a platformSpecificData() that will be the same across all Operating Systems. For example, say that we have data.cxfor mac os x. Then this will simply be 0, the data.flags will specify if the data is available. I hope to receive feedback. I'm not sure if I can do it this month, since I have to submit a paper to a conference, but I will try. if not next week. Because the change may be more significant, is probably that even if review and accept it, it will take a while to make it to the stable release. However, I think this is the best option. Once again, I thank you for all the feedback and continue support here and in Irc. Other contributions in the future that I hope to be involved is the "Leap Motion" which I will be getting soon and some MEMS that I have already received. I like input and please consider me for any work you may need. Thanks, Francisco Francisco R. Ortega Ph.D. Candidate in Computer Science Florida International University http://www.FranciscoRaulOrtega.com "No me quieras por que gane, necesito que me quieras para ganar" -- Marcelo Bielsa -------------- next part -------------- An HTML attachment was scrubbed... URL: From franciscoraulortega at gmail.com Sat Jun 8 19:16:56 2013 From: franciscoraulortega at gmail.com (Francisco Ortega) Date: Sat, 8 Jun 2013 13:16:56 -0400 Subject: [Development] Touch Points Update In-Reply-To: References: Message-ID: Correction Replace In the same moment By In the same session (for the application) Sent from my iPhone On Jun 8, 2013, at 1:06 PM, Francisco Ortega wrote: > Hello all, > > I spoke to Oliver Wolf this past Monday (6/3/2013) and a few other members (#qt-labs) about the qtbase/src/plugins/platforms dealing with Touch. Like always, everyone is extremely helpful. > > I started talking about Windows having a few additional data members for a given touch point. Most importantly, I spoke about the unsigned long ID given by windows, which is not the same. Without going into much explanation here, I spoke in IRC that I used that unique ID to store touch points to a database to later reply them. The current id for a windows app running Qt does not does the same, since it can go from 0,1,2... and later 0,1,2,3 in the same moment. As most of you may guess, I could do something to fix this for me. > > However, I was thinking at a larger scale. Therefore, I went and check the three platforms that I have accessed to. Windows, Linux (Debian 7), and Mac OS X 10.8. Windows is the only platform that I know well. > > With the search, I found that Linux and MacOSX has what is already given by Qt. x,y,state. Linux also has a timestamp, which I didn't no see in QTouchEvents::TouchPoint (in linux is under time, but I think is a timestamp). Windows has the timestamp as well. > > Windows also has Cx,Cy which is the contact area. Not the most useful data at least with my Multi-Touch monitors (3M) because it gives me two values... but nevertheless, a value that is no there. > > With all this preamble, I would like to get to the meet of the change that I will submit and see if it gets reviewed. First, let me tell you what I discarded. I hope your feedback about all. > > (First ideas, that I decided not to go for) > > 1) Returning a void * to a platform structure, it is not a good idea, so is out. > 2) Changing the current id (int) to unsigned long can have multiple unintended consequences to current code, that is best not to do it. So is out. > 3) setting the platform id (windows) to the int by moding with a "MAX_INT" does not feel right to me. > > What I will change in the code and submit when ready is the following: > > 1) Create an interface to used a platformSpecificData() that will be the same across all Operating Systems. For example, say that we have data.cx for mac os x. Then this will simply be 0, the data.flags will specify if the data is available. > > I hope to receive feedback. I'm not sure if I can do it this month, since I have to submit a paper to a conference, but I will try. if not next week. Because the change may be more significant, is probably that even if review and accept it, it will take a while to make it to the stable release. However, I think this is the best option. > > Once again, I thank you for all the feedback and continue support here and in Irc. > > Other contributions in the future that I hope to be involved is the "Leap Motion" which I will be getting soon and some MEMS that I have already received. I like input and please consider me for any work you may need. > > Thanks, > Francisco > > > Francisco R. Ortega > Ph.D. Candidate in Computer Science > Florida International University > http://www.FranciscoRaulOrtega.com > "No me quieras por que gane, necesito que me quieras para ganar" -- Marcelo Bielsa -------------- next part -------------- An HTML attachment was scrubbed... URL: From genghiskhan at gmx.ca Sat Jun 8 19:28:50 2013 From: genghiskhan at gmx.ca (Genghis Khan) Date: Sat, 08 Jun 2013 13:28:50 -0400 Subject: [Development] Qt 4.8.x Hebrew Translation Update Message-ID: <20130608172851.150120@gmx.com> Hello, Herein attached a Hebrew translation file for Qt 4.8.x. I am having trouble with over 400 left strings and I need to consult with Diego Iastrubni and perhaps with others concerning these strings. If there is no respond from Mr. Diego Iastrubni (Cc), please submit the translation file qt_he.ts.origin.gz which is the original file Diego sent to me on December 1st, 2012 (copyright information is old). http://lists.qt-project.org/pipermail/development/2013-January/009639.html Both files are in a usable state. Regards, --GK. -- Proper English www.reddit.com/r/proper 4 teh lulz... http://email.is-not-s.ms -------------- next part -------------- A non-text attachment was scrubbed... Name: qt_he.ts.gz Type: application/x-gzip Size: 35594 bytes Desc: not available URL: From daiweili at gmail.com Sat Jun 8 22:57:43 2013 From: daiweili at gmail.com (Daiwei Li) Date: Sat, 8 Jun 2013 13:57:43 -0700 Subject: [Development] OSX CMake broken in 5.1.1 In-Reply-To: <2841210.9vLU2H3IrN@hal> References: <2841210.9vLU2H3IrN@hal> Message-ID: > > Thanks for reporting! Can you confirm that the equivalent happens when you > use > find_package(Qt5Core REQUIRED) > ? Sure, thanks for responding and looking into this! The equivalent does occur with Qt5Core, and in several other Qt modules (I would guess it happens with all of the ones I use based on the contents of /include. What flags did you pass to configure Qt? Can you confirm that the paths > referenced in Qt5Core_PRIVATE_INCLUDE_DIRS do not exist? Where actually are > the private headers? The configure command I used was: ./configure -prefix $install_dir -release -opensource -confirm-license -shared -nomake examples -nomake demos -nomake docs -no-c++11 -platform macx-clang The missing paths definitely do not exist. The contents of /include are: QtOpenGLExtensions QtPlatformSupport QtUiTools It seems like the headers are all located at: lib/.framework/Headers rather than in include. I haven't checked but perhaps configuring with -no-framework would put them in the location that the CMake script expects, though -framework is the default configuration. Let me know if there's anything else I can help with. Best, Daiwei On Sat, Jun 8, 2013 at 12:45 AM, Stephen Kelly wrote: > On Friday, June 07, 2013 14:18:49 Daiwei Li wrote: > > Hello, > > > > I recently my version of Qt to 5.1.1 and it seems to have broken CMake on > > OSX. I get the following error message: > > > > > The imported target "Qt5::Widgets" references the file > > > > > > > "/Users/daiweili/.bacon/thirdparty/qt/9d86cdfb2d648428afd462d5062571b5ade > > > f377c-osx/lib/QtWidgets.framework/QtWidgets/5.1.1"> > > > but this file does not exist. > > > It seems that frameworks on OSX breaks some assumptions about where files > > should be located. > > Thanks for reporting! Can you confirm that the equivalent happens when you > use > > find_package(Qt5Core REQUIRED) > > ? > > What flags did you pass to configure Qt? Can you confirm that the paths > referenced in Qt5Core_PRIVATE_INCLUDE_DIRS do not exist? Where actually are > the private headers? > > Thanks, > > -- > Stephen Kelly | Software Engineer > KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company > www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 > KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- An HTML attachment was scrubbed... URL: From loaden at gmail.com Mon Jun 10 02:30:23 2013 From: loaden at gmail.com (Yuchen Deng) Date: Mon, 10 Jun 2013 08:30:23 +0800 Subject: [Development] Why we need two `Qt*.dll` copies on Windows? Message-ID: Does some one notice there exists two QtDLLs on Windows, the one in bin\Qt*.dll, and the other placed `lib\Qt*.dll`, WHY? It's don't make sense. We only need the `bin\Qt*.dll` one. and the Qt applications does not need the `lib\Qt*.dll`, never! If removed the `lib\Qt*.dll`, everything works ok on Qt 5.0.x, but I noticed recently it does not work with CMake projects. Here is the error log: > CMake Error at > D:/qpSOFT/MyDEV/sdk/qt/amd64/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:15 > (message): > > The imported target "Qt5::Core" references the file > > > "D:/qpSOFT/MyDEV/sdk/qt/amd64/lib/Qt5Core.dll" > > > but this file does not exist. Possible reasons include: > > > * The file was deleted, renamed, or moved to another location. > > > * An install or uninstall procedure did not complete successfully. > > > * The installation package was faulty and contained > > > "D:/qpSOFT/MyDEV/sdk/qt/amd64/lib/cmake/Qt5Core/Qt5CoreConfig.cmake" > > > but not all the files it references. > > > Call Stack (most recent call first): > > D:/qpSOFT/MyDEV/sdk/qt/amd64/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:32 > (_qt5_Core_check_file_exists) > > D:/qpSOFT/MyDEV/sdk/qt/amd64/lib/cmake/Qt5Core/Qt5CoreConfig.cmake:117 > (_populate_Core_target_properties) > > cmake/QtHelper.cmake:17 (find_package) > > cmake/QtHelper.cmake:83 (qt_find_modules) > > CMakeLists.txt:38 (include) > > > > > -- > Best Regards Yuchen -------------- next part -------------- An HTML attachment was scrubbed... URL: From Kai.Koehne at digia.com Mon Jun 10 08:50:54 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Mon, 10 Jun 2013 06:50:54 +0000 Subject: [Development] Why we need two `Qt*.dll` copies on Windows? In-Reply-To: References: Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C01A1@IT-EXMB01-HKI.it.local> > -----Original Message----- > Subject: [Development] Why we need two `Qt*.dll` copies on Windows? > > Does some one notice there exists two QtDLLs on Windows, the one in > bin\Qt*.dll, and the other placed `lib\Qt*.dll`, WHY? To cite a commit by Ossi: " the dlls being in lib/ is kind of an accident (a side effect of how qmake builds them" (commit d8406d0e09c5bfa549f27). Anyway, the binary installers from 5.0.2 onwards ship the dll's only in bin. Regards Kai From frederik.gladhorn at digia.com Mon Jun 10 09:44:24 2013 From: frederik.gladhorn at digia.com (Frederik Gladhorn) Date: Mon, 10 Jun 2013 09:44:24 +0200 Subject: [Development] Touch Points Update In-Reply-To: References: Message-ID: <1466292.oGQQluV6pJ@varney> Hello Francisco, Lørdag 8. juni 2013 13.06.20 skrev Francisco Ortega: > Hello all, > > I spoke to Oliver Wolf this past Monday (6/3/2013) and a few other members > (#qt-labs) about the qtbase/src/plugins/platforms dealing with Touch. Like > always, everyone is extremely helpful. > > I started talking about Windows having a few additional data members for a > given touch point. Most importantly, I spoke about the unsigned long ID > given by windows, which is not the same. Without going into much > explanation here, I spoke in IRC that I used that unique ID to store touch > points to a database to later reply them. The current id for a windows app > running Qt does not does the same, since it can go from 0,1,2... and later > 0,1,2,3 in the same moment. As most of you may guess, I could do something > to fix this for me. If you store them in a database you can just map your own unique IDs there, whenever a touch point appears, assign it a new ID and keep track of it. Qt uses consistent IDs. As long as a touch event is ongoing, the ID will stay the same. When a finger is lifted (lets say IDs 1,2,3 were pressed) and 2 goes away and is re-added, it will be a new unique ID compared to the others (you might end up with 1,3,4). I don't see how the actualy unique ID is relevant, you just need to be able to identify individual points and track them from what I understand. > However, I was thinking at a larger scale. Therefore, I went and check the > three platforms that I have accessed to. Windows, Linux (Debian 7), and Mac > OS X 10.8. Windows is the only platform that I know well. > > With the search, I found that Linux and MacOSX has what is already given by > Qt. x,y,state. Linux also has a timestamp, which I didn't no see in > QTouchEvents::TouchPoint (in linux is under time, but I think is a > timestamp). Windows has the timestamp as well. What about QInputEvent::timestamp()? > Windows also has Cx,Cy which is the contact area. Not the most useful data > at least with my Multi-Touch monitors (3M) because it gives me two > values... but nevertheless, a value that is no there. This might be a good addition, it can go directly into QTouchEventTouchPointPrivate (qevent_p.h). > With all this preamble, I would like to get to the meet of the change that > I will submit and see if it gets reviewed. First, let me tell you what I > discarded. I hope your feedback about all. > > (First ideas, that I decided not to go for) > > 1) Returning a void * to a platform structure, it is not a good idea, so is > out. > 2) Changing the current id (int) to unsigned long can have multiple > unintended consequences to current code, that is best not to do it. So is > out. > 3) setting the platform id (windows) to the int by moding with a "MAX_INT" > does not feel right to me. > > What I will change in the code and submit when ready is the following: > > 1) Create an interface to used a platformSpecificData() that will be the > same across all Operating Systems. For example, say that we have > data.cxfor mac os x. Then this will simply be 0, the data.flags will > specify if > the data is available. > > I hope to receive feedback. I'm not sure if I can do it this month, since I > have to submit a paper to a conference, but I will try. if not next week. > Because the change may be more significant, is probably that even if review > and accept it, it will take a while to make it to the stable release. > However, I think this is the best option. > > Once again, I thank you for all the feedback and continue support here and > in Irc. > > Other contributions in the future that I hope to be involved is the "Leap > Motion" which I will be getting soon and some MEMS that I have already > received. I like input and please consider me for any work you may need. Help with the input events is most certainly appreciated :) Greetings, Frederik > > Thanks, > Francisco > > > Francisco R. Ortega > Ph.D. Candidate in Computer Science > Florida International University > http://www.FranciscoRaulOrtega.com > "No me quieras por que gane, necesito que me quieras para ganar" -- Marcelo > Bielsa -- Best regards, Frederik Gladhorn Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com From tobias.hunger at digia.com Mon Jun 10 10:10:30 2013 From: tobias.hunger at digia.com (Tobias Hunger) Date: Mon, 10 Jun 2013 10:10:30 +0200 Subject: [Development] Proposing Petar Perisin for Approver Status Message-ID: <51B589F6.5010806@digia.com> Hello everybody! I would like to propose Petar Perisin for Approver status in Qt project. Petar has been a great help with version control in Qt Creator for a long time now, he is reviewing patches, and brings forward new ideas. He provides patches implementing new functionality and fixing existing one. Petar is even willing to fix bugs he introduced;-) Petar is also very active when it comes to opening and following up on bug reports on Qt Creator. I am convinced Petar will make a good approver. For reference: a link to things Petar has pending in gerrit: https://codereview.qt-project.org/#dashboard,1002263 Best Regards, Tobias -- Tobias Hunger, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin. USt-IdNr: DE xxx xxx xxx Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From Jani.Heikkinen at digia.com Mon Jun 10 10:15:59 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Mon, 10 Jun 2013 08:15:59 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <3428013.JGyjOSOZJI@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> <3428013.JGyjOSOZJI@tjmaciei-mobl2> Message-ID: >You forgot one detail here: > - QtLocation does not compile on Mac (as of yesterday morning) > >Similarly, any user program that tries to compile a library with CONFIG -= qt >with another that is CONFIG += qt will fail. > >We need a fix somewhere. It seems that QTBUG-31445: can't build QtLocation qtquick plugin on Mac with Qt3D is already fixed. Is that enough at this point? There is still QTBUG-31586: sth disabled the c++11 option when build static lib on Mac open but as Kai commented last week I hope we can continue RC1 release activities with it and put it as a known issue, right? Br, Jani From tor.arne.vestbo at digia.com Mon Jun 10 10:30:12 2013 From: tor.arne.vestbo at digia.com (=?ISO-8859-1?Q?Tor_Arne_Vestb=F8?=) Date: Mon, 10 Jun 2013 10:30:12 +0200 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <3428013.JGyjOSOZJI@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> <3428013.JGyjOSOZJI@tjmaciei-mobl2> Message-ID: <51B58E94.4050902@digia.com> On 6/7/13 17:31 , Thiago Macieira wrote: > On sexta-feira, 7 de junho de 2013 10.22.56, Koehne Kai wrote: >> Situation with Qt 5.1 as it is >> - Binary installer is compiled with OS X 10.7 >> - You cannot deploy with them to 10.6 >> - If you want to deploy to 10.6 without QtWebKit you have to compile Qt >> yourself, on OS X 10.6, or on OS X 10.7 and above with -no-c++11 (to be >> verified) - If you want to deploy to 10.6 including QtWebKit you have to >> compile Qt yourself, on OS X 10.6 > > You forgot one detail here: > - QtLocation does not compile on Mac (as of yesterday morning) > > Similarly, any user program that tries to compile a library with CONFIG -= qt > with another that is CONFIG += qt will fail. Wait, are you talking about something else here? The QtLocation issue had nothing to do with CONFIG -= qt. It was caused by a part of Qt not picking up the generic Qt build config (that enables C++11 if enabled by configure) because it was neither a module or a plugin or a tool, etc. tor arne From Eike.Ziller at digia.com Mon Jun 10 10:45:37 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Mon, 10 Jun 2013 08:45:37 +0000 Subject: [Development] [Qt-creator] Proposing Petar Perisin for Approver Status In-Reply-To: References: <51B589F6.5010806@digia.com> Message-ID: <6F1FCA3B-139B-4A34-8168-30FC81926AA4@digia.com> On 10.06.2013, at 10:12, Orgad Shaneh wrote: > On Mon, Jun 10, 2013 at 11:10 AM, Tobias Hunger wrote: > Hello everybody! > > I would like to propose Petar Perisin for Approver status in Qt project. > > Petar has been a great help with version control in Qt Creator for a > long time now, he is reviewing patches, and brings forward new ideas. He > provides patches implementing new functionality and fixing existing one. > Petar is even willing to fix bugs he introduced;-) > > Petar is also very active when it comes to opening and following up on > bug reports on Qt Creator. > > I am convinced Petar will make a good approver. > > For reference: a link to things Petar has pending in gerrit: > > https://codereview.qt-project.org/#dashboard,1002263 > > Best Regards, > Tobias > > -- > Tobias Hunger, Senior Software Engineer - Digia, Qt > Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin > Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius > Sitz der Gesellschaft: Berlin. USt-IdNr: DE xxx xxx xxx > Registergericht: Amtsgericht Charlottenburg, HRB 144331 B > _______________________________________________ > Qt-creator mailing list > Qt-creator at qt-project.org > http://lists.qt-project.org/mailman/listinfo/qt-creator > > +1 of course :) > another +1 from me ++ Eike > - Orgad > > _______________________________________________ > Qt-creator mailing list > Qt-creator at qt-project.org > http://lists.qt-project.org/mailman/listinfo/qt-creator -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From oswald.buddenhagen at digia.com Mon Jun 10 10:56:50 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Mon, 10 Jun 2013 10:56:50 +0200 Subject: [Development] Qt 4.8.x Hebrew Translation Update In-Reply-To: <20130608172851.150120@gmx.com> References: <20130608172851.150120@gmx.com> Message-ID: <20130610085650.GB26734@troll08.it.local> hello, On Sat, Jun 08, 2013 at 01:28:50PM -0400, Genghis Khan wrote: > Herein attached a Hebrew translation file for Qt 4.8.x. > thanks for your contribution. would you mind following the guidelines written down in http://qt-project.org/wiki/Qt-Localization ? regards From joerg.bornemann at digia.com Mon Jun 10 11:05:35 2013 From: joerg.bornemann at digia.com (Joerg Bornemann) Date: Mon, 10 Jun 2013 11:05:35 +0200 Subject: [Development] Why we need two `Qt*.dll` copies on Windows? In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C01A1@IT-EXMB01-HKI.it.local> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C01A1@IT-EXMB01-HKI.it.local> Message-ID: <51B596DF.3090704@digia.com> On 10/06/2013 08:50, Koehne Kai wrote: >> Does some one notice there exists two QtDLLs on Windows, the one in >> bin\Qt*.dll, and the other placed `lib\Qt*.dll`, WHY? > To cite a commit by Ossi: " the dlls being in lib/ is kind of an accident (a side effect of how qmake builds them" (commit d8406d0e09c5bfa549f27). Anyway, the binary installers from 5.0.2 onwards ship the dll's only in bin. To fix this we could do two things: - add a way in qmake to tell the linker to build the .lib files in lib and the .dll files in bin, - or make hard links instead of copies. The latter even works as non-admin but would need checks if hardlink creation is possible on the affected partitions. We also could just ignore this issue as it hasn't been a problem for the last decade. BR, Joerg From stephen.kelly at kdab.com Mon Jun 10 11:40:29 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Mon, 10 Jun 2013 11:40:29 +0200 Subject: [Development] OSX private headers installation broken in 5.x.y In-Reply-To: References: <2841210.9vLU2H3IrN@hal> Message-ID: <4240444.NdYAjUWhHv@hal> On Saturday, June 08, 2013 13:57:43 you wrote: > The missing paths definitely do not exist. Not only do the paths to the private headers not exist where expected, they do not exist at all. The Qt installation on Mac, when using the default config option -frameworks, does not install the private headers. Apparently it's a known issue, but is not scheduled to be solved. The existing CMake unit tests actually check for the existence of the private headers, and the tests pass. That is because the tests are run on the build dir, not the installation dir. So, the error reported by CMake is correct. The installation of Qt is broken. This issue would be found/prevented by fixing https://bugreports.qt-project.org/browse/QTBUG-27315 or by running the tests on the installed Qt at CI time instead of on the build Qt. > The contents of /include are: > QtOpenGLExtensions QtPlatformSupport QtUiTools I suspect you did not do a clean build/install. This is not the result of building only qtbase (which you can do with -no-gui if you want to test this more btw). I filed a bug anyway: https://bugreports.qt-project.org/browse/QTBUG-31641 Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From jc.fernandez.navarro at gmail.com Mon Jun 10 12:14:23 2013 From: jc.fernandez.navarro at gmail.com (Jose) Date: Mon, 10 Jun 2013 12:14:23 +0200 Subject: [Development] OSX very strange focus problem? Message-ID: Hi, I have stumbled upon to an error that does not really make much sense to me, though I am probably missing something. I am working on a qt5 based application, it works find on linux, however when I build it on MAC I get a very strange behavior. The main window contains a qtabwidget which has 4 pages, each of which contains different components. When I start the application the components in the first page do not respond to click/press events. However, if I increase the size of the window to a certain level, components on the right part of the tab start to respond, therefore I can click or interact on them. Same behavior occurs in every page. I believe there is a focus problem or layout problem but I cannot really get to figure out what it is. Also, is QtMacExtras integrated into qt 5.0.2 or I need to build it and integrate it separately into my project? I would appreciate any kind of help. Thanks -------------- next part -------------- An HTML attachment was scrubbed... URL: From nospam at vuorela.dk Mon Jun 10 13:46:24 2013 From: nospam at vuorela.dk (Sune Vuorela) Date: Mon, 10 Jun 2013 11:46:24 +0000 (UTC) Subject: [Development] OSX private headers installation broken in 5.x.y References: <2841210.9vLU2H3IrN@hal> <4240444.NdYAjUWhHv@hal> Message-ID: On 2013-06-10, Stephen Kelly wrote: > Not only do the paths to the private headers not exist where expected, they do > not exist at all. The Qt installation on Mac, when using the default config > option -frameworks, does not install the private headers. Apparently it's a > known issue, but is not scheduled to be solved. > So, the error reported by CMake is correct. The installation of Qt is broken. I'm not sure the lack of private headers should be considered 'broken'. The entire concept of 'private public headers' is, on the other hand, quite a issue and should be avoided as much as possible. /Sune From stephen.kelly at kdab.com Mon Jun 10 14:07:47 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Mon, 10 Jun 2013 14:07:47 +0200 Subject: [Development] OSX private headers installation broken in 5.x.y In-Reply-To: References: <4240444.NdYAjUWhHv@hal> Message-ID: <2797454.NhDRLB3ViE@hal> On Monday, June 10, 2013 11:46:24 Sune Vuorela wrote: > On 2013-06-10, Stephen Kelly wrote: > > Not only do the paths to the private headers not exist where expected, > > they do not exist at all. The Qt installation on Mac, when using the > > default config option -frameworks, does not install the private headers. > > Apparently it's a known issue, but is not scheduled to be solved. > > > > So, the error reported by CMake is correct. The installation of Qt is > > broken. > I'm not sure the lack of private headers should be considered 'broken'. > The entire concept of 'private public headers' is, on the other hand, > quite a issue and should be avoided as much as possible. That's separate. The result is different to the intent on one platform/configuration. That's the brokenness. Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Mon Jun 10 15:11:53 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Mon, 10 Jun 2013 06:11:53 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <51B58E94.4050902@digia.com> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <3428013.JGyjOSOZJI@tjmaciei-mobl2> <51B58E94.4050902@digia.com> Message-ID: <1768050.zbsLI4FWfm@tjmaciei-mobl2> On segunda-feira, 10 de junho de 2013 10.30.12, Tor Arne Vestbø wrote: > Wait, are you talking about something else here? The QtLocation issue > had nothing to do with CONFIG -= qt. It was caused by a part of Qt not > picking up the generic Qt build config (that enables C++11 if enabled by > configure) because it was neither a module or a plugin or a tool, etc. I see. So the root cause wasn't what I thought it was. That makes it simpler. This problem might be a P2 or P3 now if CONFIG += c++11 automatically adds - stdlib=libc++. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Liang.Qi at digia.com Mon Jun 10 15:47:27 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Mon, 10 Jun 2013 13:47:27 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1768050.zbsLI4FWfm@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <3428013.JGyjOSOZJI@tjmaciei-mobl2> <51B58E94.4050902@digia.com>,<1768050.zbsLI4FWfm@tjmaciei-mobl2> Message-ID: Yes, it is confirmed nothing related with "CONFIG -= qt". The bug report is updated: https://bugreports.qt-project.org/browse/QTBUG-31586 And the workaround for QtLocation was merged, https://codereview.qt-project.org/58231 . The patch is like: +# workaround for QTBUG-31586 +contains(QT_CONFIG, c++11): CONFIG += c++11 Regards, Liang ________________________________________ From:Thiago Macieira Sent: Monday, June 10, 2013 3:11 PM To: development at qt-project.org Subject: Re: [Development] Clarification on Mac 10.6 support for Qt 5.2 On segunda-feira, 10 de junho de 2013 10.30.12, Tor Arne Vestbø wrote: > Wait, are you talking about something else here? The QtLocation issue > had nothing to do with CONFIG -= qt. It was caused by a part of Qt not > picking up the generic Qt build config (that enables C++11 if enabled by > configure) because it was neither a module or a plugin or a tool, etc. I see. So the root cause wasn't what I thought it was. That makes it simpler. This problem might be a P2 or P3 now if CONFIG += c++11 automatically adds - stdlib=libc++. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center From lkorbel at milosolutions.com Mon Jun 10 19:37:42 2013 From: lkorbel at milosolutions.com (=?ISO-8859-2?Q?=A3ukasz_Korbel?=) Date: Mon, 10 Jun 2013 19:37:42 +0200 Subject: [Development] QtMultimedia on Android Message-ID: I want to report problem with usage of QML MediaPlayer/VideoOutput on Android. We used very simple qml file for test (working good on linux) with sample video that plays correctly on android native player. We don't put this message on interest list because we believe there are some problems within implementation. Similar testing application was working with build from 5.1 alpha release time (unfortunately not the one tagged as "alpha" now and we could've not find working commit again). We're using build from stable branch from 27-05-2013. Libs and application were build for Android SDK API level 14. When running application on Android devices proper windows shows up, we can hear audio of playback but no video at all (black screen all the time, like frames were not drawn to surface texture). Same effect observed with QtMultimedia libs built from wip/android branch. I've attached project source. I've also attached output from logcat (android.log). Two most suspicious lines from logs are: W/System.err( 7783): java.lang.InstantiationException: can't instantiate class org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer; no empty constructor and... E/BufferQueue( 7783): [unnamed-7783-0] dequeueBuffer: SurfaceTexture has been abandoned! E/SoftwareRenderer( 87): Surface::dequeueBuffer returned error -19 First we thought that this is because QtAndroidMediaPlayer starts before SurfaceHolder is set but looks like the problem lies somewhere else. Is there something wrong in implementation indeed or is just we doing something wrong here? Thanks in advance for help, *Łukasz Korbel* Senior Software Developer Milo Solutions (+48) 517539562 http://milosolutions.com P.S. For quick review key parts of source. main.qml ---------------------------------------------------------------------------------------------------------------------- import QtQuick 2.0 import QtMultimedia 5.0 Rectangle { id: player width: 1024 height: 720 MediaPlayer { id: mediaplayer autoLoad: true autoPlay: true volume: 1.0 source: "file:///mnt/sdcard/Download/test.mp4" } VideoOutput { id: videoOutput width: parent.width height: parent.height anchors.centerIn: parent fillMode: VideoOutput.PreserveAspectFit source: mediaplayer } } ---------------------------------------------------------------------------------------------------------------------- AndroidManifest.xml ---------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------- libs.xml ---------------------------------------------------------------------------------------------------------------------- https://download.qt-project.org/ministro/android/qt5/latest default gnustl_shared Qt5Core Qt5Gui Qt5Network Qt5V8 Qt5Qml Qt5Quick Qt5Multimedia ---------------------------------------------------------------------------------------------------------------------- -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: android.log Type: application/octet-stream Size: 13663 bytes Desc: not available URL: -------------- next part -------------- A non-text attachment was scrubbed... Name: source.tar.bz2 Type: application/x-bzip2 Size: 21748 bytes Desc: not available URL: From jake.petroules at petroules.com Mon Jun 10 22:46:36 2013 From: jake.petroules at petroules.com (Jake Thomas Petroules) Date: Mon, 10 Jun 2013 16:46:36 -0400 Subject: [Development] OSX very strange focus problem? In-Reply-To: References: Message-ID: <4151FC85-94A7-42E8-94D0-90640494FA9B@petroules.com> QtMacExtras is not integrated into Qt 5.0.2 -- it's due for 5.2, I believe. -- Jake Petroules Chief Technology Officer Petroules Corporation · www.petroules.com Email: jake.petroules at petroules.com On Jun 10, 2013, at 6:14 AM, Jose wrote: > Hi, > > I have stumbled upon to an error that does not really make much sense to me, though I am probably missing something. > > I am working on a qt5 based application, it works find on linux, however when I build it on MAC I get a very strange behavior. The main window contains a qtabwidget which has 4 pages, each of which contains different components. > > When I start the application the components in the first page do not respond to click/press events. However, if I increase the size of the window to a certain level, components on the right part of the tab start to respond, therefore I can click or interact on them. Same behavior occurs in every page. I believe there is a focus problem or layout problem but I cannot really get to figure out what it is. > > Also, is QtMacExtras integrated into qt 5.0.2 or I need to build it and integrate it separately into my project? > > I would appreciate any kind of help. > > Thanks > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From lpapp at kde.org Tue Jun 11 06:13:59 2013 From: lpapp at kde.org (Laszlo Papp) Date: Tue, 11 Jun 2013 07:13:59 +0300 Subject: [Development] Qt Playground - CAN bus add-on module Message-ID: Hi all, I have been planning to request a playground area for this for a while, but unfortunately it has never been materialized. I would like to work on supporting the industrial (mostly, but not exclusively, automotive) can bus protocol with a high level Qt API. It would be a leisure time project for me without anyone supporting me financially or so. Of course, contributions would be welcome from automotive, medical or any other professionals. It would be nice to abstract out the differences between the char devices, the socket can interface, and specific windows drivers. I would also look into the QNX support at some point for sure as that is a very appealing platform on the automotive and medical markets. There was an attempt for a module called "OpenCAN" in the past as far as I understand, but it is a bit old-fashioned with the old can support of the Linux kernel. Also, it seems to handle different devices slightly differently instead of using as much abstraction from the operating system as possible. Also, it is a bit tied to a company, not to the Qt Project. It would be nice to push Qt a bit forward in an unusual area: the automotive world. What do you think? Best Regards, Laszlo Papp -------------- next part -------------- An HTML attachment was scrubbed... URL: From scapig2 at yandex.ru Tue Jun 11 07:22:52 2013 From: scapig2 at yandex.ru (Denis Shienkov) Date: Tue, 11 Jun 2013 09:22:52 +0400 Subject: [Development] Qt Playground - CAN bus add-on module In-Reply-To: References: Message-ID: <51B6B42C.9020904@yandex.ru> Hello Laszlo, all It is possible to expand this idea a little. For example, to add some add-on for support of some industry protocols: ModBus, DNP3, IEC101-104, CAN and so forth. It is possible to implement a certain basic concept of Protocol for all heritable protocols with ISO/OSI model support (or like that). Of course, it is necessary to make so that as transport it was possible to use Serial, Socket or something else, through QIODevice. For example, I could take on myself Modbus implementation. Best regards, Denis 11.06.2013 8:13, Laszlo Papp ?????: > Hi all, > > I have been planning to request a playground area for this for a while, but unfortunately it has never been materialized. > > I would like to work on supporting the industrial (mostly, but not exclusively, automotive) can bus protocol with a high level Qt API. It would be a leisure time project for me without anyone supporting me financially or so. Of course, contributions would be welcome from automotive, medical or any other professionals. > > It would be nice to abstract out the differences between the char devices, the socket can interface, and specific windows drivers. I would also look into the QNX support at some point for sure as that is a very appealing platform on the automotive and medical markets. > > There was an attempt for a module called "OpenCAN" in the past as far as I understand, but it is a bit old-fashioned with the old can support of the Linux kernel. Also, it seems to handle different devices slightly differently instead of using as much abstraction from the operating system as possible. Also, it is a bit tied to a company, not to the Qt Project. > > It would be nice to push Qt a bit forward in an unusual area: the automotive world. What do you think? > > Best Regards, > Laszlo Papp > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From Eike.Ziller at digia.com Tue Jun 11 11:26:23 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Tue, 11 Jun 2013 09:26:23 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <3393088.prRq4eQrUf@gargamel> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <5B2736A3C8B75B4BB66BC58DC5E889B08BFD21@IT-EXMB01-HKI.it.local> <3393088.prRq4eQrUf@gargamel> Message-ID: On 07.06.2013, at 18:50, Olivier Goffart wrote: > On Friday 07 June 2013 10:22:56 Koehne Kai wrote: > >> My suggestion: >> - Leave Qt 5.1.0 as it is right now, move on with the release process >> - Investigate providing an additional binary installer with Qt compiled >> 10.6 (e.g. with 5.1.1) - Thoroughly document the problem for people >> compiling their own Qt > > But what about the binary compatibility break? > > Since libstdc++ and libc++ are not binary compatible, if one use third party > library that uses the standard library, his application will no longer work > unless that 3rd party library is also re-compiled against the same standard > library. > > Is it not an important issue? When I build Qt 5.1 in the current standard configuration (e.g. with c++11 and therefore with libc++) I still get QtScript and QtWebKit built against libstdc++ and with deployment target 10.6, even though the rest of Qt is built against libc++ and with deployment target 10.7. Because they do CONFIG -= c++11 . This will also happen for any other project / library etc that explicitly doesn't want c++11. The deployment target thing is probably a lesser annoyance though it still is ugly, especially for QtWebKit and QtScript which are *part* of Qt and should therefore build with the same configuration. But does anyone know about the consequences of mixing libc++ and libstdc++ ? Br, Eike > -- > Olivier > > Woboq - Qt services and support - http://woboq.com - http://code.woboq.org > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From jpnurmi at digia.com Tue Jun 11 14:04:21 2013 From: jpnurmi at digia.com (Nurmi J-P) Date: Tue, 11 Jun 2013 12:04:21 +0000 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick Message-ID: <77CBF859-2E2C-434C-AD7D-41E01B6F0616@digia.com> Hi all, I'd like to propose merging the current #qt-qml and #qt-components IRC channels to a single channel called #qt-quick. Reasons: - the #qt-components name is outdated now that we have QtQuick Controls - most users don't understand the distinction between QML, QtQuick and QtQuick Controls. I believe this would make it easier for new users to find the correct channel. We would also setup automatic redirects from the old channels so the naming would be more or less transparent to the current users. Thoughts? -- J-P Nurmi From Yoann.Lopes at digia.com Tue Jun 11 14:10:11 2013 From: Yoann.Lopes at digia.com (Lopes Yoann) Date: Tue, 11 Jun 2013 12:10:11 +0000 Subject: [Development] QtMultimedia on Android In-Reply-To: References: Message-ID: <443B6C20-E3B9-4A07-893A-EFC0B0D42B2F@digia.com> Hi, There is an issue in 5.1 when starting a video immediately on app startup. Could you try to delay the loading and starting of the video, on mouse click for example, and see if the problem is still there? If you compile the wip/android branch, make sure to remove the 5.1 multimedia plugin both on your host machine (/plugins/mediaservice) and on the device ("Clean Libs on Device" button in QtCreator in the "Deploy configurations panel"). The name has changed in 5.2 and the app might load the wrong plugin. The plugin name in 5.1 is libandroidmediaplayer and in 5.2 it's libqtmedia_android. Yoann Lopes Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com On Jun 10, 2013, at 7:37 PM, Łukasz Korbel wrote: I want to report problem with usage of QML MediaPlayer/VideoOutput on Android. We used very simple qml file for test (working good on linux) with sample video that plays correctly on android native player. We don't put this message on interest list because we believe there are some problems within implementation. Similar testing application was working with build from 5.1 alpha release time (unfortunately not the one tagged as "alpha" now and we could've not find working commit again). We're using build from stable branch from 27-05-2013. Libs and application were build for Android SDK API level 14. When running application on Android devices proper windows shows up, we can hear audio of playback but no video at all (black screen all the time, like frames were not drawn to surface texture). Same effect observed with QtMultimedia libs built from wip/android branch. I've attached project source. I've also attached output from logcat (android.log). Two most suspicious lines from logs are: W/System.err( 7783): java.lang.InstantiationException: can't instantiate class org.qtproject.qt5.android.multimedia.QtAndroidMediaPlayer; no empty constructor and... E/BufferQueue( 7783): [unnamed-7783-0] dequeueBuffer: SurfaceTexture has been abandoned! E/SoftwareRenderer( 87): Surface::dequeueBuffer returned error -19 First we thought that this is because QtAndroidMediaPlayer starts before SurfaceHolder is set but looks like the problem lies somewhere else. Is there something wrong in implementation indeed or is just we doing something wrong here? Thanks in advance for help, Łukasz Korbel Senior Software Developer Milo Solutions (+48) 517539562 http://milosolutions.com P.S. For quick review key parts of source. main.qml ---------------------------------------------------------------------------------------------------------------------- import QtQuick 2.0 import QtMultimedia 5.0 Rectangle { id: player width: 1024 height: 720 MediaPlayer { id: mediaplayer autoLoad: true autoPlay: true volume: 1.0 source: "file:///mnt/sdcard/Download/test.mp4" } VideoOutput { id: videoOutput width: parent.width height: parent.height anchors.centerIn: parent fillMode: VideoOutput.PreserveAspectFit source: mediaplayer } } ---------------------------------------------------------------------------------------------------------------------- AndroidManifest.xml ---------------------------------------------------------------------------------------------------------------------- ---------------------------------------------------------------------------------------------------------------------- libs.xml ---------------------------------------------------------------------------------------------------------------------- https://download.qt-project.org/ministro/android/qt5/latest default gnustl_shared Qt5Core Qt5Gui Qt5Network Qt5V8 Qt5Qml Qt5Quick Qt5Multimedia ---------------------------------------------------------------------------------------------------------------------- _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From lpapp at kde.org Tue Jun 11 14:15:24 2013 From: lpapp at kde.org (Laszlo Papp) Date: Tue, 11 Jun 2013 15:15:24 +0300 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: <77CBF859-2E2C-434C-AD7D-41E01B6F0616@digia.com> References: <77CBF859-2E2C-434C-AD7D-41E01B6F0616@digia.com> Message-ID: Why not #qt-qml for the merged channel? I use the term "QML" more than "QtQuick" in this context. I agree about having one channel though. On Tue, Jun 11, 2013 at 3:04 PM, Nurmi J-P wrote: > Hi all, > > I'd like to propose merging the current #qt-qml and #qt-components IRC > channels to a single channel called #qt-quick. > > Reasons: > - the #qt-components name is outdated now that we have QtQuick Controls > - most users don't understand the distinction between QML, QtQuick and > QtQuick Controls. > > I believe this would make it easier for new users to find the correct > channel. We would also setup automatic redirects from the old channels so > the naming would be more or less transparent to the current users. Thoughts? > > -- > J-P Nurmi > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Petri.Jarvenpaa at digia.com Tue Jun 11 14:27:17 2013 From: Petri.Jarvenpaa at digia.com (=?iso-8859-1?Q?J=E4rvenp=E4=E4_Petri?=) Date: Tue, 11 Jun 2013 12:27:17 +0000 Subject: [Development] Saturday 15th 10:00-18:00 - Service break in all Qt-project.org systems Message-ID: <6B0E1C61E903114F9ED86938421FAAEA43315D@IT-EXMB02-HKI.it.local> Greetings. On Saturday 15th starting 10:00 (CEST) Qt-project.org systems will be under maintenance. Each system is expected to be unavailable for about 2 hours, only exception being testresults.qt-project.org which is scheduled to be down for 3 hours. Target is to finish the maintenance by 18:00 (CEST). List of affected systems: http://testresults.qt-project.org https://codereview.qt-project.org http://lists.qt-project.org http://wiki.qt-project.org http://builds.qt-project.org https://bugdiffs.qt-project.org/fisheye https://bugreports.qt-project.org http://qt-project.org We apologize any inconvenience caused. Best regards, Petri Järvenpää System specialist, Digia PLC -------------- next part -------------- An HTML attachment was scrubbed... URL: From jpnurmi at digia.com Tue Jun 11 15:00:31 2013 From: jpnurmi at digia.com (Nurmi J-P) Date: Tue, 11 Jun 2013 13:00:31 +0000 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: <77CBF859-2E2C-434C-AD7D-41E01B6F0616@digia.com> Message-ID: Because #qt-quick is prettier and fits better with QtQuick Controls. :) From what I've seen, there are rarely pure QML questions on #qt-qml, but most are related to QtQuick anyway. -- J-P Nurmi On Jun 11, 2013, at 2:15 PM, Laszlo Papp wrote: > Why not #qt-qml for the merged channel? I use the term "QML" more than "QtQuick" in this context. > > I agree about having one channel though. > > > On Tue, Jun 11, 2013 at 3:04 PM, Nurmi J-P wrote: > Hi all, > > I'd like to propose merging the current #qt-qml and #qt-components IRC channels to a single channel called #qt-quick. > > Reasons: > - the #qt-components name is outdated now that we have QtQuick Controls > - most users don't understand the distinction between QML, QtQuick and QtQuick Controls. > > I believe this would make it easier for new users to find the correct channel. We would also setup automatic redirects from the old channels so the naming would be more or less transparent to the current users. Thoughts? > > -- > J-P Nurmi > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > From bm_witness at yahoo.com Tue Jun 11 15:18:59 2013 From: bm_witness at yahoo.com (BRM) Date: Tue, 11 Jun 2013 06:18:59 -0700 (PDT) Subject: [Development] Qt Playground - CAN bus add-on module In-Reply-To: <51B6B42C.9020904@yandex.ru> References: <51B6B42C.9020904@yandex.ru> Message-ID: <1370956739.49104.YahooMailNeo@web126206.mail.ne1.yahoo.com> Just FYI - from what I am aware from building the Linux Kernel from time to time there is some CAN support there too. So you might want to add that to your list as well, or at least look at it. $0.02 Ben >________________________________ > From: Denis Shienkov >To: development at qt-project.org; Laszlo Papp >Sent: Tuesday, June 11, 2013 1:22 AM >Subject: Re: [Development] Qt Playground - CAN bus add-on module > > > >Hello Laszlo, all > >It is possible to expand this idea a little. For example, to add some add-on for support >of some industry protocols: ModBus, DNP3, IEC101-104, CAN and so forth. > >It is possible to implement a certain basic concept of Protocol for all heritable protocols with >ISO/OSI model support (or like that). > >Of course, it is necessary to make so that as transport it was possible to use Serial, Socket >or something else, through QIODevice. > > >For example, I could take on myself Modbus implementation. > >Best regards, >Denis > > >11.06.2013 8:13, Laszlo Papp пишет: > >Hi all, I have been planning to request a playground area for this for a while, but unfortunately it has never been materialized. I would like to work on supporting the industrial (mostly, but not exclusively, automotive) can bus protocol with a high level Qt API. It would be a leisure time project for me without anyone supporting me financially or so. Of course, contributions would be welcome from automotive, medical or any other professionals. It would be nice to abstract out the differences between the char devices, the socket can interface, and specific windows drivers. I would also look into the QNX support at some point for sure as that is a very appealing platform on the automotive and medical markets. There was an attempt for a module called "OpenCAN" in the past as far as I understand, but it is a bit old-fashioned with the old can support of the Linux kernel. Also, it seems to handle different devices slightly differently instead of using as much abstraction from the operating system as possible. Also, it is a bit tied to a company, not to the Qt Project. It would be nice to push Qt a bit forward in an unusual area: the automotive world. What do you think? Best Regards, Laszlo Papp >> >> >>_______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development > >_______________________________________________ >Development mailing list >Development at qt-project.org >http://lists.qt-project.org/mailman/listinfo/development > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From sean.harmer at kdab.com Tue Jun 11 16:00:26 2013 From: sean.harmer at kdab.com (Sean Harmer) Date: Tue, 11 Jun 2013 15:00:26 +0100 Subject: [Development] Qt5 combined source package - Perl dependency In-Reply-To: References: Message-ID: <1394364.HfbhOJtIWN@titan> Hi, On Saturday 27 April 2013 02:03:07 Knoll Lars wrote: > On 4/26/13 3:00 AM, "Anttila Janne" wrote: > >Hi, > > > >As you probably are aware, there has been a long thread on interest > >list about Qt dependency bloat. One of the most commented problems > >has been Perl dependency, especially on Windows. > > > >We have had similar feedback on commercial support channels. > > > >One quite simple change what we could do already for 5.1, is to > >run syncqt before creating combined source archives. This would > >allow building Qt5 sources (except webkit) without perl, like it > >was on Qt4 as well. > > > >Ossi already prepared a patch making this possible for some time > >ago https://codereview.qt-project.org/49833 but it was rejected > >by Thiago and Lars. > > > >I think it is time to re-evaluate this decision now! > > > >Qt-Project now provides split source packages, the split packages > >do not and should not have syncqt executed. Thus they would make > >it possible to cryptographically verify that the sources match > >exactly the repository with no modifications. > > > >The combined source package is provided for convenience. > >I think we should take the next step, and run syncqt before doing > >that archive, and provide even more convenience for Qt5 (Windows) > >developers. > > Yes, I have to agree after all. I would prefer not having to ship all > these generated files, but I can also see that it causes issues for people > that want to compile Qt on their own. We have today hit the converse problem of the pre-generated forwarding headers getting in the way. The generated headers in the source packages are forwarding the EGL related headers to those in 3rdparty/ANGLE. This renders the source packages useless for trying to build with an EGL based configuration on a platform != windows. Moving the qtbase/include dir out of the way is insufficient to cause regeneration of the headers as the configure script checks for the presence of .git to determine if it should run syncqt or not. Telling a customer to rm -rf qtbase/include && touch .git does not seem to be a good solution. I don't see how we can really hope to ship pre-generated headers in the source packages when those headers are configuration dependent. I would therefore vote for removing them from the source packages and requiring perl so that syncqt can be executed as part of configure even outside of a git clone. Cheers, Sean -- Dr Sean Harmer | sean.harmer at kdab.com | Managing Director UK Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions From sean.harmer at kdab.com Tue Jun 11 16:13:44 2013 From: sean.harmer at kdab.com (Sean Harmer) Date: Tue, 11 Jun 2013 15:13:44 +0100 Subject: [Development] Qt5 combined source package - Perl dependency In-Reply-To: <1394364.HfbhOJtIWN@titan> References: <1394364.HfbhOJtIWN@titan> Message-ID: <2686835.u8R6mO60N0@titan> On Tuesday 11 June 2013 15:00:26 Sean Harmer wrote: > Hi, > > On Saturday 27 April 2013 02:03:07 Knoll Lars wrote: > > On 4/26/13 3:00 AM, "Anttila Janne" wrote: > > >Hi, > > > > > >As you probably are aware, there has been a long thread on interest > > >list about Qt dependency bloat. One of the most commented problems > > >has been Perl dependency, especially on Windows. > > > > > >We have had similar feedback on commercial support channels. > > > > > >One quite simple change what we could do already for 5.1, is to > > >run syncqt before creating combined source archives. This would > > >allow building Qt5 sources (except webkit) without perl, like it > > >was on Qt4 as well. > > > > > >Ossi already prepared a patch making this possible for some time > > >ago https://codereview.qt-project.org/49833 but it was rejected > > >by Thiago and Lars. > > > > > >I think it is time to re-evaluate this decision now! > > > > > >Qt-Project now provides split source packages, the split packages > > >do not and should not have syncqt executed. Thus they would make > > >it possible to cryptographically verify that the sources match > > >exactly the repository with no modifications. > > > > > >The combined source package is provided for convenience. > > >I think we should take the next step, and run syncqt before doing > > >that archive, and provide even more convenience for Qt5 (Windows) > > >developers. > > > > Yes, I have to agree after all. I would prefer not having to ship all > > these generated files, but I can also see that it causes issues for people > > that want to compile Qt on their own. > > We have today hit the converse problem of the pre-generated forwarding > headers getting in the way. The generated headers in the source packages > are forwarding the EGL related headers to those in 3rdparty/ANGLE. > > This renders the source packages useless for trying to build with an EGL > based configuration on a platform != windows. Moving the qtbase/include dir > out of the way is insufficient to cause regeneration of the headers as the > configure script checks for the presence of .git to determine if it should > run syncqt or not. > > Telling a customer to rm -rf qtbase/include && touch .git does not seem to > be a good solution. > > I don't see how we can really hope to ship pre-generated headers in the > source packages when those headers are configuration dependent. > > I would therefore vote for removing them from the source packages and > requiring perl so that syncqt can be executed as part of configure even > outside of a git clone. Speaking to Sergio on irc it seems that Ossi has just merged a lot of patches to address this issue. New source packages with the fixes in should appear tomorrow, so we'll review them once they are available. Cheers, Sean -- Dr Sean Harmer | sean.harmer at kdab.com | Managing Director UK Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions From thiago.macieira at intel.com Tue Jun 11 17:03:37 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 11 Jun 2013 08:03:37 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <3393088.prRq4eQrUf@gargamel> Message-ID: <2126990.jhZPss7GgU@tjmaciei-mobl2> On terça-feira, 11 de junho de 2013 09.26.23, Ziller Eike wrote: > When I build Qt 5.1 in the current standard configuration (e.g. with c++11 > and therefore with libc++) I still get QtScript and QtWebKit built against > libstdc++ and with deployment target 10.6, even though the rest of Qt is > built against libc++ and with deployment target 10.7. Because they do > CONFIG -= c++11 . This will also happen for any other project / library etc > that explicitly doesn't want c++11. That's not a problem for API and ABI, since the Qt API and ABI do not expose any of the Standard Library. Therefore, no matter which one is used behind the scenes for Qt, the user application may still choose. Deployment, however... > The deployment target thing is probably > a lesser annoyance though it still is ugly, especially for QtWebKit and > QtScript which are *part* of Qt and should therefore build with the same > configuration. But does anyone know about the consequences of mixing libc++ > and libstdc++ ? See above. My question is deployment: is there a libc++ on 10.6 for the Qt libraries to run against? If not, we need to turn it off. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From robin+qt at viroteck.net Tue Jun 11 17:13:05 2013 From: robin+qt at viroteck.net (Robin Burchell) Date: Tue, 11 Jun 2013 17:13:05 +0200 Subject: [Development] Search engine indexing of qt-project.org Message-ID: Hi, I've noticed that the quality of search results for Qt documentation (and so forth) in search engines has been terrible. I just noticed that they now seem to be hosted directly on http://qt-project.org, which has a robots.txt with the following gem: User-agent: * Disallow: / This seems ... very counterproductive. It certainly explains the bad results. Can someone please comment why this is so, if this is correct, or forward it to the right people to get it fixed please? BR, Robin From dangelog at gmail.com Tue Jun 11 17:30:28 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Tue, 11 Jun 2013 17:30:28 +0200 Subject: [Development] Search engine indexing of qt-project.org In-Reply-To: References: Message-ID: CCing web at qt-project.org... On 11 June 2013 17:13, Robin Burchell wrote: > Hi, > > I've noticed that the quality of search results for Qt documentation > (and so forth) in search engines has been terrible. I just noticed > that they now seem to be hosted directly on http://qt-project.org, > which has a robots.txt with the following gem: > > User-agent: * > Disallow: / Really? I get a much more complete robots, which disallows only certain parts... > This seems ... very counterproductive. It certainly explains the bad > results. Can someone please comment why this is so, if this is > correct, or forward it to the right people to get it fixed please? Amongst other things, this is still open (together with its suggestions to improve ranking, which unless implemented can't be disproven) https://bugreports.qt-project.org/browse/QTWEBSITE-504 -- Giuseppe D'Angelo (for reference) $ GET http://qt-project.org/robots.txt # Start Qt Developer Network file for metal spiders # Skip the following: User-agent: * Disallow: /images/ Disallow: /themes/ Disallow: /forums/member_search/ Disallow: /forums/search_results/ Disallow: /forums/search/ Disallow: /member/ Disallow: /ignore_member/ Disallow: /forums/new_topic_search/ Disallow: /forums/view_pending_topics/ Disallow: /email/ Disallow: /wiki/*/edit/ Disallow: /wiki/*/revision/ Disallow: /wiki/diff/ Disallow: /wiki/pdf/ Disallow: /revision/ Cache-delay: 5 Crawl-delay: 2 # Allow Google to crawl our general images User-agent: Googlebot-Image Allow: /images/ # End robots.txt file From joerg.bornemann at digia.com Tue Jun 11 18:07:36 2013 From: joerg.bornemann at digia.com (Joerg Bornemann) Date: Tue, 11 Jun 2013 18:07:36 +0200 Subject: [Development] Qt5 combined source package - Perl dependency In-Reply-To: <2686835.u8R6mO60N0@titan> References: <1394364.HfbhOJtIWN@titan> <2686835.u8R6mO60N0@titan> Message-ID: <51B74B48.9070105@digia.com> On 11/06/2013 16:13, Sean Harmer wrote: > Speaking to Sergio on irc it seems that Ossi has just merged a lot of patches > to address this issue. New source packages with the fixes in should appear > tomorrow, so we'll review them once they are available. FYI, b35ea875a12e89661f370df7e91c4791234aaa44 in the release branch handles this. BR, Joerg From jgastal at profusion.mobi Tue Jun 11 18:30:23 2013 From: jgastal at profusion.mobi (Jonas Gastal) Date: Tue, 11 Jun 2013 13:30:23 -0300 Subject: [Development] Search engine indexing of qt-project.org In-Reply-To: References: Message-ID: Interestingly, doing wget I get the same as Giuseppe, using the browser(chromium) I get the same as Robin. On Tue, Jun 11, 2013 at 12:30 PM, Giuseppe D'Angelo wrote: > CCing web at qt-project.org... > > On 11 June 2013 17:13, Robin Burchell wrote: > > Hi, > > > > I've noticed that the quality of search results for Qt documentation > > (and so forth) in search engines has been terrible. I just noticed > > that they now seem to be hosted directly on http://qt-project.org, > > which has a robots.txt with the following gem: > > > > User-agent: * > > Disallow: / > > Really? I get a much more complete robots, which disallows only certain > parts... > > > This seems ... very counterproductive. It certainly explains the bad > > results. Can someone please comment why this is so, if this is > > correct, or forward it to the right people to get it fixed please? > > Amongst other things, this is still open (together with its > suggestions to improve ranking, which unless implemented can't be > disproven) https://bugreports.qt-project.org/browse/QTWEBSITE-504 > > -- > Giuseppe D'Angelo > > (for reference) > > $ GET http://qt-project.org/robots.txt > # Start Qt Developer Network file for metal spiders > > # Skip the following: > User-agent: * > Disallow: /images/ > Disallow: /themes/ > Disallow: /forums/member_search/ > Disallow: /forums/search_results/ > Disallow: /forums/search/ > Disallow: /member/ > Disallow: /ignore_member/ > Disallow: /forums/new_topic_search/ > Disallow: /forums/view_pending_topics/ > Disallow: /email/ > Disallow: /wiki/*/edit/ > Disallow: /wiki/*/revision/ > Disallow: /wiki/diff/ > Disallow: /wiki/pdf/ > Disallow: /revision/ > Cache-delay: 5 > Crawl-delay: 2 > > # Allow Google to crawl our general images > User-agent: Googlebot-Image > Allow: /images/ > > # End robots.txt file > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From 416365416c at gmail.com Tue Jun 11 19:11:13 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Tue, 11 Jun 2013 10:11:13 -0700 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: <77CBF859-2E2C-434C-AD7D-41E01B6F0616@digia.com> Message-ID: I like the idea. For the average user, I definitely think #qt-quick is a better name. It has a much clearer association, due to users importing QtQuick and QtQuick.Controls in every file. And non-quick QML users won't get lost as badly (I once saw a Cascades user in #qt-qml, and no-one could help him :( . #qt-qnx is a better channel for Cascades-QML - now that QBS is 1.0.0 we don't want QBS users to get lost either). I would like to have a separate #qt-qml channel for the language issues (which are more working on the language than working with anyways), but that's not realistic because users can't always tell the difference. So maybe once the new #qt-quick channel is fully established and #qt-qml is empty, we can reclaim it. Or the language/engine development channel can have a more technical name to hide it from the average user. That second channel is less important, so it can wait for a later discussion, and QML language development chat can always go to #qt-labs until then. -- Alan Alpert On Tue, Jun 11, 2013 at 6:00 AM, Nurmi J-P wrote: > Because #qt-quick is prettier and fits better with QtQuick Controls. :) From what I've seen, there are rarely pure QML questions on #qt-qml, but most are related to QtQuick anyway. > > -- > J-P Nurmi > > > On Jun 11, 2013, at 2:15 PM, Laszlo Papp wrote: > >> Why not #qt-qml for the merged channel? I use the term "QML" more than "QtQuick" in this context. >> >> I agree about having one channel though. >> >> >> On Tue, Jun 11, 2013 at 3:04 PM, Nurmi J-P wrote: >> Hi all, >> >> I'd like to propose merging the current #qt-qml and #qt-components IRC channels to a single channel called #qt-quick. >> >> Reasons: >> - the #qt-components name is outdated now that we have QtQuick Controls >> - most users don't understand the distinction between QML, QtQuick and QtQuick Controls. >> >> I believe this would make it easier for new users to find the correct channel. We would also setup automatic redirects from the old channels so the naming would be more or less transparent to the current users. Thoughts? >> >> -- >> J-P Nurmi >> >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development >> > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From lpapp at kde.org Tue Jun 11 19:39:46 2013 From: lpapp at kde.org (Laszlo Papp) Date: Tue, 11 Jun 2013 20:39:46 +0300 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick Message-ID: On Tue, Jun 11, 2013 at 8:37 PM, Alan Alpert <416365416c at gmail.com> wrote: > On Tue, Jun 11, 2013 at 10:34 AM, Laszlo Papp wrote: > > On Tue, Jun 11, 2013 at 8:11 PM, Alan Alpert <416365416c at gmail.com> > wrote: > >> > >> I like the idea. For the average user, I definitely think #qt-quick is > >> a better name. It has a much clearer association, due to users > >> importing QtQuick and QtQuick.Controls in every file. > > > > > > OK, so you want a QtQuick channel, not QML, so dealing with the C++ API > as > > well, et cetera. I did not get that intention from the initial mail, but > > then it is fine. By the way, it is slower to type as it is a few > characters > > more ... ;) :) > > The C++ API does (and has) come up occasionally, even in #qt-qml. But > realistically most people use the QML APIs (especially for > QtQuick.Controls ;) ). > > Size doesn't matter, as everyone should auto-join it :P . > > >> > >> And non-quick QML users won't get lost as badly (I once saw a Cascades > >> user in > >> #qt-qml, and no-one could help him :( . #qt-qnx is a better channel > >> for Cascades-QML > > > > > > Actually, I think #blackberrydev is even better as Cascades-QML is more > > Blackberry specific rather than upstream Qt. My practical experience > shows > > that, too. > > Ah, I'm only on #qt-qnx. > > >> > >> I would like to have a separate #qt-qml channel for the language > >> issues (which are more working on the language than working with > >> anyways), but that's not realistic because users can't always tell the > >> difference. So maybe once the new #qt-quick channel is fully > >> established and #qt-qml is empty, we can reclaim it. Or the > >> language/engine development channel can have a more technical name to > >> hide it from the average user. That second channel is less important, > >> so it can wait for a later discussion, and QML language development > >> chat can always go to #qt-labs until then. > > > > > > Yes, that is what I wanted to raise as well, #qt-labs is fine for now > IMHO, > > I agree. > > PS: Perhaps you meant reply-all? > Yes, I did. Apologies. I am still struggling with the new gmail interface at times. ;-) Cheers, Laszlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From fricker at froglogic.com Tue Jun 11 22:53:25 2013 From: fricker at froglogic.com (=?ISO-8859-1?Q?S=E9bastien_Fricker?=) Date: Tue, 11 Jun 2013 22:53:25 +0200 Subject: [Development] Code Coverage of QtBase - new report available online In-Reply-To: References: <97E0688B-DCFB-4A00-AB08-0F044F4FC330@froglogic.com> <2133692.ajsbMW4Q5K@tjmaciei-mobl2> <6CCAB061-2A32-4F9A-B40B-46A7D391A789@froglogic.com> <34867009.KSvgOZN1u7@tjmaciei-mobl2> Message-ID: <51B78E45.6030101@froglogic.com> Hi, The new qtbase code coverage report is now available at http://download.froglogic.com/public/qt5-squishcoco-report/ It is as usual computed on a daily base. Changes: 1. The difference is computed between the origin/dev and origin/stable branch of qtbase.git (before it was the the master branch of Qt5 and the version 5.0.0) 2. The report is now generated using Squish Coco v2.1.7. This version provides a better HTML report with CSS popups. Sébastien -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Wed Jun 12 00:33:38 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 11 Jun 2013 15:33:38 -0700 Subject: [Development] Code Coverage of QtBase - new report available online In-Reply-To: <51B78E45.6030101@froglogic.com> References: <97E0688B-DCFB-4A00-AB08-0F044F4FC330@froglogic.com> <51B78E45.6030101@froglogic.com> Message-ID: <3212215.Z0bgMuOHK1@tjmaciei-mobl2> On terça-feira, 11 de junho de 2013 22.53.25, Sébastien Fricker wrote: > Hi, > The new qtbase code coverage report is now available at > http://download.froglogic.com/public/qt5-squishcoco-report/ > > It is as usual computed on a daily base. > > Changes: > > 1. The difference is computed between the origin/dev and origin/stable > branch of qtbase.git (before it was the the master branch of Qt5 and > the version 5.0.0) > 2. The report is now generated using Squish Coco v2.1.7. This version > provides a better HTML report with CSS popups. Thanks, it looks great! I've just looked over the new QUrl code (qurl.cpp, qurlquery.cpp and qurlrecode.cpp) to see what it pointed out. It's suggesting a few new test cases for edge cases (such as UTF-8 decoding something starting with %F5). Some files with 0% coverage suggest that some tests were not run properly, but most of them are functionality hard to test (the OpenGL functions, the PDF writer). -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From rafael.roquetto at kdab.com Wed Jun 12 04:00:10 2013 From: rafael.roquetto at kdab.com (Rafael Roquetto) Date: Tue, 11 Jun 2013 23:00:10 -0300 Subject: [Development] QListView wrap and scrollbars Message-ID: <20130612020009.GA24825@polaris> Hello everyone, I am fixing tst_QListView for BlackBerry, and I have a question regarding tst_QListView::wordWrap(): In this test, the presence of the vertical and horizontal scrollbars is used to determine whether it should fail or not. In the success scenario, the vertical scrollbar should be visible, but not the horizontal one, since the list items are being wrapped. On BB10, I noticed that, despite the bigger items get wrapped as expected, very small items, such as "Short item 1" does not, causing a horizontal scrollbar to appear. Does this mean wrapping is broken on BB10, or is it still considered normal behavior, since bigger items wrap as expected? Any thoughts? Thanks, Rafael -- Rafael Roquetto | rafael.roquetto at kdab.com | Software Engineer Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions From Jani.Heikkinen at digia.com Wed Jun 12 06:41:11 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Wed, 12 Jun 2013 04:41:11 +0000 Subject: [Development] Qt 5.1 installers ready for testing Message-ID: Hi all, Finally there are new packages available for testing. As usual packages can be found from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/. We would appreciate if you could participate testing and give us feedback. You can use http://testresults.qt-project.org/forms/release-testing/ for reporting your test results or just reply your result to development at qt-project.org -mailing list. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From fricker at froglogic.com Wed Jun 12 07:25:51 2013 From: fricker at froglogic.com (=?ISO-8859-1?Q?S=E9bastien_Fricker?=) Date: Wed, 12 Jun 2013 07:25:51 +0200 Subject: [Development] Code Coverage of QtBase - new report available online In-Reply-To: <3212215.Z0bgMuOHK1@tjmaciei-mobl2> References: <97E0688B-DCFB-4A00-AB08-0F044F4FC330@froglogic.com> <51B78E45.6030101@froglogic.com> <3212215.Z0bgMuOHK1@tjmaciei-mobl2> Message-ID: <51B8065F.5@froglogic.com> On 12.06.13 00:33, Thiago Macieira wrote: > On terça-feira, 11 de junho de 2013 22.53.25, Sébastien Fricker wrote: > I've just looked over the new QUrl code (qurl.cpp, qurlquery.cpp and > qurlrecode.cpp) to see what it pointed out. It's suggesting a few new > test cases for edge cases (such as UTF-8 decoding something starting > with %F5). À propos QUrl: this reminds me that I should update the Qt test server.... > > Some files with 0% coverage suggest that some tests were not run properly, but > most of them are functionality hard to test (the OpenGL functions, the PDF > writer). > For OpenGL: may be the problem is related that we execute the suite in a VNC server session. As far as I know vncserver does not provide OpenGL API. Also we test on Debian 6, may be this is too old. So a solution would be to create a reference VM on which we execute the tests. I will ask Digia if they can give me more information about their test servers. Sébastien From loaden at gmail.com Wed Jun 12 07:50:15 2013 From: loaden at gmail.com (Yuchen Deng) Date: Wed, 12 Jun 2013 13:50:15 +0800 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: Message-ID: qt-windows-opensource-5.1.0-rc1-msvc2012_opengl-x86_64-offline-2013-06-12-53.exe 12-Jun-2013 07:06 *373M*Details ** qt-windows-opensource-5.1.0-rc1-msvc2012-x86_64-offline-2013-06-12-53.exe 12-Jun-2013 07:10 523M Details Seems something is wrong. are you sure it's only 373M ? 2013/6/12 Heikkinen Jani > Hi all,**** > > ** ** > > Finally there are new packages available for testing. As usual packages > can be found from > http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/. **** > > We would appreciate if you could participate testing and give us feedback. > You can use http://testresults.qt-project.org/forms/release-testing/ for > reporting your test results or just reply your result to > development at qt-project.org –mailing list.**** > > ** ** > > Br,**** > > Jani**** > > ** ** > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -- Best Regards Yuchen -------------- next part -------------- An HTML attachment was scrubbed... URL: From yves.bailly at sescoi.fr Wed Jun 12 08:38:43 2013 From: yves.bailly at sescoi.fr (Yves Bailly) Date: Wed, 12 Jun 2013 08:38:43 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: Message-ID: <51B81773.3080608@sescoi.fr> Le 12/06/2013 06:41, Heikkinen Jani a écrit : > Hi all, > > Finally there are new packages available for testing. As usual packages can be found from > http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/. > > We would appreciate if you could participate testing and give us feedback. You can use > http://testresults.qt-project.org/forms/release-testing/ for reporting your test results or just > reply your result to development at qt-project.org –mailing list. Sorry if this has already been asked and I couldn't find it, but is there any plan to provide 64bits binaries for MSVC 2010 and 32bits binaries for MSVC 2012? Thanks in advance. -- /- Yves Bailly - Software developer -\ \- Sescoi R&D - http://www.sescoi.fr -/ "The possible is done. The impossible is being done. For miracles, thanks to allow a little delay." From Jani.Heikkinen at digia.com Wed Jun 12 08:41:00 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Wed, 12 Jun 2013 06:41:00 +0000 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: Message-ID: Thanks for you information. There seems to be some problem in packaging. We will re-create this package soon... Br, Jani From: Yuchen Deng [mailto:loaden at gmail.com] Sent: 12. kesäkuuta 2013 8:50 To: Heikkinen Jani Cc: development at qt-project.org; releasing at qt-project.org Subject: Re: [Development] Qt 5.1 installers ready for testing qt-windows-opensource-5.1.0-rc1-msvc2012_opengl-x86_64-offline-2013-06-12-53.exe 12-Jun-2013 07:06 373M Details qt-windows-opensource-5.1.0-rc1-msvc2012-x86_64-offline-2013-06-12-53.exe 12-Jun-2013 07:10 523M Details Seems something is wrong. are you sure it's only 373M ? 2013/6/12 Heikkinen Jani > Hi all, Finally there are new packages available for testing. As usual packages can be found from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/. We would appreciate if you could participate testing and give us feedback. You can use http://testresults.qt-project.org/forms/release-testing/ for reporting your test results or just reply your result to development at qt-project.org -mailing list. Br, Jani _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -- Best Regards Yuchen -------------- next part -------------- An HTML attachment was scrubbed... URL: From Jani.Heikkinen at digia.com Wed Jun 12 08:50:58 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Wed, 12 Jun 2013 06:50:58 +0000 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <51B81773.3080608@sescoi.fr> References: <51B81773.3080608@sescoi.fr> Message-ID: 32bit binaries for MSVC2012 should be available soon. Packets are already done, copying ongoing. Unfortunately 64bit MSVC2010 binaries aren't planned to be delivered at the moment Br, Jani -----Original Message----- From: development-bounces+jani.heikkinen=digia.com at qt-project.org [mailto:development-bounces+jani.heikkinen=digia.com at qt-project.org] On Behalf Of Yves Bailly Sent: 12. kesäkuuta 2013 9:39 To: development at qt-project.org Subject: Re: [Development] Qt 5.1 installers ready for testing Le 12/06/2013 06:41, Heikkinen Jani a écrit : > Hi all, > > Finally there are new packages available for testing. As usual packages can be found from > http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/. > > We would appreciate if you could participate testing and give us feedback. You can use > http://testresults.qt-project.org/forms/release-testing/ for reporting your test results or just > reply your result to development at qt-project.org -mailing list. Sorry if this has already been asked and I couldn't find it, but is there any plan to provide 64bits binaries for MSVC 2010 and 32bits binaries for MSVC 2012? Thanks in advance. -- /- Yves Bailly - Software developer -\ \- Sescoi R&D - http://www.sescoi.fr -/ "The possible is done. The impossible is being done. For miracles, thanks to allow a little delay." _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From awagger at gmail.com Wed Jun 12 09:08:44 2013 From: awagger at gmail.com (Axel Waggershauser) Date: Wed, 12 Jun 2013 09:08:44 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> Message-ID: What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any plans regarding that? If there should be a perceived lack of interest: I am interested :). - Axel On Wed, Jun 12, 2013 at 8:50 AM, Heikkinen Jani wrote: > 32bit binaries for MSVC2012 should be available soon. Packets are already done, copying ongoing. > Unfortunately 64bit MSVC2010 binaries aren't planned to be delivered at the moment > > Br, > Jani > > -----Original Message----- > From: development-bounces+jani.heikkinen=digia.com at qt-project.org [mailto:development-bounces+jani.heikkinen=digia.com at qt-project.org] On Behalf Of Yves Bailly > Sent: 12. kesäkuuta 2013 9:39 > To: development at qt-project.org > Subject: Re: [Development] Qt 5.1 installers ready for testing > > Le 12/06/2013 06:41, Heikkinen Jani a écrit : >> Hi all, >> >> Finally there are new packages available for testing. As usual packages can be found from >> http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/. >> >> We would appreciate if you could participate testing and give us feedback. You can use >> http://testresults.qt-project.org/forms/release-testing/ for reporting your test results or just >> reply your result to development at qt-project.org -mailing list. > > Sorry if this has already been asked and I couldn't find it, but is there any plan to > provide 64bits binaries for MSVC 2010 and 32bits binaries for MSVC 2012? > > Thanks in advance. > > -- > /- Yves Bailly - Software developer -\ > \- Sescoi R&D - http://www.sescoi.fr -/ > "The possible is done. The impossible is being done. For miracles, > thanks to allow a little delay." > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From Kai.Koehne at digia.com Wed Jun 12 09:34:57 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Wed, 12 Jun 2013 07:34:57 +0000 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On > Behalf Of Axel Waggershauser > Sent: Wednesday, June 12, 2013 9:09 AM > To: Heikkinen Jani > Cc: development at qt-project.org > Subject: Re: [Development] Qt 5.1 installers ready for testing > > What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any plans > regarding that? If there should be a perceived lack of interest: > I am interested :). Just out of interest, why would you prefer ANGLE packages over OpenGL? (I personally would rather go for a 64 bit if we decide to do another MinGW package ...) Regards Kai From awagger at gmail.com Wed Jun 12 11:18:20 2013 From: awagger at gmail.com (Axel Waggershauser) Date: Wed, 12 Jun 2013 11:18:20 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai wrote: >> Subject: Re: [Development] Qt 5.1 installers ready for testing >> >> What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any plans >> regarding that? If there should be a perceived lack of interest: >> I am interested :). > > Just out of interest, why would you prefer ANGLE packages over OpenGL? To benefit from the advantages that ANGLE was introduced for in the first place: getting better overall stability/usability due to avoiding the myriad of buggy/outdated OpenGL drivers out there. Also, I started a recent project with the mingw ANGLE installer for 5.0.1 (the only mingw installer provided up until now) and although I am really happy to be able to play around with proper OpenGL now, I'd still very much welcome (rely on, actually) being able to ship this one project linked against ANGLE. Ideal of course, would be, if this would eventually be merged down to one package with a link-time switch, maybe even a runtime switch. - Axel From mingw.android at gmail.com Wed Jun 12 11:23:18 2013 From: mingw.android at gmail.com (Ray Donnelly) Date: Wed, 12 Jun 2013 10:23:18 +0100 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: I much prefer angleproject to 'native' OpenGL on Windows. Mainly because you can compile and then debug into the 'driver' should you need to. On Wed, Jun 12, 2013 at 10:18 AM, Axel Waggershauser wrote: > On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai wrote: > >> Subject: Re: [Development] Qt 5.1 installers ready for testing > >> > >> What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any > plans > >> regarding that? If there should be a perceived lack of interest: > >> I am interested :). > > > > Just out of interest, why would you prefer ANGLE packages over OpenGL? > > To benefit from the advantages that ANGLE was introduced for in the > first place: getting better overall stability/usability due to > avoiding the myriad of buggy/outdated OpenGL drivers out there. Also, > I started a recent project with the mingw ANGLE installer for 5.0.1 > (the only mingw installer provided up until now) and although I am > really happy to be able to play around with proper OpenGL now, I'd > still very much welcome (rely on, actually) being able to ship this > one project linked against ANGLE. > > Ideal of course, would be, if this would eventually be merged down to > one package with a link-time switch, maybe even a runtime switch. > > - Axel > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Kai.Koehne at digia.com Wed Jun 12 11:27:01 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Wed, 12 Jun 2013 09:27:01 +0000 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C0B7D@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: Ray Donnelly [mailto:mingw.android at gmail.com] > Sent: Wednesday, June 12, 2013 11:23 AM > To: Axel Waggershauser > Cc: Koehne Kai; Heikkinen Jani; development at qt-project.org > Subject: Re: [Development] Qt 5.1 installers ready for testing > > I much prefer angleproject to 'native' OpenGL on Windows. > > Mainly because you can compile and then debug into the 'driver' should you > need to. Fair enough. I'm asking because I'd like to come up with a comprehensive and concise guide for people out there to choose: http://qt-project.org/wiki/Qt-5-on-Windows-ANGLE-and-OpenGL (I also agree btw that this shouldn't really be a packaging decision ... let's hope we can do something about this in the future :) Regards Kai > > > On Wed, Jun 12, 2013 at 10:18 AM, Axel Waggershauser > wrote: > > > On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai > wrote: > >> Subject: Re: [Development] Qt 5.1 installers ready for testing > >> > >> What about a windows mingw "non-opengl" (a.k.a. ANGLE) > package? Any plans > >> regarding that? If there should be a perceived lack of interest: > >> I am interested :). > > > > Just out of interest, why would you prefer ANGLE packages over > OpenGL? > > > To benefit from the advantages that ANGLE was introduced for in the > first place: getting better overall stability/usability due to > avoiding the myriad of buggy/outdated OpenGL drivers out there. > Also, > I started a recent project with the mingw ANGLE installer for 5.0.1 > (the only mingw installer provided up until now) and although I am > really happy to be able to play around with proper OpenGL now, I'd > still very much welcome (rely on, actually) being able to ship this > one project linked against ANGLE. > > Ideal of course, would be, if this would eventually be merged down to > one package with a link-time switch, maybe even a runtime switch. > > - Axel > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > From markg85 at gmail.com Wed Jun 12 11:55:23 2013 From: markg85 at gmail.com (Mark) Date: Wed, 12 Jun 2013 11:55:23 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: I much prefer OpenGL. I've seen plenty of bugs caused by angle (like no multisampling which is still an open issue and reported) that made me switch to Qt 5.1 builds with OpenGL native. Also imho ANGLE is just a lame excuse to be able to use OpenGL "properly" because the native OpenGL is poorly supported by the driver vendors. The problem is them, the driver vendors, aka AMD, Nvidia en Intel with heavy emphasis on AMD. They (especially AMD) neglect to make decently working OpenGL drivers and they should be heavily pushed to fix their crap. ANGLE should not need to exist. I think Qt shouldn't provide an ANGLE build by default but have a runtime option to use it. Optional and not enabled by default. On Wed, Jun 12, 2013 at 11:23 AM, Ray Donnelly wrote: > I much prefer angleproject to 'native' OpenGL on Windows. > > Mainly because you can compile and then debug into the 'driver' should you > need to. > > > On Wed, Jun 12, 2013 at 10:18 AM, Axel Waggershauser > wrote: >> >> On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai wrote: >> >> Subject: Re: [Development] Qt 5.1 installers ready for testing >> >> >> >> What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any >> >> plans >> >> regarding that? If there should be a perceived lack of interest: >> >> I am interested :). >> > >> > Just out of interest, why would you prefer ANGLE packages over OpenGL? >> >> To benefit from the advantages that ANGLE was introduced for in the >> first place: getting better overall stability/usability due to >> avoiding the myriad of buggy/outdated OpenGL drivers out there. Also, >> I started a recent project with the mingw ANGLE installer for 5.0.1 >> (the only mingw installer provided up until now) and although I am >> really happy to be able to play around with proper OpenGL now, I'd >> still very much welcome (rely on, actually) being able to ship this >> one project linked against ANGLE. >> >> Ideal of course, would be, if this would eventually be merged down to >> one package with a link-time switch, maybe even a runtime switch. >> >> - Axel >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > From mingw.android at gmail.com Wed Jun 12 12:14:36 2013 From: mingw.android at gmail.com (Ray Donnelly) Date: Wed, 12 Jun 2013 11:14:36 +0100 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: In that case, good luck dealing with all those bug reports due to vendors not caring about OpenGL on random bits of hardware. I'd assume people shipping software would prefer less headaches. I've never tried to use multisampling but have found: http://www.khronos.org/registry/gles/extensions/ANGLE/ANGLE_framebuffer_multisample.txt Have you got any references to the multisampling bug? I've not found any so far and I'm sure it can't be hard to fix. The rate of changes to angleproject is fairly amazing, I wouldn't bet against it (both Chromium and Firefox use it for WebGL of course) https://code.google.com/p/angleproject/source/list I disagree strongly about not providing ANGLE builds by default, and would go the other way to spare developers' sanity. Hoping that vendors will fix their OpenGL drivers is IMHO tilting at windmills. On Wed, Jun 12, 2013 at 10:55 AM, Mark wrote: > I much prefer OpenGL. I've seen plenty of bugs caused by angle (like > no multisampling which is still an open issue and reported) that made > me switch to Qt 5.1 builds with OpenGL native. Also imho ANGLE is just > a lame excuse to be able to use OpenGL "properly" because the native > OpenGL is poorly supported by the driver vendors. > > The problem is them, the driver vendors, aka AMD, Nvidia en Intel with > heavy emphasis on AMD. They (especially AMD) neglect to make decently > working OpenGL drivers and they should be heavily pushed to fix their > crap. ANGLE should not need to exist. > > I think Qt shouldn't provide an ANGLE build by default but have a > runtime option to use it. Optional and not enabled by default. > > On Wed, Jun 12, 2013 at 11:23 AM, Ray Donnelly > wrote: > > I much prefer angleproject to 'native' OpenGL on Windows. > > > > Mainly because you can compile and then debug into the 'driver' should > you > > need to. > > > > > > On Wed, Jun 12, 2013 at 10:18 AM, Axel Waggershauser > > wrote: > >> > >> On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai > wrote: > >> >> Subject: Re: [Development] Qt 5.1 installers ready for testing > >> >> > >> >> What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any > >> >> plans > >> >> regarding that? If there should be a perceived lack of interest: > >> >> I am interested :). > >> > > >> > Just out of interest, why would you prefer ANGLE packages over OpenGL? > >> > >> To benefit from the advantages that ANGLE was introduced for in the > >> first place: getting better overall stability/usability due to > >> avoiding the myriad of buggy/outdated OpenGL drivers out there. Also, > >> I started a recent project with the mingw ANGLE installer for 5.0.1 > >> (the only mingw installer provided up until now) and although I am > >> really happy to be able to play around with proper OpenGL now, I'd > >> still very much welcome (rely on, actually) being able to ship this > >> one project linked against ANGLE. > >> > >> Ideal of course, would be, if this would eventually be merged down to > >> one package with a link-time switch, maybe even a runtime switch. > >> > >> - Axel > >> _______________________________________________ > >> Development mailing list > >> Development at qt-project.org > >> http://lists.qt-project.org/mailman/listinfo/development > > > > > > > > _______________________________________________ > > Development mailing list > > Development at qt-project.org > > http://lists.qt-project.org/mailman/listinfo/development > > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From awagger at gmail.com Wed Jun 12 12:30:09 2013 From: awagger at gmail.com (Axel Waggershauser) Date: Wed, 12 Jun 2013 12:30:09 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: On Wed, Jun 12, 2013 at 11:55 AM, Mark wrote: > I much prefer OpenGL. I've seen plenty of bugs caused by angle (like > no multisampling which is still an open issue and reported) that made > me switch to Qt 5.1 builds with OpenGL native. Also imho ANGLE is just > a lame excuse to be able to use OpenGL "properly" because the native > OpenGL is poorly supported by the driver vendors. I don't why this is a "lame excuse", it helps people, given the state of OpenGL on Windows. It solves a real problem. > The problem is them, the driver vendors, aka AMD, Nvidia en Intel with > heavy emphasis on AMD. They (especially AMD) neglect to make decently > working OpenGL drivers and they should be heavily pushed to fix their > crap. ANGLE should not need to exist. I wholeheartedly agree with you on this one (having been in direct contact with AMD folks a while ago to have them fix a bunch of bugs in their GLSL compiler, so I tried the pushing). But considering the origin of ANGLE (Google), I doubt the idea of "heavily pushing" AMD to fix stuff is not going to go anywhere, otherwise Google would probably have done it. Besides, even if the next driver is 100% compliant, this won't help 90% of their installed base over the next 1-3 years, because "your mom (TM)" will hardly every get around to upgrade her OpenGL driver. > I think Qt shouldn't provide an ANGLE build by default but have a > runtime option to use it. Optional and not enabled by default. Runtime option: +1, ANGLE based Qt build as long as this is not available: +1. Why "shouldn't" it be build by default? - Axel From sean.harmer at kdab.com Wed Jun 12 12:49:46 2013 From: sean.harmer at kdab.com (Sean Harmer) Date: Wed, 12 Jun 2013 11:49:46 +0100 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: Message-ID: <19589830.2PdbOromnE@titan> On Wednesday 12 June 2013 11:14:36 Ray Donnelly wrote: > In that case, good luck dealing with all those bug reports due to vendors > not caring about OpenGL on random bits of hardware. I'd assume people > shipping software would prefer less headaches. > > I've never tried to use multisampling but have found: > > http://www.khronos.org/registry/gles/extensions/ANGLE/ANGLE_framebuffer_mult > isample.txt > > Have you got any references to the multisampling bug? I've not found any so > far and I'm sure it can't be hard to fix. > > The rate of changes to angleproject is fairly amazing, I wouldn't bet > against it (both Chromium and Firefox use it for WebGL of course) > > https://code.google.com/p/angleproject/source/list > > I disagree strongly about not providing ANGLE builds by default, and would > go the other way to spare developers' sanity. Hoping that vendors will fix > their OpenGL drivers is IMHO tilting at windmills. IMHO both ANGLE and OpenGL builds are required at present. ANGLE is required by those with crappy OpenGL drivers. The situation still persists but is improving. OpenGL builds are required by those that wish to use OpenGL features not provided by OpenGL ES 2 - i.e. many "serious" desktop applications. At the end of the day, OpenGL and OpenGL ES 2 are similar but different APIs. Cheers, Sean -- Dr Sean Harmer | sean.harmer at kdab.com | Managing Director UK Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions From jpnurmi at digia.com Wed Jun 12 13:11:03 2013 From: jpnurmi at digia.com (Nurmi J-P) Date: Wed, 12 Jun 2013 11:11:03 +0000 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: Message-ID: On Jun 11, 2013, at 7:39 PM, Laszlo Papp wrote: > > > > On Tue, Jun 11, 2013 at 8:37 PM, Alan Alpert <416365416c at gmail.com> wrote: > On Tue, Jun 11, 2013 at 10:34 AM, Laszlo Papp wrote: > > On Tue, Jun 11, 2013 at 8:11 PM, Alan Alpert <416365416c at gmail.com> wrote: > >> > >> I like the idea. For the average user, I definitely think #qt-quick is > >> a better name. It has a much clearer association, due to users > >> importing QtQuick and QtQuick.Controls in every file. > > > > > > OK, so you want a QtQuick channel, not QML, so dealing with the C++ API as > > well, et cetera. I did not get that intention from the initial mail, but > > then it is fine. By the way, it is slower to type as it is a few characters > > more ... ;) :) > > The C++ API does (and has) come up occasionally, even in #qt-qml. But > realistically most people use the QML APIs (especially for > QtQuick.Controls ;) ). > > Size doesn't matter, as everyone should auto-join it :P . > > >> > >> And non-quick QML users won't get lost as badly (I once saw a Cascades > >> user in > >> #qt-qml, and no-one could help him :( . #qt-qnx is a better channel > >> for Cascades-QML > > > > > > Actually, I think #blackberrydev is even better as Cascades-QML is more > > Blackberry specific rather than upstream Qt. My practical experience shows > > that, too. > > Ah, I'm only on #qt-qnx. > > >> > >> I would like to have a separate #qt-qml channel for the language > >> issues (which are more working on the language than working with > >> anyways), but that's not realistic because users can't always tell the > >> difference. So maybe once the new #qt-quick channel is fully > >> established and #qt-qml is empty, we can reclaim it. Or the > >> language/engine development channel can have a more technical name to > >> hide it from the average user. That second channel is less important, > >> so it can wait for a later discussion, and QML language development > >> chat can always go to #qt-labs until then. > > > > > > Yes, that is what I wanted to raise as well, #qt-labs is fine for now IMHO, > > I agree. > > PS: Perhaps you meant reply-all? > > Yes, I did. Apologies. I am still struggling with the new gmail interface at times. ;-) > > Cheers, > Laszlo > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development Based on the feedback so far, I'd suggest we start with migrating #qt-components to #qt-quick. Jens, do you approve? -- J-P Nurmi From markg85 at gmail.com Wed Jun 12 13:30:09 2013 From: markg85 at gmail.com (Mark) Date: Wed, 12 Jun 2013 13:30:09 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: Yes, i have a bug report for you: https://bugreports.qt-project.org/browse/QTBUG-31010 Also, i'm not shipping any products. I'm just developing Qt for hobby purposes. I understand the existence of ANGLE, but having it in the first place is another reason for crappy driver vendors (looking at AMD again) to dedicate less resources at fixing it up. We have ANGLE after all. On Wed, Jun 12, 2013 at 12:14 PM, Ray Donnelly wrote: > In that case, good luck dealing with all those bug reports due to vendors > not caring about OpenGL on random bits of hardware. I'd assume people > shipping software would prefer less headaches. > > I've never tried to use multisampling but have found: > > http://www.khronos.org/registry/gles/extensions/ANGLE/ANGLE_framebuffer_multisample.txt > > Have you got any references to the multisampling bug? I've not found any so > far and I'm sure it can't be hard to fix. > > The rate of changes to angleproject is fairly amazing, I wouldn't bet > against it (both Chromium and Firefox use it for WebGL of course) > > https://code.google.com/p/angleproject/source/list > > I disagree strongly about not providing ANGLE builds by default, and would > go the other way to spare developers' sanity. Hoping that vendors will fix > their OpenGL drivers is IMHO tilting at windmills. > > > > On Wed, Jun 12, 2013 at 10:55 AM, Mark wrote: >> >> I much prefer OpenGL. I've seen plenty of bugs caused by angle (like >> no multisampling which is still an open issue and reported) that made >> me switch to Qt 5.1 builds with OpenGL native. Also imho ANGLE is just >> a lame excuse to be able to use OpenGL "properly" because the native >> OpenGL is poorly supported by the driver vendors. >> >> The problem is them, the driver vendors, aka AMD, Nvidia en Intel with >> heavy emphasis on AMD. They (especially AMD) neglect to make decently >> working OpenGL drivers and they should be heavily pushed to fix their >> crap. ANGLE should not need to exist. >> >> I think Qt shouldn't provide an ANGLE build by default but have a >> runtime option to use it. Optional and not enabled by default. >> >> On Wed, Jun 12, 2013 at 11:23 AM, Ray Donnelly >> wrote: >> > I much prefer angleproject to 'native' OpenGL on Windows. >> > >> > Mainly because you can compile and then debug into the 'driver' should >> > you >> > need to. >> > >> > >> > On Wed, Jun 12, 2013 at 10:18 AM, Axel Waggershauser >> > wrote: >> >> >> >> On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai >> >> wrote: >> >> >> Subject: Re: [Development] Qt 5.1 installers ready for testing >> >> >> >> >> >> What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any >> >> >> plans >> >> >> regarding that? If there should be a perceived lack of interest: >> >> >> I am interested :). >> >> > >> >> > Just out of interest, why would you prefer ANGLE packages over >> >> > OpenGL? >> >> >> >> To benefit from the advantages that ANGLE was introduced for in the >> >> first place: getting better overall stability/usability due to >> >> avoiding the myriad of buggy/outdated OpenGL drivers out there. Also, >> >> I started a recent project with the mingw ANGLE installer for 5.0.1 >> >> (the only mingw installer provided up until now) and although I am >> >> really happy to be able to play around with proper OpenGL now, I'd >> >> still very much welcome (rely on, actually) being able to ship this >> >> one project linked against ANGLE. >> >> >> >> Ideal of course, would be, if this would eventually be merged down to >> >> one package with a link-time switch, maybe even a runtime switch. >> >> >> >> - Axel >> >> _______________________________________________ >> >> Development mailing list >> >> Development at qt-project.org >> >> http://lists.qt-project.org/mailman/listinfo/development >> > >> > >> > >> > _______________________________________________ >> > Development mailing list >> > Development at qt-project.org >> > http://lists.qt-project.org/mailman/listinfo/development >> > > > From markg85 at gmail.com Wed Jun 12 13:35:37 2013 From: markg85 at gmail.com (Mark) Date: Wed, 12 Jun 2013 13:35:37 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: On Wed, Jun 12, 2013 at 12:30 PM, Axel Waggershauser wrote: > On Wed, Jun 12, 2013 at 11:55 AM, Mark wrote: >> I much prefer OpenGL. I've seen plenty of bugs caused by angle (like >> no multisampling which is still an open issue and reported) that made >> me switch to Qt 5.1 builds with OpenGL native. Also imho ANGLE is just >> a lame excuse to be able to use OpenGL "properly" because the native >> OpenGL is poorly supported by the driver vendors. > > I don't why this is a "lame excuse", it helps people, given the state > of OpenGL on Windows. It solves a real problem. > You're right. It solves a problem. So in that case it is an absolute need to have for end users. However, ANGLE itself should not have a reason to exist if the drivers where working like they should. > >> The problem is them, the driver vendors, aka AMD, Nvidia en Intel with >> heavy emphasis on AMD. They (especially AMD) neglect to make decently >> working OpenGL drivers and they should be heavily pushed to fix their >> crap. ANGLE should not need to exist. > > I wholeheartedly agree with you on this one (having been in direct > contact with AMD folks a while ago to have them fix a bunch of bugs in > their GLSL compiler, so I tried the pushing). But considering the > origin of ANGLE (Google), I doubt the idea of "heavily pushing" AMD to > fix stuff is not going to go anywhere, otherwise Google would probably > have done it. Besides, even if the next driver is 100% compliant, this > won't help 90% of their installed base over the next 1-3 years, > because "your mom (TM)" will hardly every get around to upgrade her > OpenGL driver. > > >> I think Qt shouldn't provide an ANGLE build by default but have a >> runtime option to use it. Optional and not enabled by default. > > Runtime option: +1, ANGLE based Qt build as long as this is not > available: +1. Why "shouldn't" it be build by default? As said before. Vendors should be motivated to fix bugs. Having ANGLE in place makes fixing bugs a less important priority. You could even continue this reasoning and say (as a driver vendor): "Kill OpenGL out of our driver and install ANGLE by default"... > > - Axel From raul at innovaatik.ee Wed Jun 12 13:38:00 2013 From: raul at innovaatik.ee (Raul Metsma) Date: Wed, 12 Jun 2013 14:38:00 +0300 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> <5B2736A3C8B75B4BB66BC58DC5E889B08C0AA7@IT-EXMB01-HKI.it.local> Message-ID: <8DC538DE-4DFC-4D03-8167-3FC461EA7BEB@innovaatik.ee> Why do have vendors provide OpenGL at windows at all, DirectX is main goal. For them OpenGL is optional choice. Raul Metsma On Jun 12, 2013, at 2:30 PM, Mark wrote: > Yes, i have a bug report for you: > https://bugreports.qt-project.org/browse/QTBUG-31010 > > Also, i'm not shipping any products. I'm just developing Qt for hobby purposes. > I understand the existence of ANGLE, but having it in the first place > is another reason for crappy driver vendors (looking at AMD again) to > dedicate less resources at fixing it up. We have ANGLE after all. > > On Wed, Jun 12, 2013 at 12:14 PM, Ray Donnelly wrote: >> In that case, good luck dealing with all those bug reports due to vendors >> not caring about OpenGL on random bits of hardware. I'd assume people >> shipping software would prefer less headaches. >> >> I've never tried to use multisampling but have found: >> >> http://www.khronos.org/registry/gles/extensions/ANGLE/ANGLE_framebuffer_multisample.txt >> >> Have you got any references to the multisampling bug? I've not found any so >> far and I'm sure it can't be hard to fix. >> >> The rate of changes to angleproject is fairly amazing, I wouldn't bet >> against it (both Chromium and Firefox use it for WebGL of course) >> >> https://code.google.com/p/angleproject/source/list >> >> I disagree strongly about not providing ANGLE builds by default, and would >> go the other way to spare developers' sanity. Hoping that vendors will fix >> their OpenGL drivers is IMHO tilting at windmills. >> >> >> >> On Wed, Jun 12, 2013 at 10:55 AM, Mark wrote: >>> >>> I much prefer OpenGL. I've seen plenty of bugs caused by angle (like >>> no multisampling which is still an open issue and reported) that made >>> me switch to Qt 5.1 builds with OpenGL native. Also imho ANGLE is just >>> a lame excuse to be able to use OpenGL "properly" because the native >>> OpenGL is poorly supported by the driver vendors. >>> >>> The problem is them, the driver vendors, aka AMD, Nvidia en Intel with >>> heavy emphasis on AMD. They (especially AMD) neglect to make decently >>> working OpenGL drivers and they should be heavily pushed to fix their >>> crap. ANGLE should not need to exist. >>> >>> I think Qt shouldn't provide an ANGLE build by default but have a >>> runtime option to use it. Optional and not enabled by default. >>> >>> On Wed, Jun 12, 2013 at 11:23 AM, Ray Donnelly >>> wrote: >>>> I much prefer angleproject to 'native' OpenGL on Windows. >>>> >>>> Mainly because you can compile and then debug into the 'driver' should >>>> you >>>> need to. >>>> >>>> >>>> On Wed, Jun 12, 2013 at 10:18 AM, Axel Waggershauser >>>> wrote: >>>>> >>>>> On Wed, Jun 12, 2013 at 9:34 AM, Koehne Kai >>>>> wrote: >>>>>>> Subject: Re: [Development] Qt 5.1 installers ready for testing >>>>>>> >>>>>>> What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any >>>>>>> plans >>>>>>> regarding that? If there should be a perceived lack of interest: >>>>>>> I am interested :). >>>>>> >>>>>> Just out of interest, why would you prefer ANGLE packages over >>>>>> OpenGL? >>>>> >>>>> To benefit from the advantages that ANGLE was introduced for in the >>>>> first place: getting better overall stability/usability due to >>>>> avoiding the myriad of buggy/outdated OpenGL drivers out there. Also, >>>>> I started a recent project with the mingw ANGLE installer for 5.0.1 >>>>> (the only mingw installer provided up until now) and although I am >>>>> really happy to be able to play around with proper OpenGL now, I'd >>>>> still very much welcome (rely on, actually) being able to ship this >>>>> one project linked against ANGLE. >>>>> >>>>> Ideal of course, would be, if this would eventually be merged down to >>>>> one package with a link-time switch, maybe even a runtime switch. >>>>> >>>>> - Axel >>>>> _______________________________________________ >>>>> Development mailing list >>>>> Development at qt-project.org >>>>> http://lists.qt-project.org/mailman/listinfo/development >>>> >>>> >>>> >>>> _______________________________________________ >>>> Development mailing list >>>> Development at qt-project.org >>>> http://lists.qt-project.org/mailman/listinfo/development >>>> >> >> > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From yves.bailly at sescoi.fr Wed Jun 12 13:38:55 2013 From: yves.bailly at sescoi.fr (Yves Bailly) Date: Wed, 12 Jun 2013 13:38:55 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <51B81773.3080608@sescoi.fr> Message-ID: <51B85DCF.7040000@sescoi.fr> Le 12/06/2013 08:50, Heikkinen Jani a écrit : > 32bit binaries for MSVC2012 should be available soon. Packets are already done, copying ongoing. > Unfortunately 64bit MSVC2010 binaries aren't planned to be delivered at the moment OK, will 64bits MSVC2010 binaries be available when the final Qt 5.1 is out? -- /- Yves Bailly - Software developer -\ \- Sescoi R&D - http://www.sescoi.fr -/ "The possible is done. The impossible is being done. For miracles, thanks to allow a little delay." From markg85 at gmail.com Wed Jun 12 13:39:52 2013 From: markg85 at gmail.com (Mark) Date: Wed, 12 Jun 2013 13:39:52 +0200 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: Message-ID: So then we have #qt-qml and #qt-quick? That's not very ideal i think. Would it be possible to have #qt-qml somehow "redirect" the user to #qt-quick? That would probably be best and have all QML stuff organized in one channel. Also, it makes searching for the right IRC channel easier since i would also search for *qml* and not *quick*.. Just my 5 cents :) On Wed, Jun 12, 2013 at 1:11 PM, Nurmi J-P wrote: > On Jun 11, 2013, at 7:39 PM, Laszlo Papp wrote: > >> >> >> >> On Tue, Jun 11, 2013 at 8:37 PM, Alan Alpert <416365416c at gmail.com> wrote: >> On Tue, Jun 11, 2013 at 10:34 AM, Laszlo Papp wrote: >> > On Tue, Jun 11, 2013 at 8:11 PM, Alan Alpert <416365416c at gmail.com> wrote: >> >> >> >> I like the idea. For the average user, I definitely think #qt-quick is >> >> a better name. It has a much clearer association, due to users >> >> importing QtQuick and QtQuick.Controls in every file. >> > >> > >> > OK, so you want a QtQuick channel, not QML, so dealing with the C++ API as >> > well, et cetera. I did not get that intention from the initial mail, but >> > then it is fine. By the way, it is slower to type as it is a few characters >> > more ... ;) :) >> >> The C++ API does (and has) come up occasionally, even in #qt-qml. But >> realistically most people use the QML APIs (especially for >> QtQuick.Controls ;) ). >> >> Size doesn't matter, as everyone should auto-join it :P . >> >> >> >> >> And non-quick QML users won't get lost as badly (I once saw a Cascades >> >> user in >> >> #qt-qml, and no-one could help him :( . #qt-qnx is a better channel >> >> for Cascades-QML >> > >> > >> > Actually, I think #blackberrydev is even better as Cascades-QML is more >> > Blackberry specific rather than upstream Qt. My practical experience shows >> > that, too. >> >> Ah, I'm only on #qt-qnx. >> >> >> >> >> I would like to have a separate #qt-qml channel for the language >> >> issues (which are more working on the language than working with >> >> anyways), but that's not realistic because users can't always tell the >> >> difference. So maybe once the new #qt-quick channel is fully >> >> established and #qt-qml is empty, we can reclaim it. Or the >> >> language/engine development channel can have a more technical name to >> >> hide it from the average user. That second channel is less important, >> >> so it can wait for a later discussion, and QML language development >> >> chat can always go to #qt-labs until then. >> > >> > >> > Yes, that is what I wanted to raise as well, #qt-labs is fine for now IMHO, >> > I agree. >> >> PS: Perhaps you meant reply-all? >> >> Yes, I did. Apologies. I am still struggling with the new gmail interface at times. ;-) >> >> Cheers, >> Laszlo >> >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > > Based on the feedback so far, I'd suggest we start with migrating #qt-components to #qt-quick. Jens, do you approve? > > -- > J-P Nurmi > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From dangelog at gmail.com Wed Jun 12 13:47:18 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Wed, 12 Jun 2013 13:47:18 +0200 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: Message-ID: On 12 June 2013 13:39, Mark wrote: > Would it be possible to have #qt-qml somehow "redirect" the user to > #qt-quick? Yes, via a +f flag, see http://freenode.net/using_the_network.shtml -- Giuseppe D'Angelo From Jani.Heikkinen at digia.com Wed Jun 12 14:04:06 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Wed, 12 Jun 2013 12:04:06 +0000 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <51B85DCF.7040000@sescoi.fr> References: <51B81773.3080608@sescoi.fr> <51B85DCF.7040000@sescoi.fr> Message-ID: Hi! Those aren't available when final Qt 5.1 is out. We don't have plans to deliver MSVC2010 64bit binaries Br, Jani -----Original Message----- From: development-bounces+jani.heikkinen=digia.com at qt-project.org [mailto:development-bounces+jani.heikkinen=digia.com at qt-project.org] On Behalf Of Yves Bailly Sent: 12. kesäkuuta 2013 14:39 Cc: development at qt-project.org Subject: Re: [Development] Qt 5.1 installers ready for testing Le 12/06/2013 08:50, Heikkinen Jani a écrit : > 32bit binaries for MSVC2012 should be available soon. Packets are already done, copying ongoing. > Unfortunately 64bit MSVC2010 binaries aren't planned to be delivered at the moment OK, will 64bits MSVC2010 binaries be available when the final Qt 5.1 is out? -- /- Yves Bailly - Software developer -\ \- Sescoi R&D - http://www.sescoi.fr -/ "The possible is done. The impossible is being done. For miracles, thanks to allow a little delay." _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From markg85 at gmail.com Wed Jun 12 14:08:54 2013 From: markg85 at gmail.com (Mark) Date: Wed, 12 Jun 2013 14:08:54 +0200 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: Message-ID: It's not for me to know, but for the people managing those channels to set that flag :) On Wed, Jun 12, 2013 at 1:47 PM, Giuseppe D'Angelo wrote: > On 12 June 2013 13:39, Mark wrote: >> Would it be possible to have #qt-qml somehow "redirect" the user to >> #qt-quick? > > Yes, via a +f flag, see http://freenode.net/using_the_network.shtml > > -- > Giuseppe D'Angelo From sean.harmer at kdab.com Wed Jun 12 14:18:14 2013 From: sean.harmer at kdab.com (Sean Harmer) Date: Wed, 12 Jun 2013 13:18:14 +0100 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <8DC538DE-4DFC-4D03-8167-3FC461EA7BEB@innovaatik.ee> References: <8DC538DE-4DFC-4D03-8167-3FC461EA7BEB@innovaatik.ee> Message-ID: <2040833.AWhxjJTgdf@titan> On Wednesday 12 June 2013 14:38:00 Raul Metsma wrote: > Why do have vendors provide OpenGL at windows at all, DirectX is main goal. > For them OpenGL is optional choice. Erm no. Many desktop applications target OpenGL specifically. Then there's all those other operating systems... Sean -- Dr Sean Harmer | sean.harmer at kdab.com | Managing Director UK Klarälvdalens Datakonsult AB, a KDAB Group company Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) KDAB - Qt Experts - Platform-independent software solutions From Jens.Bache-Wiig at digia.com Wed Jun 12 14:34:33 2013 From: Jens.Bache-Wiig at digia.com (Bache-Wiig Jens) Date: Wed, 12 Jun 2013 12:34:33 +0000 Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: References: Message-ID: <25BA90A0-2E55-4F7D-831A-4BAD7CC3D2E8@digia.com> On Jun 12, 2013, at 1:11 PM, Nurmi J-P wrote: > On Jun 11, 2013, at 7:39 PM, Laszlo Papp wrote: > >> >> >> >> On Tue, Jun 11, 2013 at 8:37 PM, Alan Alpert <416365416c at gmail.com> wrote: >> On Tue, Jun 11, 2013 at 10:34 AM, Laszlo Papp wrote: >>> On Tue, Jun 11, 2013 at 8:11 PM, Alan Alpert <416365416c at gmail.com> wrote: >>>> >>>> I like the idea. For the average user, I definitely think #qt-quick is >>>> a better name. It has a much clearer association, due to users >>>> importing QtQuick and QtQuick.Controls in every file. >>> >>> >>> OK, so you want a QtQuick channel, not QML, so dealing with the C++ API as >>> well, et cetera. I did not get that intention from the initial mail, but >>> then it is fine. By the way, it is slower to type as it is a few characters >>> more ... ;) :) >> >> The C++ API does (and has) come up occasionally, even in #qt-qml. But >> realistically most people use the QML APIs (especially for >> QtQuick.Controls ;) ). >> >> Size doesn't matter, as everyone should auto-join it :P . >> >>>> >>>> And non-quick QML users won't get lost as badly (I once saw a Cascades >>>> user in >>>> #qt-qml, and no-one could help him :( . #qt-qnx is a better channel >>>> for Cascades-QML >>> >>> >>> Actually, I think #blackberrydev is even better as Cascades-QML is more >>> Blackberry specific rather than upstream Qt. My practical experience shows >>> that, too. >> >> Ah, I'm only on #qt-qnx. >> >>>> >>>> I would like to have a separate #qt-qml channel for the language >>>> issues (which are more working on the language than working with >>>> anyways), but that's not realistic because users can't always tell the >>>> difference. So maybe once the new #qt-quick channel is fully >>>> established and #qt-qml is empty, we can reclaim it. Or the >>>> language/engine development channel can have a more technical name to >>>> hide it from the average user. That second channel is less important, >>>> so it can wait for a later discussion, and QML language development >>>> chat can always go to #qt-labs until then. >>> >>> >>> Yes, that is what I wanted to raise as well, #qt-labs is fine for now IMHO, >>> I agree. >> >> PS: Perhaps you meant reply-all? >> >> Yes, I did. Apologies. I am still struggling with the new gmail interface at times. ;-) >> >> Cheers, >> Laszlo >> >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > > Based on the feedback so far, I'd suggest we start with migrating #qt-components to #qt-quick. Jens, do you approve? > > -- > J-P Nurmi > I most certainly do. jens From raul at innovaatik.ee Wed Jun 12 14:48:13 2013 From: raul at innovaatik.ee (Raul Metsma) Date: Wed, 12 Jun 2013 15:48:13 +0300 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <2040833.AWhxjJTgdf@titan> References: <8DC538DE-4DFC-4D03-8167-3FC461EA7BEB@innovaatik.ee> <2040833.AWhxjJTgdf@titan> Message-ID: Hmm, If i do quick google check, then I see that major driving force on windows is focused on direct x, games, cad-s, photo/video editing Raul Metsma On Jun 12, 2013, at 3:18 PM, Sean Harmer wrote: > On Wednesday 12 June 2013 14:38:00 Raul Metsma wrote: >> Why do have vendors provide OpenGL at windows at all, DirectX is main goal. >> For them OpenGL is optional choice. > > Erm no. Many desktop applications target OpenGL specifically. Then there's all > those other operating systems... > > Sean > -- > Dr Sean Harmer | sean.harmer at kdab.com | Managing Director UK > Klarälvdalens Datakonsult AB, a KDAB Group company > Tel. Sweden (HQ) +46-563-540090, USA +1-866-777-KDAB(5322) > KDAB - Qt Experts - Platform-independent software solutions > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From jgastal at profusion.mobi Wed Jun 12 15:14:45 2013 From: jgastal at profusion.mobi (Jonas Gastal) Date: Wed, 12 Jun 2013 10:14:45 -0300 Subject: [Development] Search engine indexing of qt-project.org In-Reply-To: References: Message-ID: On Tue, Jun 11, 2013 at 1:30 PM, Jonas Gastal wrote: > Interestingly, doing wget I get the same as Giuseppe, using the > browser(chromium) I get the same as Robin. > > On further analysis the reason I was getting the disallow everything robots.txt in chromium was because of https everywhere. I don't see much of a reason to block https crawling, on the other hand I doubt that's what's causing bad results for google searches. -------------- next part -------------- An HTML attachment was scrubbed... URL: From Michael.Bruning at digia.com Wed Jun 12 15:38:19 2013 From: Michael.Bruning at digia.com (Bruning Michael) Date: Wed, 12 Jun 2013 13:38:19 +0000 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <2126990.jhZPss7GgU@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <3393088.prRq4eQrUf@gargamel> , <2126990.jhZPss7GgU@tjmaciei-mobl2> Message-ID: <5B20C9B9EF03214DB310015C8339E46F15811943@IT-EXMB01-HKI.it.local> Hi all, On Tuesday, 11th June 2013 at 17:04, Thiago Macieira wrote: > On terça-feira, 11 de junho de 2013 09.26.23, Ziller Eike wrote: >> When I build Qt 5.1 in the current standard configuration (e.g. with c++11 >> and therefore with libc++) I still get QtScript and QtWebKit built against >> libstdc++ and with deployment target 10.6, even though the rest of Qt is >> built against libc++ and with deployment target 10.7. Because they do >> CONFIG -= c++11 . This will also happen for any other project / library etc >> that explicitly doesn't want c++11. > > That's not a problem for API and ABI, since the Qt API and ABI do not expose > any of the Standard Library. Therefore, no matter which one is used behind the > scenes for Qt, the user application may still choose. > > Deployment, however... > >> The deployment target thing is probably >> a lesser annoyance though it still is ugly, especially for QtWebKit and >> QtScript which are *part* of Qt and should therefore build with the same >> configuration. But does anyone know about the consequences of mixing libc++ >> and libstdc++ ? > > See above. > > My question is deployment: is there a libc++ on 10.6 for the Qt libraries to > run against? As far as I can see, libc++ was never officially supported by Apple on 10.6 and to get it built and running from sources, there's some handwork required and things might and probably will break without prior notice. So I would assume it safe to say that there is no libc++ for 10.6. > > If not, we need to turn it off. > You mean, disable C++11 support on Mac entirely? Cheers, Michael -- Michael Brüning, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From thiago.macieira at intel.com Wed Jun 12 17:05:54 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 12 Jun 2013 08:05:54 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <5B20C9B9EF03214DB310015C8339E46F15811943@IT-EXMB01-HKI.it.local> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <2126990.jhZPss7GgU@tjmaciei-mobl2> <5B20C9B9EF03214DB310015C8339E46F15811943@IT-EXMB01-HKI.it.local> Message-ID: <1400496.ojsQE8puZy@tjmaciei-mobl2> On quarta-feira, 12 de junho de 2013 13.38.19, Bruning Michael wrote: > As far as I can see, libc++ was never officially supported by Apple on 10.6 > and to get it built and running from sources, there's some handwork > required and things might and probably will break without prior notice. So > I would assume it safe to say that there is no libc++ for 10.6. > > > > > > If not, we need to turn it off. > > > > > > You mean, disable C++11 support on Mac entirely? No. Just when we build our official binary packages. The build rule should add -no-c++11 to the command-line. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From joaodeusmorgado at yahoo.com Wed Jun 12 17:06:43 2013 From: joaodeusmorgado at yahoo.com (joao morgado) Date: Wed, 12 Jun 2013 08:06:43 -0700 (PDT) Subject: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick In-Reply-To: <25BA90A0-2E55-4F7D-831A-4BAD7CC3D2E8@digia.com> References: <25BA90A0-2E55-4F7D-831A-4BAD7CC3D2E8@digia.com> Message-ID: <1371049603.2710.YahooMailNeo@web165003.mail.bf1.yahoo.com> What about #qt-quick and #qt-quick-development ? That way I think is clear to the developer the diference between the 2. João de Deus ________________________________ De: Bache-Wiig Jens Para: Nurmi J-P Cc: "development at qt-project.org" Enviadas: Quarta-feira, 12 de Junho de 2013 13:34 Assunto: Re: [Development] PROPOSAL: merge #qt-qml and #qt-components to #qt-quick On Jun 12, 2013, at 1:11 PM, Nurmi J-P wrote: > On Jun 11, 2013, at 7:39 PM, Laszlo Papp wrote: > >> >> >> >> On Tue, Jun 11, 2013 at 8:37 PM, Alan Alpert <416365416c at gmail.com> wrote: >> On Tue, Jun 11, 2013 at 10:34 AM, Laszlo Papp wrote: >>> On Tue, Jun 11, 2013 at 8:11 PM, Alan Alpert <416365416c at gmail.com> wrote: >>>> >>>> I like the idea. For the average user, I definitely think #qt-quick is >>>> a better name. It has a much clearer association, due to users >>>> importing QtQuick and QtQuick.Controls in every file. >>> >>> >>> OK, so you want a QtQuick channel, not QML, so dealing with the C++ API as >>> well, et cetera. I did not get that intention from the initial mail, but >>> then it is fine. By the way, it is slower to type as it is a few characters >>> more ... ;) :) >> >> The C++ API does (and has) come up occasionally, even in #qt-qml. But >> realistically most people use the QML APIs (especially for >> QtQuick.Controls ;) ). >> >> Size doesn't matter, as everyone should auto-join it :P . >> >>>> >>>> And non-quick QML users won't get lost as badly (I once saw a Cascades >>>> user in >>>> #qt-qml, and no-one could help him :( . #qt-qnx is a better channel >>>> for Cascades-QML >>> >>> >>> Actually, I think #blackberrydev is even better as Cascades-QML is more >>> Blackberry specific rather than upstream Qt. My practical experience shows >>> that, too. >> >> Ah, I'm only on #qt-qnx. >> >>>> >>>> I would like to have a separate #qt-qml channel for the language >>>> issues (which are more working on the language than working with >>>> anyways), but that's not realistic because users can't always tell the >>>> difference. So maybe once the new #qt-quick channel is fully >>>> established and #qt-qml is empty, we can reclaim it. Or the >>>> language/engine development channel can have a more technical name to >>>> hide it from the average user. That second channel is less important, >>>> so it can wait for a later discussion, and QML language development >>>> chat can always go to #qt-labs until then. >>> >>> >>> Yes, that is what I wanted to raise as well, #qt-labs is fine for now IMHO, >>> I agree. >> >> PS: Perhaps you meant reply-all? >> >> Yes, I did. Apologies. I am still struggling with the new gmail interface at times. ;-) >> >> Cheers, >> Laszlo >> >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > > Based on the feedback so far, I'd suggest we start with migrating #qt-components to #qt-quick. Jens, do you approve? > > -- > J-P Nurmi > I most certainly do. jens _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Wed Jun 12 17:10:18 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 12 Jun 2013 08:10:18 -0700 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <2040833.AWhxjJTgdf@titan> Message-ID: <2663698.W6o0QhPuDu@tjmaciei-mobl2> On quarta-feira, 12 de junho de 2013 15.48.13, Raul Metsma wrote: > Hmm, If i do quick google check, then I see that major driving force on > windows is focused on direct x, games, cad-s, photo/video editing That's exactly the problem. Several driver vendors provide good DirectX support, but bad OpenGL support. In Qt, we use OpenGL because that's the cross-platform API. And we added a translation layer so OpenGL code can run on DirectX: that's ANGLE. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From jake.petroules at petroules.com Wed Jun 12 17:31:33 2013 From: jake.petroules at petroules.com (Jake Thomas Petroules) Date: Wed, 12 Jun 2013 11:31:33 -0400 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: <1400496.ojsQE8puZy@tjmaciei-mobl2> References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <2126990.jhZPss7GgU@tjmaciei-mobl2> <5B20C9B9EF03214DB310015C8339E46F15811943@IT-EXMB01-HKI.it.local> <1400496.ojsQE8puZy@tjmaciei-mobl2> Message-ID: According to Xcode the default is libstdc++ anyways. -- Jake Petroules Chief Technology Officer Petroules Corporation · www.petroules.com Email: jake.petroules at petroules.com On Jun 12, 2013, at 11:05 AM, Thiago Macieira wrote: > On quarta-feira, 12 de junho de 2013 13.38.19, Bruning Michael wrote: >> As far as I can see, libc++ was never officially supported by Apple on 10.6 >> and to get it built and running from sources, there's some handwork >> required and things might and probably will break without prior notice. So >> I would assume it safe to say that there is no libc++ for 10.6. >>> >>> >>> If not, we need to turn it off. >>> >>> >> >> You mean, disable C++11 support on Mac entirely? > > No. Just when we build our official binary packages. > > The build rule should add -no-c++11 to the command-line. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From lists at milliams.com Wed Jun 12 18:04:01 2013 From: lists at milliams.com (Matt Williams) Date: Wed, 12 Jun 2013 17:04:01 +0100 Subject: [Development] Introducing QtMetrics In-Reply-To: References: Message-ID: On 4 June 2013 11:13, Sarajärvi Tony wrote: > Hi > > We are ready to launch our QtMetrics page for the public now. > > Description from its wiki page: > > Purpose of the Qt Metrics web portal is to visualize and communicate the > progress of Qt quality, focusing first to Continuous Integration (CI) but to > cover e.g. code coverage, autotest, release test automation and manual test > metrics and reports later on. Goal is to automate laborious manual work that > is required e.g. in the CI release cycle to report the key information, as > well as providing real time data with good performance. Target audience is > Qt integration teams (in Digia) and the global Qt developer community. > > The main page can be found here: > > http://testresults.qt-project.org/qtmetrics/index.php The page fails to load when using HTTPS Everywhere [1] in Firefox. It seems it comes with a rule to forward all *.qt-project.org pages to HTTPS but it fails for this subdomain. I guess the best solution here is to either add an exception to the rule file or enable HTTPS for this site. Cheers, Matt [1] https://www.eff.org/https-everywhere From thiago.macieira at intel.com Wed Jun 12 19:28:26 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 12 Jun 2013 10:28:26 -0700 Subject: [Development] Introducing QtMetrics In-Reply-To: References: Message-ID: <1869392.yC8DOeXAeH@tjmaciei-mobl2> On quarta-feira, 12 de junho de 2013 17.04.01, Matt Williams wrote: > The page fails to load when using HTTPS Everywhere [1] in Firefox. It > seems it comes with a rule to forward all *.qt-project.org pages to > HTTPS but it fails for this subdomain. Where does that rule come from? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 12 19:29:21 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 12 Jun 2013 10:29:21 -0700 Subject: [Development] Clarification on Mac 10.6 support for Qt 5.2 In-Reply-To: References: <1712636.K8dc6PyfMS@tjmaciei-mobl2> <1400496.ojsQE8puZy@tjmaciei-mobl2> Message-ID: <2353195.axiIsoDKi8@tjmaciei-mobl2> On quarta-feira, 12 de junho de 2013 11.31.33, Jake Thomas Petroules wrote: > According to Xcode the default is libstdc++ anyways. Not to us. The default is libc++ because C++11 is enabled by default if supported, because clang is the default and clang does support C++11. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From szehowe.koh at gmail.com Wed Jun 12 19:45:11 2013 From: szehowe.koh at gmail.com (Sze Howe Koh) Date: Thu, 13 Jun 2013 01:45:11 +0800 Subject: [Development] Introducing QtMetrics In-Reply-To: <1869392.yC8DOeXAeH@tjmaciei-mobl2> References: <1869392.yC8DOeXAeH@tjmaciei-mobl2> Message-ID: On 13 June 2013 01:28, Thiago Macieira wrote: > > On quarta-feira, 12 de junho de 2013 17.04.01, Matt Williams wrote: > > The page fails to load when using HTTPS Everywhere [1] in Firefox. It > > seems it comes with a rule to forward all *.qt-project.org pages to > > HTTPS but it fails for this subdomain. > > Where does that rule come from? HTTPS Everywhere and the Qt Project don't have a good history together. Here are some past problems (which have apparently been fixed): http://qt-project.org/forums/viewthread/22152 https://bugreports.qt-project.org/browse/QTWEBSITE-480 https://trac.torproject.org/projects/tor/ticket/6527 https://trac.torproject.org/projects/tor/ticket/7560 https://trac.torproject.org/projects/tor/ticket/7726 If there are other bad rules, file a report at the torproject.org bug tracker. Sze-Howe From thiago.macieira at intel.com Thu Jun 13 06:33:29 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 12 Jun 2013 21:33:29 -0700 Subject: [Development] Qt Contributor Summit sessions Message-ID: <4118877.GohNjVp7Tl@tjmaciei-mobl2> Hello contributors! The invitations should be sent in a day or two. When you receive your invitation, you can start filling in the sessions you'd like to hold during the summit or important topics that you think need to be discussed. The program is on the wiki at http://qt-project.org/groups/qt-contributors-summit-2013/wiki/Program Feel free to edit it and add sessions. Please start filling in with Monday, leaving Tuesday more or less free so we can adapt and add sessions that we come up with on-site, or if we need to continue sessions that ran out of time. Please remember to write a name of the session leader in there -- it must either be *your* name or the name of a person who *has* agreed to hold it. If you can't find a session leader, write your idea at the bottom. Note: you can edit the wiki only AFTER you've got your invitation. The wiki is protected from edits. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From mitch.curtis at digia.com Thu Jun 13 09:20:38 2013 From: mitch.curtis at digia.com (Mitch Curtis) Date: Thu, 13 Jun 2013 09:20:38 +0200 Subject: [Development] QtQml/QtQuick in Jira In-Reply-To: References: Message-ID: <51B972C6.6020001@digia.com> On 06/04/2013 12:14 PM, Chao Caroline wrote: > > Hello, > > The components structure in the bug tracker for Qt Qml and Qt Quick 2 (qtdeclarative repository) under the Qt project has been changed. > https://bugreports.qt-project.org/browse/QTBUG#selectedTab=com.atlassian.jira.plugin.system.project%3Acomponents-panel > > The Qt component 'Declarative(QML)' has been split into QtQml and QtQuick components. > > A - QtQml (Alan) > > The Qt Qml modules defines and implements the QML language and engine infrastructure. > If you encounter issues using the QtQml API you should now log bugs in the QtQml component. > > - QtQml (Alan) - > https://bugreports.qt-project.org/browse/QTBUG/component/19204 > > B - QtQuick > > The Qt Quick module provides all the basic types necessary for creating user interfaces with QML. > > If you need to report an issue against QtQuick, please choose one of the following components: > > - QtQuick: Core (Alan) (https://bugreports.qt-project.org/browse/QTBUG/component/20121) > For issues regarding the C++ API and the elements in the QtQuick import > - QtQuick: Particles (Alan) > - QtQuick: Dialogs (Shawn - new in Qt 5.1) > - QtQuick: Other (Alan) > For the elements in the other QtQuick imports, such as QtQuick.Window, QtQuick.LocalStorage, QtQuick.XmlListModel... > > For info some QtQuick APIs are provided by other modules and you can also find: > > - QtQuick: Controls (Jens - new in Qt 5.1) > - QtQuick: Layouts (Jan-Arve new in Qt 5.1) > - QtQuick: SceneGraph (Gunnar) > - QtQuick: Graphical Effect (Gunnar) > > Hopefully it will make it easier to find the right component and to search for issues. > > Note the Declarative (QML1/QtQuick1) component is still used to report bugs against Qt Qml and Qt Quick 1 (qtquick1 repository) > > Regards, > Caroline Is it possible to get descriptions written for each component like the ones in the Components tab here: https://bugreports.qt-project.org/browse/QTBUG It's currently unclear to me where to put bugs for Canvas and Context2D, etc. From Liang.Qi at digia.com Thu Jun 13 18:32:24 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Thu, 13 Jun 2013 16:32:24 +0000 Subject: [Development] Is it good practice to have duplicate commits both in dev and stable branch? Message-ID: Hi, all, dev is for 5.2, and stable is for 5.1.1 and forward now. A commit has already been merged in dev branch, I guess it means that we(or someone) decided to have that feature for 5.2. But now, it was cherry-picked into stable branch, then it will be duplicate when the merge happened between stable and dev next time. Is it good practice? https://codereview.qt-project.org/55247 https://codereview.qt-project.org/58617 Regards, Liang -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Thu Jun 13 18:38:12 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 13 Jun 2013 09:38:12 -0700 Subject: [Development] Is it good practice to have duplicate commits both in dev and stable branch? In-Reply-To: References: Message-ID: <1991511.cElQAtqLiH@tjmaciei-mobl2> On quinta-feira, 13 de junho de 2013 16.32.24, Qi Liang wrote: > Hi, all, > > dev is for 5.2, and stable is for 5.1.1 and forward now. A commit has > already been merged in dev branch, I guess it means that we(or someone) > decided to have that feature for 5.2. But now, it was cherry-picked into > stable branch, then it will be duplicate when the merge happened between > stable and dev next time. > > Is it good practice? > > https://codereview.qt-project.org/55247 > https://codereview.qt-project.org/58617 It's unavoidable. If the commit was meant for dev and integrated, and only later did we realise we wanted it for stable, cherry-picking is necessary. If you realise the commit should be in stable before it integrates in dev, then abandon the dev change. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Thu Jun 13 19:15:07 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Thu, 13 Jun 2013 10:15:07 -0700 Subject: [Development] QtQml/QtQuick in Jira In-Reply-To: <51B972C6.6020001@digia.com> References: <51B972C6.6020001@digia.com> Message-ID: They go in QtQuick: Core. The division is supposed to be straight forward based on the import: QtQuick C++ APIs and anything in import QtQuick -> QtQuick: Core QtQml C++ APIs and anything in import QtQml.* -> QtQml Types in other imports go into either that component if there (e.g. QtQuick.Layouts -> QtQuick: Layouts) or Other if not (e.g. QtQuick.LocalStorage -> QtQuick: Other). -- Alan Alpert On Thu, Jun 13, 2013 at 12:20 AM, Mitch Curtis wrote: > On 06/04/2013 12:14 PM, Chao Caroline wrote: >> >> Hello, >> >> The components structure in the bug tracker for Qt Qml and Qt Quick 2 (qtdeclarative repository) under the Qt project has been changed. >> https://bugreports.qt-project.org/browse/QTBUG#selectedTab=com.atlassian.jira.plugin.system.project%3Acomponents-panel >> >> The Qt component 'Declarative(QML)' has been split into QtQml and QtQuick components. >> >> A - QtQml (Alan) >> >> The Qt Qml modules defines and implements the QML language and engine infrastructure. >> If you encounter issues using the QtQml API you should now log bugs in the QtQml component. >> >> - QtQml (Alan) - >> https://bugreports.qt-project.org/browse/QTBUG/component/19204 >> >> B - QtQuick >> >> The Qt Quick module provides all the basic types necessary for creating user interfaces with QML. >> >> If you need to report an issue against QtQuick, please choose one of the following components: >> >> - QtQuick: Core (Alan) (https://bugreports.qt-project.org/browse/QTBUG/component/20121) >> For issues regarding the C++ API and the elements in the QtQuick import >> - QtQuick: Particles (Alan) >> - QtQuick: Dialogs (Shawn - new in Qt 5.1) >> - QtQuick: Other (Alan) >> For the elements in the other QtQuick imports, such as QtQuick.Window, QtQuick.LocalStorage, QtQuick.XmlListModel... >> >> For info some QtQuick APIs are provided by other modules and you can also find: >> >> - QtQuick: Controls (Jens - new in Qt 5.1) >> - QtQuick: Layouts (Jan-Arve new in Qt 5.1) >> - QtQuick: SceneGraph (Gunnar) >> - QtQuick: Graphical Effect (Gunnar) >> >> Hopefully it will make it easier to find the right component and to search for issues. >> >> Note the Declarative (QML1/QtQuick1) component is still used to report bugs against Qt Qml and Qt Quick 1 (qtquick1 repository) >> >> Regards, >> Caroline > > Is it possible to get descriptions written for each component like the > ones in the Components tab here: > https://bugreports.qt-project.org/browse/QTBUG > > It's currently unclear to me where to put bugs for Canvas and Context2D, > etc. > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From rdieter at math.unl.edu Thu Jun 13 21:07:09 2013 From: rdieter at math.unl.edu (Rex Dieter) Date: Thu, 13 Jun 2013 14:07:09 -0500 Subject: [Development] rationale/justification for bundled clucene library (in qttools src/assistant/3rdparty/) Message-ID: Working my way through fedora package reviews for qt5 bits, and a concern was raised over the bundling of clucene in qttools assistant. What's the rationale or justification for this (versus using a system clucene library)? My naive attempt to patch to use system clucene fails, http://rdieter.fedorapeople.org/rpms/qt5/qttools-opensource-src-5.0.2-system_clucene.patch but that may well be part of the reason why it cannot be used. -- rex From cavendish.qi at gmail.com Thu Jun 13 23:20:50 2013 From: cavendish.qi at gmail.com (Liang Qi) Date: Thu, 13 Jun 2013 23:20:50 +0200 Subject: [Development] Question about the missing projects in qt-solutions In-Reply-To: References: Message-ID: OK, I found a mirror of ftp.trolltech.com via google tonight, it is http://ftp3.ie.freebsd.org/pub/ftp.trolltech.com/ And I create this change for the missing solutions based on the mirror: https://codereview.qt-project.org/58895 Regards, Liang On 24 April 2013 12:05, Qi Liang wrote: > Hi, all, > > Some friends in Chinese local qt forum started to talk about this issue. > > Current qt-solutions repo: > > https://codereview.qt-project.org/#admin,project,qt-solutions/qt-solutions,info > http://qt.gitorious.org/qt-solutions/qt-solutions/ > > But there are only 9 in total. > > Based on the documentation, (someone mirrored the qt solutions for qt > 4), it should be about 38. > http://docs.huihoo.com/qt/solutions/4/ > > And digia still has the docs, but missing the main page for the > directory, like > http://doc.qt.digia.com/solutions/4/qtmmlwidget/index.html > > I guess nokia transfered all qt solutions to digia. Lars, could you > confirm that? > > If so, could we put them back to qt-solutions repo? > > Regards, > Liang > -- http://www.qiliang.net -------------- next part -------------- An HTML attachment was scrubbed... URL: From Liang.Qi at digia.com Fri Jun 14 10:17:32 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Fri, 14 Jun 2013 08:17:32 +0000 Subject: [Development] a bit big change in qtquickcontrols recently Message-ID: Hi, all, https://bugreports.qt-project.org/browse/QTBUG-31565 https://codereview.qt-project.org/58674 https://github.com/qtproject/qtquickcontrols/commit/41e13d3746c8b7b5cd550091c63fd8ab066422cf The issue was raised just from yesterday, more details in the jira report. My understand for the issue is: QtQuickControls is the first common non-cpp qt quick module. Most of source code is QML and JS, not CPP. Before that change, they will be installed into a directory. After that change, all files are organized by the .qrc file, then in the binary. Yes, it could simplify the package or deployment work very much. But for me, as a developer, I can't use QML debugger to switch QML code from my own into the libraries any more. Then I think it's not an improvement in this meaning. Just my own 2 cents. Regards, Liang From robertknight at gmail.com Fri Jun 14 10:27:04 2013 From: robertknight at gmail.com (Robert Knight) Date: Fri, 14 Jun 2013 09:27:04 +0100 Subject: [Development] rationale/justification for bundled clucene library (in qttools src/assistant/3rdparty/) In-Reply-To: References: Message-ID: On a related note, if anyone finds the time I think it would be worth looking at replacing Clucene with SQLite's full text search. It is simpler in many respects - you can use the existing Qt SQLite API, the search DB is a single file, it is more robust against corruption and it would make for one less dependency. Regards, Rob. On 13 June 2013 20:07, Rex Dieter wrote: > Working my way through fedora package reviews for qt5 bits, and a concern > was raised over the bundling of clucene in qttools assistant. > > What's the rationale or justification for this (versus using a system > clucene library)? > > My naive attempt to patch to use system clucene fails, > http://rdieter.fedorapeople.org/rpms/qt5/qttools-opensource-src-5.0.2-system_clucene.patch > but that may well be part of the reason why it cannot be used. > > -- rex > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From stephen.kelly at kdab.com Fri Jun 14 11:44:00 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Fri, 14 Jun 2013 11:44 +0200 Subject: [Development] Removing the use of 'register' Message-ID: <1494834.ybkWBCRXiy@hal> Hi, A recent patch to clang enables a warning for any use of the register storage class specifier when -std=c++11 is used. $ ~/dev/build/qtbase/llvm/bin/clang++ -std=c++11 -fPIE - I$HOME/dev/prefix/qtbase/include -c ~/dev/src/qtbase/src/corelib/tools/qstring.h clang-3.4: warning: treating 'c-header' input as 'c++-header' when in C++ mode, this behavior is deprecated In file included from /home/stephen/dev/src/qtbase/src/corelib/tools/qstring.h:45: In file included from /home/stephen/dev/prefix/qtbase/include/QtCore/qchar.h:45: In file included from /home/stephen/dev/prefix/qtbase/include/QtCore/qglobal.h:987: In file included from /home/stephen/dev/prefix/qtbase/include/QtCore/qglobalstatic.h:47: In file included from /home/stephen/dev/prefix/qtbase/include/QtCore/qatomic.h:47: In file included from /home/stephen/dev/prefix/qtbase/include/QtCore/qbasicatomic.h:84: In file included from /home/stephen/dev/prefix/qtbase/include/QtCore/qatomic_x86.h:46: /home/stephen/dev/prefix/qtbase/include/QtCore/qgenericatomic.h:175:13: warning: 'register' storage class specifier is deprecated [-Wdeprecated] register T tmp = load(_q_value); ^~~~~~~~~ /home/stephen/dev/prefix/qtbase/include/QtCore/qgenericatomic.h:210:13: warning: 'register' storage class specifier is deprecated [-Wdeprecated] register T tmp = BaseClass::load(_q_value); ^~~~~~~~~ http://thread.gmane.org/gmane.comp.compilers.clang.scm/74932 This will be quite noisy for Qt and for users of Qt. Should we remove the use of register from Qt? Or replace it with Q_REGISTER which is empty for c++11? Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 3636 bytes Desc: not available URL: From Martin.Smith at digia.com Fri Jun 14 12:31:14 2013 From: Martin.Smith at digia.com (Martin Smith) Date: Fri, 14 Jun 2013 12:31:14 +0200 Subject: [Development] qdoc and DITA XML Message-ID: <595E0281-A361-4216-A4FC-A98D2D83D4BA@digia.com> Most of you don't know that qdoc can/used to generate the Qt documentation in DITA XML format. At that time (Nokia era), we envisioned generating all the documentation in DITA XML (not just Qt), storing it in a database, and publishing subsets of it as needed using available tools. That was then, this is now. We are back to using qdoc's HTML output generator to generate the Qt documentation, mostly, I suppose, because the process of generating the docs that way is simpler. We still have the DITA XML output generator, and I have tried to keep it current in parallel with the HTML output generator, but I doubt that its output is completely consistent with the HTML. In other words, no one is looking at the DITA XML output to see if it is correct. Also, the QML documentation in DITA was generated using the C++ specialisation of DITA, because there was no QML specialisation of DITA at that time. Just before we left the burning platform, we did get QML dtd's for DITA, but we never got around to converting qdoc to use the QML specialisation. We would like to officially stop supporting the DITA output generator and remove it, so if anyone is using it, please reply to me or Topi Reiniö. martin smith -------------- next part -------------- An HTML attachment was scrubbed... URL: From oswald.buddenhagen at digia.com Fri Jun 14 13:36:55 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Fri, 14 Jun 2013 13:36:55 +0200 Subject: [Development] Is it good practice to have duplicate commits both in dev and stable branch? In-Reply-To: References: Message-ID: <20130614113655.GA19554@troll08.it.local> On Thu, Jun 13, 2013 at 04:32:24PM +0000, Qi Liang wrote: > Hi, all, > > dev is for 5.2, and stable is for 5.1.1 and forward now. A commit has already been merged in dev branch, I guess it means that we(or someone) decided to have that feature for 5.2. But now, it was cherry-picked into stable branch, then it will be duplicate when the merge happened between stable and dev next time. > > Is it good practice? > it is very bad practice, and therefore explicitly disapproved of by http://qt-project.org/wiki/Commit_Policy point 11. both contributors *and* reviewers are expected to pay attention to the target branch. From Jani.Heikkinen at digia.com Fri Jun 14 13:52:37 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Fri, 14 Jun 2013 11:52:37 +0000 Subject: [Development] New installers available Message-ID: Hi all! Last night we succeed to create new packages with updated content(based on qt5.git from yesterday) and now we are really close to Qt5.1 RC1. According to our understanding these two changes are still needed before we can create final RC1 packages but does anyone know something else which really needs to be in before we can make the release candidate? https://codereview.qt-project.org/58549 (QTBUG-30046:Race condition in QDir::mkpath / QFileSystemEngine::createDirectory) https://codereview.qt-project.org/58635 (QTBUG-31672:Crash in Qt Designer when undocking/moving docks with tree widgets around) You can find installers here: Offline: http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Online: NOTE: It takes time to replicate online content to mirrors. That's why you shouldn't test these before Sat 15.6.2013. If you try those earlier you might face some installation problems and miss some content http://download.qt-project.org/online/qt5/online_installers/ br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From stephen.kelly at kdab.com Fri Jun 14 14:33:02 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Fri, 14 Jun 2013 14:33:02 +0200 Subject: [Development] New installers available In-Reply-To: References: Message-ID: <2994952.1mNEtk2tTO@hal> On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: > Hi all! > > Last night we succeed to create new packages with updated content(based on > qt5.git from yesterday) and now we are really close to Qt5.1 RC1. According > to our understanding these two changes are still needed before we can > create final RC1 packages but does anyone know something else which really > needs to be in before we can make the release candidate? > This one: https://codereview.qt-project.org/#change,58667 Without it, no one using CMake can test the package on windows. Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From haithem.rahmani at gmail.com Fri Jun 14 15:43:30 2013 From: haithem.rahmani at gmail.com (haithem rahmani) Date: Fri, 14 Jun 2013 14:43:30 +0100 Subject: [Development] Qt 4.8.5 Release Candidate 2 available & new sha1 Message-ID: Hi, Message: 1 > Date: Sat, 8 Jun 2013 16:28:45 +0000 > From: Salovaara Akseli > Subject: [Development] Qt 4.8.5 Release Candidate 2 available & new > sha1 > To: "development at qt-project.org" > Message-ID: > <8EE30B3F13F8C042BFFAD90938B94A6F4D8FB481 at IT-EXMB02-HKI.it.local> > Content-Type: text/plain; charset="us-ascii" > > Hi, > > Due to problem found from previous release candidate we have created Qt > 4.8.5 Release Candidate 2 to fix issue and sha1 is now freeze on commit > 0529dc9b2542dcb46c2e2cc1a3422fc83c6ae6ef. > > Qt 4.8.5 Release Candidate 2 packages are available for you > http://download.qt-project.org/snapshots/qt/4.8/4.8.5-rc2. > Changes-4.8.5 file inside source packages and installers is not yet > updated but it can be found from > http://download.qt-project.org/snapshots/qt/4.8/4.8.5-rc2/changes-4.8.5-RC2.txt > > If you find some problems and especially regression from Qt 4.8.5 Release > Candidate 2 please report those to http://bugreports.qt-project.org or > send email to releasing at qt-project.org . > > Br, > Does the qtwebkit 2.2.4 included in this release support the "texmap"? I enabled it in the qt-4.8.0 and it doesn't even compile. -- * Never say that's "impossible", the word itself says "I'm Possible" * -------------- next part -------------- An HTML attachment was scrubbed... URL: From markg85 at gmail.com Fri Jun 14 16:17:14 2013 From: markg85 at gmail.com (Mark) Date: Fri, 14 Jun 2013 16:17:14 +0200 Subject: [Development] New installers available In-Reply-To: <2994952.1mNEtk2tTO@hal> References: <2994952.1mNEtk2tTO@hal> Message-ID: Just a little note. Is the new release newer then the current release that i see: "qt-windows-opensource-5.1.0-rc1-mingw48_opengl-x86-offline-2013-06-14-57.exe" and "qt-windows-opensource-1.4.0-x86-online-2013-06-14-80.exe"? Both fail installing. The latter failes with a hash verification issue whereas the first one fails on gcc, qmake and a bunch of others. So i just hope that the new version is not visible yet :) On Fri, Jun 14, 2013 at 2:33 PM, Stephen Kelly wrote: > On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: >> Hi all! >> >> Last night we succeed to create new packages with updated content(based on >> qt5.git from yesterday) and now we are really close to Qt5.1 RC1. According >> to our understanding these two changes are still needed before we can >> create final RC1 packages but does anyone know something else which really >> needs to be in before we can make the release candidate? >> > > This one: > > https://codereview.qt-project.org/#change,58667 > > Without it, no one using CMake can test the package on windows. > > Thanks, > > -- > Stephen Kelly | Software Engineer > KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company > www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 > KDAB - Qt Experts - Platform-Independent Software Solutions > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > From markg85 at gmail.com Fri Jun 14 16:20:31 2013 From: markg85 at gmail.com (Mark) Date: Fri, 14 Jun 2013 16:20:31 +0200 Subject: [Development] New installers available In-Reply-To: References: <2994952.1mNEtk2tTO@hal> Message-ID: Oh and there is an installer issue for the online version. I selected C:\Qt5 for installation. That folder already existed because QtCreator is also installed in there (separate package). When canceling the installer it completely removed the C:\Qt5 folder.. Not a biggie, but unexpected to say the least. The offline installer doesn't do this. On Fri, Jun 14, 2013 at 4:17 PM, Mark wrote: > Just a little note. Is the new release newer then the current release > that i see: "qt-windows-opensource-5.1.0-rc1-mingw48_opengl-x86-offline-2013-06-14-57.exe" > and "qt-windows-opensource-1.4.0-x86-online-2013-06-14-80.exe"? Both > fail installing. The latter failes with a hash verification issue > whereas the first one fails on gcc, qmake and a bunch of others. > > So i just hope that the new version is not visible yet :) > > On Fri, Jun 14, 2013 at 2:33 PM, Stephen Kelly wrote: >> On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: >>> Hi all! >>> >>> Last night we succeed to create new packages with updated content(based on >>> qt5.git from yesterday) and now we are really close to Qt5.1 RC1. According >>> to our understanding these two changes are still needed before we can >>> create final RC1 packages but does anyone know something else which really >>> needs to be in before we can make the release candidate? >>> >> >> This one: >> >> https://codereview.qt-project.org/#change,58667 >> >> Without it, no one using CMake can test the package on windows. >> >> Thanks, >> >> -- >> Stephen Kelly | Software Engineer >> KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company >> www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 >> KDAB - Qt Experts - Platform-Independent Software Solutions >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development >> From Kai.Koehne at digia.com Fri Jun 14 16:21:10 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Fri, 14 Jun 2013 14:21:10 +0000 Subject: [Development] New installers available In-Reply-To: References: <2994952.1mNEtk2tTO@hal> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C17D6@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On > Behalf Of Mark > Sent: Friday, June 14, 2013 4:17 PM > To: Stephen Kelly > Cc: Heikkinen Jani; development at qt-project.org; releasing at qt-project.org > Subject: Re: [Development] New installers available > > Just a little note. Is the new release newer then the current release that i see: > "qt-windows-opensource-5.1.0-rc1-mingw48_opengl-x86-offline-2013-06-14- > 57.exe" > and "qt-windows-opensource-1.4.0-x86-online-2013-06-14-80.exe"? Both fail > installing. The latter failes with a hash verification issue whereas the first one > fails on gcc, qmake and a bunch of others. I haven't had any issues with the mingw one. Could you be more specific on what exactly goes wrong (preferably in a bug report)? Regards Kai From markg85 at gmail.com Fri Jun 14 16:43:08 2013 From: markg85 at gmail.com (Mark) Date: Fri, 14 Jun 2013 16:43:08 +0200 Subject: [Development] New installers available In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C17D6@IT-EXMB01-HKI.it.local> References: <2994952.1mNEtk2tTO@hal> <5B2736A3C8B75B4BB66BC58DC5E889B08C17D6@IT-EXMB01-HKI.it.local> Message-ID: On Fri, Jun 14, 2013 at 4:21 PM, Koehne Kai wrote: > > >> -----Original Message----- >> From: development-bounces+kai.koehne=digia.com at qt-project.org >> [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On >> Behalf Of Mark >> Sent: Friday, June 14, 2013 4:17 PM >> To: Stephen Kelly >> Cc: Heikkinen Jani; development at qt-project.org; releasing at qt-project.org >> Subject: Re: [Development] New installers available >> >> Just a little note. Is the new release newer then the current release that i see: >> "qt-windows-opensource-5.1.0-rc1-mingw48_opengl-x86-offline-2013-06-14- >> 57.exe" >> and "qt-windows-opensource-1.4.0-x86-online-2013-06-14-80.exe"? Both fail >> installing. The latter failes with a hash verification issue whereas the first one >> fails on gcc, qmake and a bunch of others. > > I haven't had any issues with the mingw one. Could you be more specific on what exactly goes wrong (preferably in a bug report)? > > Regards > > Kai > Hi Kai, Done: https://bugreports.qt-project.org/browse/QTBUG-31758 If you need more info, please do ask. Mark From thiago.macieira at intel.com Fri Jun 14 16:48:18 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 14 Jun 2013 07:48:18 -0700 Subject: [Development] Removing the use of 'register' In-Reply-To: <1494834.ybkWBCRXiy@hal> References: <1494834.ybkWBCRXiy@hal> Message-ID: <1702733.2uO76co4fE@tjmaciei-mobl2> On sexta-feira, 14 de junho de 2013 11.44.00, Stephen Kelly wrote: > This will be quite noisy for Qt and for users of Qt. Should we remove the > use of register from Qt? Or replace it with Q_REGISTER which is empty for > c++11? Either remove or disable the warning. A macro makes no sense for this -- too ugly. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Friedemann.Kleint at digia.com Fri Jun 14 17:18:27 2013 From: Friedemann.Kleint at digia.com (Friedemann Kleint) Date: Fri, 14 Jun 2013 17:18:27 +0200 Subject: [Development] Advice for Wacom Tablet support In-Reply-To: <51B1EA48.8090304@126.com> References: <51B1E527.1020104@126.com> <10626168.N0A3fPUXjI@linux-ixka.site> <51B1EA48.8090304@126.com> Message-ID: <51BB3443.8050708@digia.com> Hi, For your information, we are planning to re-add tablet support (larval stage at https://codereview.qt-project.org/#change,58971 ). Friedemann -- Friedemann Kleint Digia, Qt -------------- next part -------------- An HTML attachment was scrubbed... URL: From jocelyn.turcotte at digia.com Fri Jun 14 17:19:54 2013 From: jocelyn.turcotte at digia.com (Jocelyn Turcotte) Date: Fri, 14 Jun 2013 17:19:54 +0200 Subject: [Development] Qt 4.8.5 Release Candidate 2 available & new sha1 In-Reply-To: References: Message-ID: <20130614151954.GA32393@poutine.it.local> On Fri, Jun 14, 2013 at 02:43:30PM +0100, haithem rahmani wrote: > Hi, > > Does the qtwebkit 2.2.4 included in this release support the "texmap"? > I enabled it in the qt-4.8.0 and it doesn't even compile. You might have more success with the non-official 2.3 release for 4.8: http://blogs.kde.org/2012/11/14/introducing-qtwebkit-23 There is no support for this release but CSS animations and transforms are among the few things that should work better, if you can manage to cope with the more complicated build. Cheers, Jocelyn From 416365416c at gmail.com Fri Jun 14 18:17:01 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 14 Jun 2013 09:17:01 -0700 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: References: Message-ID: On Fri, Jun 14, 2013 at 1:17 AM, Qi Liang wrote: > Hi, all, > > https://bugreports.qt-project.org/browse/QTBUG-31565 > https://codereview.qt-project.org/58674 > https://github.com/qtproject/qtquickcontrols/commit/41e13d3746c8b7b5cd550091c63fd8ab066422cf > > The issue was raised just from yesterday, more details in the jira report. > > My understand for the issue is: > QtQuickControls is the first common non-cpp qt quick module. Most of source code is QML and JS, not CPP. Before that change, they will be installed into a directory. After that change, all files are organized by the .qrc file, then in the binary. > > Yes, it could simplify the package or deployment work very much. > > But for me, as a developer, I can't use QML debugger to switch QML code from my own into the libraries any more. Then I think it's not an improvement in this meaning. Can't we get the best of both worlds by having the packaging be part of the deployment template? I.e. it's in separate QML files, but there's a creator template or build step which will QRC all dependent QML files including selected imports? You'll want that sort of approach anyways, because otherwise any QtQuick.Controls using applications will have to suffer the exact same drawbacks on their application code (worse debugging and maintenance (keeping all those qrc files up to date)). -- Alan Alpert From Jens.Bache-Wiig at digia.com Fri Jun 14 18:46:14 2013 From: Jens.Bache-Wiig at digia.com (Bache-Wiig Jens) Date: Fri, 14 Jun 2013 16:46:14 +0000 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: References: Message-ID: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> On Jun 14, 2013, at 6:17 PM, Alan Alpert <416365416c at gmail.com> wrote: > On Fri, Jun 14, 2013 at 1:17 AM, Qi Liang wrote: >> Hi, all, >> >> https://bugreports.qt-project.org/browse/QTBUG-31565 >> https://codereview.qt-project.org/58674 >> https://github.com/qtproject/qtquickcontrols/commit/41e13d3746c8b7b5cd550091c63fd8ab066422cf >> >> The issue was raised just from yesterday, more details in the jira report. >> >> My understand for the issue is: >> QtQuickControls is the first common non-cpp qt quick module. Most of source code is QML and JS, not CPP. Before that change, they will be installed into a directory. After that change, all files are organized by the .qrc file, then in the binary. >> >> Yes, it could simplify the package or deployment work very much. >> >> But for me, as a developer, I can't use QML debugger to switch QML code from my own into the libraries any more. Then I think it's not an improvement in this meaning. > > Can't we get the best of both worlds by having the packaging be part > of the deployment template? I.e. it's in separate QML files, but > there's a creator template or build step which will QRC all dependent > QML files including selected imports? > > You'll want that sort of approach anyways, because otherwise any > QtQuick.Controls using applications will have to suffer the exact same > drawbacks on their application code (worse debugging and maintenance > (keeping all those qrc files up to date)). Well at the moment the discussion is at least postponed until past the 5.1.0 release, primarily as it would anyway not make it in time for the 5.1.0 RC and in addition it causes too many issues with the version of creator that we are shipping with 5.1.0. The main issue being that it would break code completion, debugging is a secondary issue. Adding a new deployment wizard to creator is certainly high on the wish list but not quite there. Additionally a lot of people, in particular on windows are not using Creator at all. (though that is unlikely the case for qt quick development) I believe the best solution at the moment is to put an entry in the release notes stating that deployment of qt quick controls might change in a future patch release. (i.e ideally we will already have a proper solution to this in 5.1.1 which will also ship with creator 2.8) In Creator 2.8 we already have support for tracking files in resources, possibly solving the debugging issue and I think we can also easily solve the code completion issue (worst case by including an extra copy of the qml files with creator itself). A wizard would be great but unlikely to make it until at least 5.2 which leaves half a year of unusable deployment. I don't think anybody is disagreeing that forcing all applications to ship a qml folder with their app containing a hundred extra files is a bit inconvenient compared with the old method of simply copying a couple of libraries next to their executable. I personally feel a bit scared at the prospect of users editing those files accidentally just by messing around in their project tree or having out of date or modified versions used together with new libraries etc. I do think we mostly agree on having them bundled but we disagree on exactly what users have to do to get there. I personally think the default option should be to have as few user-visible files there as possible provided debugging works as expected (when they have sources installed). Regards, Jens From 416365416c at gmail.com Fri Jun 14 19:38:54 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 14 Jun 2013 10:38:54 -0700 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> Message-ID: Note that there are a lot of deployment issues for QML applications that we'll probably need to discuss at the Contributor Summit. A few things that come to mind are: Android: I think I heard somewhere that the assets, like QML files, have to go into a different folder than the binary so there needs to be a way to find them without an #ifdef ANDROID around your QQmlApplicationEngine QNX: File accesses are expensive, it would benefit from bundling up everything into one file (or QRC'ing everything) for performance iOS: Stereotypically less open, probably want integrated minifier/obfuscator for smaller and less reverse-engineerable packages. We need to consider all of these issues for QML-based modules as well, at least for all platforms where they need to bundle a Qt with the application (which apparently includes desktop now). So I'll assume there will be a "spontaneous" session about solving this conveniently for cross-platform (for 5.2). -- Alan Alpert On Fri, Jun 14, 2013 at 9:46 AM, Bache-Wiig Jens wrote: > > On Jun 14, 2013, at 6:17 PM, Alan Alpert <416365416c at gmail.com> wrote: > >> On Fri, Jun 14, 2013 at 1:17 AM, Qi Liang wrote: >>> Hi, all, >>> >>> https://bugreports.qt-project.org/browse/QTBUG-31565 >>> https://codereview.qt-project.org/58674 >>> https://github.com/qtproject/qtquickcontrols/commit/41e13d3746c8b7b5cd550091c63fd8ab066422cf >>> >>> The issue was raised just from yesterday, more details in the jira report. >>> >>> My understand for the issue is: >>> QtQuickControls is the first common non-cpp qt quick module. Most of source code is QML and JS, not CPP. Before that change, they will be installed into a directory. After that change, all files are organized by the .qrc file, then in the binary. >>> >>> Yes, it could simplify the package or deployment work very much. >>> >>> But for me, as a developer, I can't use QML debugger to switch QML code from my own into the libraries any more. Then I think it's not an improvement in this meaning. >> >> Can't we get the best of both worlds by having the packaging be part >> of the deployment template? I.e. it's in separate QML files, but >> there's a creator template or build step which will QRC all dependent >> QML files including selected imports? >> >> You'll want that sort of approach anyways, because otherwise any >> QtQuick.Controls using applications will have to suffer the exact same >> drawbacks on their application code (worse debugging and maintenance >> (keeping all those qrc files up to date)). > > Well at the moment the discussion is at least postponed until past the 5.1.0 release, primarily as it would anyway not make it in time for the 5.1.0 RC and in addition it causes too many issues with the version of creator that we are shipping with 5.1.0. The main issue being that it would break code completion, debugging is a secondary issue. Adding a new deployment wizard to creator is certainly high on the wish list but not quite there. Additionally a lot of people, in particular on windows are not using Creator at all. (though that is unlikely the case for qt quick development) > > I believe the best solution at the moment is to put an entry in the release notes stating that deployment of qt quick controls might change in a future patch release. (i.e ideally we will already have a proper solution to this in 5.1.1 which will also ship with creator 2.8) > > In Creator 2.8 we already have support for tracking files in resources, possibly solving the debugging issue and I think we can also easily solve the code completion issue (worst case by including an extra copy of the qml files with creator itself). A wizard would be great but unlikely to make it until at least 5.2 which leaves half a year of unusable deployment. > > I don't think anybody is disagreeing that forcing all applications to ship a qml folder with their app containing a hundred extra files is a bit inconvenient compared with the old method of simply copying a couple of libraries next to their executable. I personally feel a bit scared at the prospect of users editing those files accidentally just by messing around in their project tree or having out of date or modified versions used together with new libraries etc. I do think we mostly agree on having them bundled but we disagree on exactly what users have to do to get there. I personally think the default option should be to have as few user-visible files there as possible provided debugging works as expected (when they have sources installed). > > Regards, > Jens > > > > From tmartsum at gmail.com Fri Jun 14 22:10:36 2013 From: tmartsum at gmail.com (=?ISO-8859-1?Q?Thorbj=F8rn_Martsum?=) Date: Fri, 14 Jun 2013 22:10:36 +0200 Subject: [Development] Removing the use of 'register' In-Reply-To: <1702733.2uO76co4fE@tjmaciei-mobl2> References: <1494834.ybkWBCRXiy@hal> <1702733.2uO76co4fE@tjmaciei-mobl2> Message-ID: The only macro that could make sense seems to be #define register I say +1 for removal since 'register' is just noise, and if any compiler actually still uses this flag it will typically just cause less optimized code. On Fri, Jun 14, 2013 at 4:48 PM, Thiago Macieira wrote: > On sexta-feira, 14 de junho de 2013 11.44.00, Stephen Kelly wrote: > > This will be quite noisy for Qt and for users of Qt. Should we remove the > > use of register from Qt? Or replace it with Q_REGISTER which is empty > for > > c++11? > > Either remove or disable the warning. A macro makes no sense for this -- > too > ugly. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From dangelog at gmail.com Fri Jun 14 23:24:50 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Fri, 14 Jun 2013 23:24:50 +0200 Subject: [Development] Removing the use of 'register' In-Reply-To: <1494834.ybkWBCRXiy@hal> References: <1494834.ybkWBCRXiy@hal> Message-ID: On 14 June 2013 11:44, Stephen Kelly wrote: > > http://thread.gmane.org/gmane.comp.compilers.clang.scm/74932 > > This will be quite noisy for Qt and for users of Qt. Should we remove the use > of register from Qt? Or replace it with Q_REGISTER which is empty for c++11? Am I right at assuming that this warning triggers only when compiling C++ files in C++11 mode? If not, would it be possible we disable it selectively, f.i. for code in 3rdparty? -- Giuseppe D'Angelo From thiago.macieira at intel.com Sat Jun 15 00:37:29 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 14 Jun 2013 15:37:29 -0700 Subject: [Development] Removing the use of 'register' In-Reply-To: References: <1494834.ybkWBCRXiy@hal> Message-ID: <1590399.kOaoyhin7s@tjmaciei-mobl2> On sexta-feira, 14 de junho de 2013 23.24.50, Giuseppe D'Angelo wrote: > On 14 June 2013 11:44, Stephen Kelly wrote: > > http://thread.gmane.org/gmane.comp.compilers.clang.scm/74932 > > > > This will be quite noisy for Qt and for users of Qt. Should we remove the > > use of register from Qt? Or replace it with Q_REGISTER which is empty for > > c++11? > Am I right at assuming that this warning triggers only when compiling > C++ files in C++11 mode? If not, would it be possible we disable it > selectively, f.i. for code in 3rdparty? C++11 did not change the meaning of the keyword. This is a completely made-up warning by Clang, like the GCC warning that says const in prvalue return types makes no sense or the one telling you to use () around && with ||. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From dangelog at gmail.com Sat Jun 15 00:59:18 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Sat, 15 Jun 2013 00:59:18 +0200 Subject: [Development] Removing the use of 'register' In-Reply-To: <1590399.kOaoyhin7s@tjmaciei-mobl2> References: <1494834.ybkWBCRXiy@hal> <1590399.kOaoyhin7s@tjmaciei-mobl2> Message-ID: On 15 June 2013 00:37, Thiago Macieira wrote: > > C++11 did not change the meaning of the keyword. This is a completely made-up > warning by Clang, like the GCC warning that says const in prvalue return types > makes no sense or the one telling you to use () around && with ||. No, "register" is officially deprecated (N3337 §D.2 [depr.register]), so the warning "makes sense". My concern was about getting such warnings from code we don't have control upon, that is, 3rdparty code (qtbase/3rdparty, webkit, v8...) -- Giuseppe D'Angelo From thiago.macieira at intel.com Sat Jun 15 01:25:28 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 14 Jun 2013 16:25:28 -0700 Subject: [Development] Removing the use of 'register' In-Reply-To: References: <1494834.ybkWBCRXiy@hal> <1590399.kOaoyhin7s@tjmaciei-mobl2> Message-ID: <4300062.f7ICC1JvEB@tjmaciei-mobl2> On sábado, 15 de junho de 2013 00.59.18, Giuseppe D'Angelo wrote: > On 15 June 2013 00:37, Thiago Macieira wrote: > > C++11 did not change the meaning of the keyword. This is a completely > > made-up warning by Clang, like the GCC warning that says const in prvalue > > return types makes no sense or the one telling you to use () around && > > with ||. > No, "register" is officially deprecated (N3337 §D.2 [depr.register]), > so the warning "makes sense". My concern was about getting such > warnings from code we don't have control upon, that is, 3rdparty code > (qtbase/3rdparty, webkit, v8...) N3337 isn't in C++11 (which was N3291). It can only be C++14. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Sat Jun 15 01:34:51 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 14 Jun 2013 16:34:51 -0700 Subject: [Development] Removing the use of 'register' In-Reply-To: <4300062.f7ICC1JvEB@tjmaciei-mobl2> References: <1494834.ybkWBCRXiy@hal> <4300062.f7ICC1JvEB@tjmaciei-mobl2> Message-ID: <4094758.Q6uiSh8rpT@tjmaciei-mobl2> On sexta-feira, 14 de junho de 2013 16.25.28, Thiago Macieira wrote: > On sábado, 15 de junho de 2013 00.59.18, Giuseppe D'Angelo wrote: > > On 15 June 2013 00:37, Thiago Macieira wrote: > > > C++11 did not change the meaning of the keyword. This is a completely > > > made-up warning by Clang, like the GCC warning that says const in > > > prvalue > > > return types makes no sense or the one telling you to use () around && > > > with ||. > > > > No, "register" is officially deprecated (N3337 §D.2 [depr.register]), > > so the warning "makes sense". My concern was about getting such > > warnings from code we don't have control upon, that is, 3rdparty code > > (qtbase/3rdparty, webkit, v8...) > > N3337 isn't in C++11 (which was N3291). It can only be C++14. Actually, naming N3337 threw me off. That's the editor's update to N3291, so it's got the same content modulo editorial updates. depr.register wasn't added by any paper. It actually came via member body submissions (UK 86): http://www.open-std.org/jtc1/sc22/wg21/docs/cwg_defects.html#809 Please note that #definer register is not acceptable. The keyword is still used in extension code with assembly. In fact, for some IA-64 it is sometimes required if you need to select specific registers. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From liuyanghejerry at 126.com Sat Jun 15 03:43:18 2013 From: liuyanghejerry at 126.com (liuyanghejerry) Date: Sat, 15 Jun 2013 09:43:18 +0800 Subject: [Development] Advice for Wacom Tablet support In-Reply-To: <51BB3443.8050708@digia.com> References: <51B1E527.1020104@126.com> <10626168.N0A3fPUXjI@linux-ixka.site> <51B1EA48.8090304@126.com> <51BB3443.8050708@digia.com> Message-ID: <51BBC6B6.30107@126.com> At 2013/6/14 23:18, Friedemann Kleint wrote: > Hi, > > For your information, we are planning to re-add tablet support (larval > stage at https://codereview.qt-project.org/#change,58971 ). > > Friedemann > -- > Friedemann Kleint > Digia, Qt > > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development Good news! I think I can test tablet code, since I have one :) -------------- next part -------------- An HTML attachment was scrubbed... URL: From olivier at woboq.com Sat Jun 15 10:49:59 2013 From: olivier at woboq.com (Olivier Goffart) Date: Sat, 15 Jun 2013 10:49:59 +0200 Subject: [Development] Removing the use of 'register' In-Reply-To: References: <1494834.ybkWBCRXiy@hal> <1590399.kOaoyhin7s@tjmaciei-mobl2> Message-ID: <6594600.K2k6cLfzKQ@gargamel> On Saturday 15 June 2013 00:59:18 Giuseppe D'Angelo wrote: > On 15 June 2013 00:37, Thiago Macieira wrote: > > C++11 did not change the meaning of the keyword. This is a completely > > made-up warning by Clang, like the GCC warning that says const in prvalue > > return types makes no sense or the one telling you to use () around && > > with ||. > No, "register" is officially deprecated (N3337 §D.2 [depr.register]), > so the warning "makes sense". My concern was about getting such > warnings from code we don't have control upon, that is, 3rdparty code > (qtbase/3rdparty, webkit, v8...) We need to remove 'register' in our code. Especially in public headers. For third party code such as v8 or webkit, it does not make sens to patch those project for that (But we could submit patches upstream, if we really want to.) -- Olivier Woboq - Qt services and support - http://woboq.com - http://code.woboq.org From stephen.kelly at kdab.com Sat Jun 15 11:31:22 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Sat, 15 Jun 2013 11:31:22 +0200 Subject: [Development] Removing the use of 'register' In-Reply-To: <1702733.2uO76co4fE@tjmaciei-mobl2> References: <1494834.ybkWBCRXiy@hal> <1702733.2uO76co4fE@tjmaciei-mobl2> Message-ID: <228562167.mK3CgenzqJ@hal> On Friday, June 14, 2013 07:48:18 Thiago Macieira wrote: > On sexta-feira, 14 de junho de 2013 11.44.00, Stephen Kelly wrote: > > This will be quite noisy for Qt and for users of Qt. Should we remove the > > use of register from Qt? Or replace it with Q_REGISTER which is empty for > > c++11? > > Either remove or disable the warning. A macro makes no sense for this -- too > ugly. The warning can only be disabled by adding -Wno-deprecated. I think that has to change though: http://llvm.org/bugs/show_bug.cgi?id=16336 Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From stephen.kelly at kdab.com Sun Jun 16 11:35:19 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Sun, 16 Jun 2013 11:35:19 +0200 Subject: [Development] OSX CMake broken in 5.1.1 In-Reply-To: References: Message-ID: <2054791.Bg9StSXMzj@hal> On Friday, June 07, 2013 14:18:49 Daiwei Li wrote: > I recently my version of Qt to 5.1.1 and it seems to have broken CMake on > OSX. I get the following error message: The workaround for this issue has been merged to the qtbase stable branch. Feel free to update to that and re-test. Thanks! -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From ola at silentwings.no Mon Jun 17 08:36:10 2013 From: ola at silentwings.no (=?ISO-8859-1?Q?Ola_R=F8er_Thorsen?=) Date: Mon, 17 Jun 2013 08:36:10 +0200 Subject: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version Message-ID: <51BEAE5A.10201@silentwings.no> Hi, during developing an application which amongst other things plays back video files using the Qt 5.1 beta version on Windows 7, I've run into a serious problem with the media backend. Basically if I try to play back some video file, use "Big buck bunny" for example from here, http://www.bigbuckbunny.org/index.php/download/ , take the 854x480p h264 file (or any other for that matter). Use the CuteTime demo player from here, https://github.com/nezticle/cutetime as it shows the same issue that I get in my own player. Playback starts OK but if you let it play until 3:34, it will play in "fast-forward". Trying to seek before this happens will make the video hang. Before 3:34 there will be the occational video stutter, with this debug output appearing on the console: currentPresentTime = 102.334 and sampleTime is 102.249 This only happens using the OpenGL build, not if you use the Angle-build. The issue always happens at about 3:34 into the film, also with my own video files. I have not been able to reproduce this using one of the example players that come with Qt, it seems like it is somehow triggered by having more than just a video item on the screen using Quick2 (such as a text label with the current media position). If any of you could please try this out as well and confirm it's not just on my computer, I'll file a bug report? I've briefly looked into the WMF backend code and found that there is indeed some ifdef's concerning the use of either OpenGL or Angle. Best regards, Ola Røer Thorsen -------------- next part -------------- An HTML attachment was scrubbed... URL: From njeisecke at saltation.de Mon Jun 17 09:24:56 2013 From: njeisecke at saltation.de (Nils Jeisecke) Date: Mon, 17 Jun 2013 09:24:56 +0200 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> Message-ID: On Fri, Jun 14, 2013 at 6:46 PM, Bache-Wiig Jens wrote: > I personally feel a bit scared at the prospect of users editing those files accidentally just > by messing around in their project tree or having out of date or modified versions > used together with new libraries etc. There also code signing to keep in mind. Even more useless with a bunch of unsigned script files. Nils From lpapp at kde.org Mon Jun 17 10:12:58 2013 From: lpapp at kde.org (Laszlo Papp) Date: Mon, 17 Jun 2013 11:12:58 +0300 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> Message-ID: On Mon, Jun 17, 2013 at 10:24 AM, Nils Jeisecke wrote: > There also code signing to keep in mind. Even more useless with a > bunch of unsigned script files. > That could be addressed on the Platform Security layer as well though and not per application framework. Laszlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From Kai.Koehne at digia.com Mon Jun 17 10:34:04 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Mon, 17 Jun 2013 08:34:04 +0000 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C3BA0@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On > Behalf Of Alan Alpert > Sent: Friday, June 14, 2013 7:39 PM > To: Bache-Wiig Jens > Cc: development at qt-project.org; Qi Liang; qt-components at qt-project.org > Subject: Re: [Development] a bit big change in qtquickcontrols recently > > Note that there are a lot of deployment issues for QML applications that we'll > probably need to discuss at the Contributor Summit. A few things that come to > mind are: > > Android: I think I heard somewhere that the assets, like QML files, have to go > into a different folder than the binary so there needs to be a way to find them > without an #ifdef ANDROID around your QQmlApplicationEngine > > QNX: File accesses are expensive, it would benefit from bundling up > everything into one file (or QRC'ing everything) for performance Weren't 'QML Bundles' designed to solve this issue? Are you, or someone else, still working on them? > iOS: Stereotypically less open, probably want integrated minifier/obfuscator > for smaller and less reverse-engineerable packages. > > We need to consider all of these issues for QML-based modules as well, at > least for all platforms where they need to bundle a Qt with the application > (which apparently includes desktop now). So I'll assume there will be a > "spontaneous" session about solving this conveniently for cross-platform (for > 5.2). Great, I'll be happy to join that one :) Kai From mitch.curtis at digia.com Mon Jun 17 13:18:30 2013 From: mitch.curtis at digia.com (Mitch Curtis) Date: Mon, 17 Jun 2013 13:18:30 +0200 Subject: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version In-Reply-To: <51BEAE5A.10201@silentwings.no> References: <51BEAE5A.10201@silentwings.no> Message-ID: <51BEF086.5050609@digia.com> On 06/17/2013 08:36 AM, Ola Røer Thorsen wrote: > Hi, > > during developing an application which amongst other things plays back > video files using the Qt 5.1 beta version on Windows 7, I've run into a > serious problem with the media backend. > > Basically if I try to play back some video file, use "Big buck bunny" > for example from here, http://www.bigbuckbunny.org/index.php/download/ , > take the 854x480p h264 file (or any other for that matter). Use the > CuteTime demo player from here, https://github.com/nezticle/cutetime as > it shows the same issue that I get in my own player. > > Playback starts OK but if you let it play until 3:34, it will play in > "fast-forward". Trying to seek before this happens will make the video > hang. Before 3:34 there will be the occational video stutter, with this > debug output appearing on the console: > currentPresentTime = 102.334 and sampleTime is 102.249 > > This only happens using the OpenGL build, not if you use the > Angle-build. The issue always happens at about 3:34 into the film, also > with my own video files. I have not been able to reproduce this using > one of the example players that come with Qt, it seems like it is > somehow triggered by having more than just a video item on the screen > using Quick2 (such as a text label with the current media position). > > If any of you could please try this out as well and confirm it's not > just on my computer, I'll file a bug report? > > I've briefly looked into the WMF backend code and found that there is > indeed some ifdef's concerning the use of either OpenGL or Angle. > > Best regards, > Ola Røer Thorsen > > > > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > Hi Ola. I can confirm this with the latest SDK beta on Windows 7 64-bit, so please create a bug report. Which video card do you have? From Yoann.Lopes at digia.com Mon Jun 17 13:40:26 2013 From: Yoann.Lopes at digia.com (Lopes Yoann) Date: Mon, 17 Jun 2013 11:40:26 +0000 Subject: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version In-Reply-To: <51BEF086.5050609@digia.com> References: <51BEAE5A.10201@silentwings.no> <51BEF086.5050609@digia.com> Message-ID: <58A4B461-D94B-4C01-802F-E5275CA212B2@digia.com> Hi, This is a known issue. Angle and OpenGL builds use different decoding pipelines. With Angle, the plugin can do hardware decoding using DXVA, while when using pure OpenGL it is not possible and the pipeline is setup with a custom video sink (software decoding) that is known to be buggy... If you can, use the Angle build. Not only you'll get better performance but it will also be much more stable. The problem you are reporting should probably be fixed anyway, please create a bug report. Yoann Lopes Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com On Jun 17, 2013, at 1:18 PM, Mitch Curtis wrote: On 06/17/2013 08:36 AM, Ola Røer Thorsen wrote: Hi, during developing an application which amongst other things plays back video files using the Qt 5.1 beta version on Windows 7, I've run into a serious problem with the media backend. Basically if I try to play back some video file, use "Big buck bunny" for example from here, http://www.bigbuckbunny.org/index.php/download/ , take the 854x480p h264 file (or any other for that matter). Use the CuteTime demo player from here, https://github.com/nezticle/cutetime as it shows the same issue that I get in my own player. Playback starts OK but if you let it play until 3:34, it will play in "fast-forward". Trying to seek before this happens will make the video hang. Before 3:34 there will be the occational video stutter, with this debug output appearing on the console: currentPresentTime = 102.334 and sampleTime is 102.249 This only happens using the OpenGL build, not if you use the Angle-build. The issue always happens at about 3:34 into the film, also with my own video files. I have not been able to reproduce this using one of the example players that come with Qt, it seems like it is somehow triggered by having more than just a video item on the screen using Quick2 (such as a text label with the current media position). If any of you could please try this out as well and confirm it's not just on my computer, I'll file a bug report? I've briefly looked into the WMF backend code and found that there is indeed some ifdef's concerning the use of either OpenGL or Angle. Best regards, Ola Røer Thorsen _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development Hi Ola. I can confirm this with the latest SDK beta on Windows 7 64-bit, so please create a bug report. Which video card do you have? _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From ola at silentwings.no Mon Jun 17 14:04:16 2013 From: ola at silentwings.no (=?ISO-8859-1?Q?Ola_R=F8er_Thorsen?=) Date: Mon, 17 Jun 2013 14:04:16 +0200 Subject: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version In-Reply-To: <58A4B461-D94B-4C01-802F-E5275CA212B2@digia.com> References: <51BEAE5A.10201@silentwings.no> <51BEF086.5050609@digia.com> <58A4B461-D94B-4C01-802F-E5275CA212B2@digia.com> Message-ID: <51BEFB40.5020905@silentwings.no> Mitch, thanks for the feedback! I have a Asus G74S laptop with nvidia a 560M GPU. I've created a bug report here: https://bugreports.qt-project.org/browse/QTBUG-31800 Yoann, thanks for the information. I'll try to use Angle instead for now, but this will become an issue once we need to use more advanced OpenGL features. I use Qt to overlay data on top of a 3D viewer application. For the moment, the other issue I found last week is more important and is valid for both the Angle and OpenGL versions, https://bugreports.qt-project.org/browse/QTBUG-31731 While discussing this, I also found that using the Angle-version on "cheaper" Windows 7 laptops with Intel GPUs, the video is just black. There is no apparent error messages. The video appears to be playing, but the actual texture is completely black. Same video plays back fine in Windows Media Player on the same machines. This is partially why I wanted to try the OpenGL-version to see if that was any better. Is this also a known issue, or should I create an issue on the tracker for this as well? Best regards, Ola Røer Thorsen Den 2013-06-17 13:40, skrev Lopes Yoann: > Hi, > > This is a known issue. > > Angle and OpenGL builds use different decoding pipelines. With Angle, > the plugin can do hardware decoding using DXVA, while when using pure > OpenGL it is not possible and the pipeline is setup with a custom > video sink (software decoding) that is known to be buggy... > > If you can, use the Angle build. Not only you'll get better > performance but it will also be much more stable. > > The problem you are reporting should probably be fixed anyway, please > create a bug report. > > Yoann Lopes > Senior Software Engineer - Digia, Qt > Visit us on: http://qt.digia.com > > On Jun 17, 2013, at 1:18 PM, Mitch Curtis wrote: > >> On 06/17/2013 08:36 AM, Ola Røer Thorsen wrote: >>> Hi, >>> >>> during developing an application which amongst other things plays back >>> video files using the Qt 5.1 beta version on Windows 7, I've run into a >>> serious problem with the media backend. >>> >>> Basically if I try to play back some video file, use "Big buck bunny" >>> for example from here, >>> http://www.bigbuckbunny.org/index.php/download/ >>> , >>> take the 854x480p h264 file (or any other for that matter). Use the >>> CuteTime demo player from here, https://github.com/nezticle/cutetime >>> as >>> it shows the same issue that I get in my own player. >>> >>> Playback starts OK but if you let it play until 3:34, it will play in >>> "fast-forward". Trying to seek before this happens will make the video >>> hang. Before 3:34 there will be the occational video stutter, with this >>> debug output appearing on the console: >>> currentPresentTime = 102.334 and sampleTime is 102.249 >>> >>> This only happens using the OpenGL build, not if you use the >>> Angle-build. The issue always happens at about 3:34 into the film, also >>> with my own video files. I have not been able to reproduce this using >>> one of the example players that come with Qt, it seems like it is >>> somehow triggered by having more than just a video item on the screen >>> using Quick2 (such as a text label with the current media position). >>> >>> If any of you could please try this out as well and confirm it's not >>> just on my computer, I'll file a bug report? >>> >>> I've briefly looked into the WMF backend code and found that there is >>> indeed some ifdef's concerning the use of either OpenGL or Angle. >>> >>> Best regards, >>> Ola Røer Thorsen >>> >>> >>> >>> >>> >>> _______________________________________________ >>> Development mailing list >>> Development at qt-project.org >>> http://lists.qt-project.org/mailman/listinfo/development >>> >> >> Hi Ola. >> >> I can confirm this with the latest SDK beta on Windows 7 64-bit, so >> please create a bug report. Which video card do you have? >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From raul at innovaatik.ee Mon Jun 17 14:12:21 2013 From: raul at innovaatik.ee (Raul Metsma) Date: Mon, 17 Jun 2013 15:12:21 +0300 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <2663698.W6o0QhPuDu@tjmaciei-mobl2> References: <2040833.AWhxjJTgdf@titan> <2663698.W6o0QhPuDu@tjmaciei-mobl2> Message-ID: <5001CAF1-A0E6-4D37-9706-4409B0A42252@innovaatik.ee> Thats my point. It is wrong think that vendors have to implement opengl drivers on windows. Its like more optional feature on windows world. If we look other platforms Xbox, Windows Phone, Windows RT and etc there is no OpenGL Raul Metsma On Jun 12, 2013, at 6:10 PM, Thiago Macieira wrote: > On quarta-feira, 12 de junho de 2013 15.48.13, Raul Metsma wrote: >> Hmm, If i do quick google check, then I see that major driving force on >> windows is focused on direct x, games, cad-s, photo/video editing > > That's exactly the problem. Several driver vendors provide good DirectX > support, but bad OpenGL support. > > In Qt, we use OpenGL because that's the cross-platform API. And we added a > translation layer so OpenGL code can run on DirectX: that's ANGLE. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From franciscoraulortega at gmail.com Mon Jun 17 14:48:45 2013 From: franciscoraulortega at gmail.com (Francisco Ortega) Date: Mon, 17 Jun 2013 08:48:45 -0400 Subject: [Development] Touch Points Update In-Reply-To: <1466292.oGQQluV6pJ@varney> References: <1466292.oGQQluV6pJ@varney> Message-ID: Frederick, Thank you for your email. Sorry for delayed replied. I do agree with all your observations/comments. I hope to get to the code soon, probably sometime in July. Thank you, Francisco Francisco R. Ortega Ph.D. Candidate in Computer Science Florida International University http://www.FranciscoRaulOrtega.com "No me quieras por que gane, necesito que me quieras para ganar" -- Marcelo Bielsa On Mon, Jun 10, 2013 at 3:44 AM, Frederik Gladhorn < frederik.gladhorn at digia.com> wrote: > Hello Francisco, > > Lørdag 8. juni 2013 13.06.20 skrev Francisco Ortega: > > Hello all, > > > > I spoke to Oliver Wolf this past Monday (6/3/2013) and a few other > members > > (#qt-labs) about the qtbase/src/plugins/platforms dealing with Touch. > Like > > always, everyone is extremely helpful. > > > > I started talking about Windows having a few additional data members for > a > > given touch point. Most importantly, I spoke about the unsigned long ID > > given by windows, which is not the same. Without going into much > > explanation here, I spoke in IRC that I used that unique ID to store > touch > > points to a database to later reply them. The current id for a windows > app > > running Qt does not does the same, since it can go from 0,1,2... and > later > > 0,1,2,3 in the same moment. As most of you may guess, I could do > something > > to fix this for me. > > If you store them in a database you can just map your own unique IDs there, > whenever a touch point appears, assign it a new ID and keep track of it. > Qt uses consistent IDs. > As long as a touch event is ongoing, the ID will stay the same. When a > finger > is lifted (lets say IDs 1,2,3 were pressed) and 2 goes away and is > re-added, > it will be a new unique ID compared to the others (you might end up with > 1,3,4). > I don't see how the actualy unique ID is relevant, you just need to be > able to > identify individual points and track them from what I understand. > > > However, I was thinking at a larger scale. Therefore, I went and check > the > > three platforms that I have accessed to. Windows, Linux (Debian 7), and > Mac > > OS X 10.8. Windows is the only platform that I know well. > > > > With the search, I found that Linux and MacOSX has what is already given > by > > Qt. x,y,state. Linux also has a timestamp, which I didn't no see in > > QTouchEvents::TouchPoint (in linux is under time, but I think is a > > timestamp). Windows has the timestamp as well. > > What about QInputEvent::timestamp()? > > > Windows also has Cx,Cy which is the contact area. Not the most useful > data > > at least with my Multi-Touch monitors (3M) because it gives me two > > values... but nevertheless, a value that is no there. > > This might be a good addition, it can go directly into > QTouchEventTouchPointPrivate (qevent_p.h). > > > With all this preamble, I would like to get to the meet of the change > that > > I will submit and see if it gets reviewed. First, let me tell you what I > > discarded. I hope your feedback about all. > > > > (First ideas, that I decided not to go for) > > > > 1) Returning a void * to a platform structure, it is not a good idea, so > is > > out. > > 2) Changing the current id (int) to unsigned long can have multiple > > unintended consequences to current code, that is best not to do it. So is > > out. > > 3) setting the platform id (windows) to the int by moding with a > "MAX_INT" > > does not feel right to me. > > > > What I will change in the code and submit when ready is the following: > > > > 1) Create an interface to used a platformSpecificData() that will be the > > same across all Operating Systems. For example, say that we have > > data.cxfor mac os x. Then this will simply be 0, the data.flags will > > specify if > > the data is available. > > > > I hope to receive feedback. I'm not sure if I can do it this month, > since I > > have to submit a paper to a conference, but I will try. if not next week. > > Because the change may be more significant, is probably that even if > review > > and accept it, it will take a while to make it to the stable release. > > However, I think this is the best option. > > > > Once again, I thank you for all the feedback and continue support here > and > > in Irc. > > > > Other contributions in the future that I hope to be involved is the "Leap > > Motion" which I will be getting soon and some MEMS that I have already > > received. I like input and please consider me for any work you may need. > > Help with the input events is most certainly appreciated :) > Greetings, > Frederik > > > > > > Thanks, > > Francisco > > > > > > Francisco R. Ortega > > Ph.D. Candidate in Computer Science > > Florida International University > > http://www.FranciscoRaulOrtega.com > > "No me quieras por que gane, necesito que me quieras para ganar" -- > Marcelo > > Bielsa > -- > Best regards, > Frederik Gladhorn > Senior Software Engineer - Digia, Qt > Visit us on: http://qt.digia.com > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From olivier.austina at gmail.com Mon Jun 17 15:49:13 2013 From: olivier.austina at gmail.com (Olivier Austina) Date: Mon, 17 Jun 2013 15:49:13 +0200 Subject: [Development] Web Service tutorial with Qt Message-ID: Hi, I try to do a web service with Qt. I am new in web service. Is there any basic tutorial to start. Any suggestion is welcome. Thank you. Regards Olivier -------------- next part -------------- An HTML attachment was scrubbed... URL: From olszak.tomasz at gmail.com Mon Jun 17 17:13:43 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Mon, 17 Jun 2013 17:13:43 +0200 Subject: [Development] Web Service tutorial with Qt In-Reply-To: References: Message-ID: 2013/6/17 Olivier Austina > Hi, > I try to do a web service with Qt. I am new in web service. Is there any > basic tutorial to start. Any suggestion is welcome. Thank you. > > Regards > Olivier > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > I used gSoap with Qt some time ago. But maybe you should look for something more integrated like kd-soap . -- regards / pozdrawiam, Tomasz Olszak Qt for Tizen | http://qt-project.org/wiki/Tizen Qt Certified Developer | http://qt-project.org http://linkedin.com/in/tolszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Mon Jun 17 18:25:32 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Mon, 17 Jun 2013 09:25:32 -0700 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <5001CAF1-A0E6-4D37-9706-4409B0A42252@innovaatik.ee> References: <2663698.W6o0QhPuDu@tjmaciei-mobl2> <5001CAF1-A0E6-4D37-9706-4409B0A42252@innovaatik.ee> Message-ID: <1528733.QK58YtMd8l@tjmaciei-mobl2> On segunda-feira, 17 de junho de 2013 15.12.21, Raul Metsma wrote: > Thats my point. It is wrong think that vendors have to implement opengl > drivers on windows. Its like more optional feature on windows world. > If we look other platforms Xbox, Windows Phone, Windows RT and etc there is > no OpenGL I agree. But agreeing with you won't change the drivers. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From ono at java.pl Mon Jun 17 18:38:00 2013 From: ono at java.pl (Adam Strzelecki) Date: Mon, 17 Jun 2013 18:38:00 +0200 Subject: [Development] Why custom installer on Mac, why not using @rpath? Message-ID: Hello, This may be a silly question, but why Qt5 is not using Mac native installer packages anymore, but own (unusual on Mac) installer application? Before in Qt4 there was .pkg installer, that was simply putting Qt frameworks into /Library/Frameworks and rest of the stuff into /Developer. Which is IMHO something that is pretty expected by Mac developer. Of course this could make problem for Qt4 & Qt5 coexests, that's why it is possible to enable specifying different installation target in installer .pkg. Once of the reasons I can see there's new "qt5.patcher" installer task that simply rewrites all referenced Qt frameworks to their paths using "install_name_tool". This solves the problem when referencing framework, but this is awkward solution. Why not use @rpath? And make all Qt frameworks to use id of @rpath/QtNAME/Versions/VERSION/NAME, i.e. @rpath/QtCore/Versions/5/QtCore Anyway pre-built SDKs come in 64-bit flavor on Mac, so they will run need at least Leopard 10.5 where @rpath is supported. Just to have a reference I've created bug entry for that: https://bugreports.qt-project.org/browse/QTBUG-31814 Best regards, -- Adam Strzelecki | nanoant.com | twitter.com/nanoant From sandroandrade at kde.org Mon Jun 17 19:51:04 2013 From: sandroandrade at kde.org (Sandro Andrade) Date: Mon, 17 Jun 2013 14:51:04 -0300 Subject: [Development] Jira component entry request for QtModeling ... Message-ID: Hi there, I've been keeping around a couple of low priority bugs for QtModeling while improving some major points. Could we add a 'Modeling' component type for the 'Qt' project (or something similar) in Jira ? That would help to prevent those stuff being somehow left in the road. Thanks in advance, -- Sandro From Yoann.Lopes at digia.com Mon Jun 17 20:55:09 2013 From: Yoann.Lopes at digia.com (Lopes Yoann) Date: Mon, 17 Jun 2013 18:55:09 +0000 Subject: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version In-Reply-To: <51BEFB40.5020905@silentwings.no> References: <51BEAE5A.10201@silentwings.no> <51BEF086.5050609@digia.com> <58A4B461-D94B-4C01-802F-E5275CA212B2@digia.com>, <51BEFB40.5020905@silentwings.no> Message-ID: "While discussing this, I also found that using the Angle-version on "cheaper" Windows 7 laptops with Intel GPUs, the video is just black. " Does this happen with the OpenGL build as well? This is not something I was aware of, you can create a bug report. Yoann Lopes Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com ________________________________ From: development-bounces+yoann.lopes=digia.com at qt-project.org [development-bounces+yoann.lopes=digia.com at qt-project.org] on behalf of Ola Røer Thorsen [ola at silentwings.no] Sent: Monday, June 17, 2013 2:04 PM To: Subject: Re: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version Mitch, thanks for the feedback! I have a Asus G74S laptop with nvidia a 560M GPU. I've created a bug report here: https://bugreports.qt-project.org/browse/QTBUG-31800 Yoann, thanks for the information. I'll try to use Angle instead for now, but this will become an issue once we need to use more advanced OpenGL features. I use Qt to overlay data on top of a 3D viewer application. For the moment, the other issue I found last week is more important and is valid for both the Angle and OpenGL versions, https://bugreports.qt-project.org/browse/QTBUG-31731 While discussing this, I also found that using the Angle-version on "cheaper" Windows 7 laptops with Intel GPUs, the video is just black. There is no apparent error messages. The video appears to be playing, but the actual texture is completely black. Same video plays back fine in Windows Media Player on the same machines. This is partially why I wanted to try the OpenGL-version to see if that was any better. Is this also a known issue, or should I create an issue on the tracker for this as well? Best regards, Ola Røer Thorsen Den 2013-06-17 13:40, skrev Lopes Yoann: Hi, This is a known issue. Angle and OpenGL builds use different decoding pipelines. With Angle, the plugin can do hardware decoding using DXVA, while when using pure OpenGL it is not possible and the pipeline is setup with a custom video sink (software decoding) that is known to be buggy... If you can, use the Angle build. Not only you'll get better performance but it will also be much more stable. The problem you are reporting should probably be fixed anyway, please create a bug report. Yoann Lopes Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com On Jun 17, 2013, at 1:18 PM, Mitch Curtis wrote: On 06/17/2013 08:36 AM, Ola Røer Thorsen wrote: Hi, during developing an application which amongst other things plays back video files using the Qt 5.1 beta version on Windows 7, I've run into a serious problem with the media backend. Basically if I try to play back some video file, use "Big buck bunny" for example from here, http://www.bigbuckbunny.org/index.php/download/ , take the 854x480p h264 file (or any other for that matter). Use the CuteTime demo player from here, https://github.com/nezticle/cutetime as it shows the same issue that I get in my own player. Playback starts OK but if you let it play until 3:34, it will play in "fast-forward". Trying to seek before this happens will make the video hang. Before 3:34 there will be the occational video stutter, with this debug output appearing on the console: currentPresentTime = 102.334 and sampleTime is 102.249 This only happens using the OpenGL build, not if you use the Angle-build. The issue always happens at about 3:34 into the film, also with my own video files. I have not been able to reproduce this using one of the example players that come with Qt, it seems like it is somehow triggered by having more than just a video item on the screen using Quick2 (such as a text label with the current media position). If any of you could please try this out as well and confirm it's not just on my computer, I'll file a bug report? I've briefly looked into the WMF backend code and found that there is indeed some ifdef's concerning the use of either OpenGL or Angle. Best regards, Ola Røer Thorsen _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development Hi Ola. I can confirm this with the latest SDK beta on Windows 7 64-bit, so please create a bug report. Which video card do you have? _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From 416365416c at gmail.com Mon Jun 17 21:07:34 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Mon, 17 Jun 2013 12:07:34 -0700 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C3BA0@IT-EXMB01-HKI.it.local> References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> <5B2736A3C8B75B4BB66BC58DC5E889B08C3BA0@IT-EXMB01-HKI.it.local> Message-ID: On Mon, Jun 17, 2013 at 1:34 AM, Koehne Kai wrote: >> -----Original Message----- >> From: development-bounces+kai.koehne=digia.com at qt-project.org >> [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On >> Behalf Of Alan Alpert >> Sent: Friday, June 14, 2013 7:39 PM >> To: Bache-Wiig Jens >> Cc: development at qt-project.org; Qi Liang; qt-components at qt-project.org >> Subject: Re: [Development] a bit big change in qtquickcontrols recently >> >> Note that there are a lot of deployment issues for QML applications that we'll >> probably need to discuss at the Contributor Summit. A few things that come to >> mind are: >> >> Android: I think I heard somewhere that the assets, like QML files, have to go >> into a different folder than the binary so there needs to be a way to find them >> without an #ifdef ANDROID around your QQmlApplicationEngine >> >> QNX: File accesses are expensive, it would benefit from bundling up >> everything into one file (or QRC'ing everything) for performance > > Weren't 'QML Bundles' designed to solve this issue? Are you, or someone else, still working on them? Yes and no, respectively ;) . I'm hopeful that someone will find time to work on them after the current engine rewrite is done. But for now it's still half implemented (it bundles files together, but doesn't do anything smart with them at all). -- Alan Alpert From 416365416c at gmail.com Mon Jun 17 21:13:11 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Mon, 17 Jun 2013 12:13:11 -0700 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> Message-ID: On Mon, Jun 17, 2013 at 1:12 AM, Laszlo Papp wrote: > > > On Mon, Jun 17, 2013 at 10:24 AM, Nils Jeisecke > wrote: >> >> There also code signing to keep in mind. Even more useless with a >> bunch of unsigned script files. > > > That could be addressed on the Platform Security layer as well though and > not per application framework. It'll be more effective if it's done at the time of loading each file, which would actually need some framework integration. Otherwise the best solution is bundling everything up into one resource and signing that. So at the very least, consolidating the files will make code signing easier, like it will for deployment. -- Alan Alpert From rpgomez at uci.cu Mon Jun 17 22:31:50 2013 From: rpgomez at uci.cu (Rayner Pupo) Date: Mon, 17 Jun 2013 16:31:50 -0400 Subject: [Development] qt-project login Message-ID: <32674882.p18XuKZPi1@rpc> Hi folks, I wonder if there's any webmaster or someone else that tell me why I cant logon qt-project website, I try to create a new account, change my password but nothing works. At the time when I click the login button the site redirects me to a maintenance screen, BTW I'm fron Cuba, maybe the site is blocked for my country but I have no way to know if that is my problem. best regards. http://www.uci.cu From Simon.Hausmann at digia.com Mon Jun 17 22:32:22 2013 From: Simon.Hausmann at digia.com (Hausmann Simon) Date: Mon, 17 Jun 2013 20:32:22 +0000 Subject: [Development] URLs in QML/JS Message-ID: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> Hi, Here's one bit in QML that's been bothering me a bit, and I'd like to do something about it. But since it involves new API it requires a discussion and consensus. The problem: URLs in QML are inconsistent and hard to use. When reading a URL property (for example a C++ QObject with a property of type QURL), it is somethings wrapped as a string (when it happens so that the binding goes through the v4 interpreter), or it is wrapped as a completely opaque variant. It is hard to use, because the common things you may want to do with a url - such as inspecting the parsed portions or building a new URL - are impossible due to the lack of API. It appears that the most reliable way of for example verifying if a URL is of a certain scheme is to call toString on it and then apply a regular expression. I'd like to make URLs a better supported citizen in the world of QML's JavaScript, and it appears that a few options present themselves: (1) We could just create more or less a 1:1 API mapping of QUrl. A url object in JavaScript would continue to have a toString method, for convenient processing with functions that expect strings. But otherwise it would have properties such as scheme, authority, path. Unfortunately the formatting options of QUrl's C++ API don't seem to map very well to a JS property based API, so we'd have to stick with the defaults (PrettyDecoded?) (2) There appears to be development towards creating a specified URL JavaScript API in the world wide web. The most recent spec appears to be from the whatwg: http://url.spec.whatwg.org/ and it seems quite reasonable, as well as https://dvcs.w3.org/hg/url/raw-file/tip/Overview.html. However those are drafts and therefore likely subject to change, I think. Can anyone see a clear preference of (1) over the (2)? (1) is non-standard and likely to cause incompatibility issues in the future when integrating with third-party JS libraries. OTOH (2) may take who-knows-how-long until it finalizes. Also, would an "API addition" in that sense require a QtQml version bump (with regard to imports)? Simon From Tuukka.Turunen at digia.com Mon Jun 17 22:34:04 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Mon, 17 Jun 2013 20:34:04 +0000 Subject: [Development] qt-project login In-Reply-To: <32674882.p18XuKZPi1@rpc> References: <32674882.p18XuKZPi1@rpc> Message-ID: <1B00CEBCD57FD445BD8228C9300DAE294D838841@IT-EXMB02-HKI.it.local> Yes. sysadmin at qt-project.org -- Tuukka Rayner Pupo kirjoitti 17.6.2013 23:32: Hi folks, I wonder if there's any webmaster or someone else that tell me why I cant logon qt-project website, I try to create a new account, change my password but nothing works. At the time when I click the login button the site redirects me to a maintenance screen, BTW I'm fron Cuba, maybe the site is blocked for my country but I have no way to know if that is my problem. best regards. http://www.uci.cu _______________________________________________ Development mailing list Development at qt-project.org http://www.uci.cu -------------- next part -------------- An HTML attachment was scrubbed... URL: From 416365416c at gmail.com Mon Jun 17 23:31:42 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Mon, 17 Jun 2013 14:31:42 -0700 Subject: [Development] URLs in QML/JS In-Reply-To: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> References: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> Message-ID: On Mon, Jun 17, 2013 at 1:32 PM, Hausmann Simon wrote: > Hi, > > Here's one bit in QML that's been bothering me a bit, and I'd like to do > something about it. But since it involves new API it requires a discussion and > consensus. > > The problem: URLs in QML are inconsistent and hard to use. When reading a URL > property (for example a C++ QObject with a property of type QURL), it is > somethings wrapped as a string (when it happens so that the binding goes > through the v4 interpreter), or it is wrapped as a completely opaque variant. > It is hard to use, because the common things you may want to do with a url - > such as inspecting the parsed portions or building a new URL - are impossible > due to the lack of API. It appears that the most reliable way of for example > verifying if a URL is of a certain scheme is to call toString on it and then > apply a regular expression. As I understand it, that's the current situation in browser JS too... > I'd like to make URLs a better supported citizen in the world of QML's > JavaScript, and it appears that a few options present themselves: > > (1) We could just create more or less a 1:1 API mapping of QUrl. A url object > in JavaScript would continue to have a toString method, for convenient > processing with functions that expect strings. But otherwise it would have > properties such as scheme, authority, path. Unfortunately the formatting options of > QUrl's C++ API don't seem to map very well to a JS property based API, so we'd > have to stick with the defaults (PrettyDecoded?) > > (2) There appears to be development towards creating a specified URL JavaScript > API in the world wide web. The most recent spec appears to be from the whatwg: > http://url.spec.whatwg.org/ and it seems quite reasonable, as well as > https://dvcs.w3.org/hg/url/raw-file/tip/Overview.html. However those are drafts > and therefore likely subject to change, I think. > > > Can anyone see a clear preference of (1) over the (2)? (1) is non-standard and > likely to cause incompatibility issues in the future when integrating with > third-party JS libraries. OTOH (2) may take who-knows-how-long until it finalizes. I prefer (1), although it should ideally be a 1:1 mapping of functionality with an API designed for QML. We'll have incompatibility either way if it's a changing spec. We went with a draft spec for the QtQuick.LocalStorage API and I don't think that's compatible with how browsers implement local storage anymore. Better to add the compatibility in a separate layer/step (which we'll need anyways for browser objects). > Also, would an "API addition" in that sense require a QtQml version bump (with > regard to imports)? Unfortunately, the QtQml import is quite separate from the language version. An incompatible language change would require more than just an import version bump. But so long as the new API has a superset of String functionality and turns back into a QUrl properly when it returns to C++, either approach should be compatible (we can probably live with breaking the opaque variant case). -- Alan Alpert From dominik.holland at pelagicore.com Tue Jun 18 08:40:50 2013 From: dominik.holland at pelagicore.com (Dominik Holland) Date: Tue, 18 Jun 2013 08:40:50 +0200 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: References: Message-ID: <51C000F2.1020908@pelagicore.com> On 06/17/2013 06:38 PM, Adam Strzelecki wrote: > Hello, > > This may be a silly question, but why Qt5 is not using Mac native installer packages anymore, but own (unusual on Mac) installer application? > > Before in Qt4 there was .pkg installer, that was simply putting Qt frameworks into /Library/Frameworks and rest of the stuff into /Developer. Which is IMHO something that is pretty expected by Mac developer. Of course this could make problem for Qt4 & Qt5 coexests, that's why it is possible to enable specifying different installation target in installer .pkg. The old installers installed to /Developer because it was the way to work back in XCode 3 days (i'm not sure with the version number). The new XCode versions are now installed as normal versions and /Developer shouldn't be used anymore. > > Once of the reasons I can see there's new "qt5.patcher" installer task that simply rewrites all referenced Qt frameworks to their paths using "install_name_tool". This solves the problem when referencing framework, but this is awkward solution. > > Why not use @rpath? And make all Qt frameworks to use id of @rpath/QtNAME/Versions/VERSION/NAME, i.e. @rpath/QtCore/Versions/5/QtCore I already tried that for my own applications which comes with own Qt Libraries. The problem is, that this works for quite well for the normal Libraries but that didn't worked for me for the plugins which are loaded at run-time. Dominik From Eike.Ziller at digia.com Tue Jun 18 09:43:50 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Tue, 18 Jun 2013 07:43:50 +0000 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: References: Message-ID: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> On 17.06.2013, at 18:38, Adam Strzelecki wrote: > Hello, > > This may be a silly question, but why Qt5 is not using Mac native installer packages anymore, but own (unusual on Mac) installer application? Because we are using the same installer framework for all platforms. Which has the advantage of a) less reproduced work for packaging, b) the ability to at some point provide online updates, c) probably more > Before in Qt4 there was .pkg installer, that was simply putting Qt frameworks into /Library/Frameworks and rest of the stuff into /Developer. Which is IMHO something that is pretty expected by Mac developer. Of course this could make problem for Qt4 & Qt5 coexests, that's why it is possible to enable specifying different installation target in installer .pkg. /Developer does no longer exists since some Xcode versions, so there is no standard install location for "development tools" anymore. > Once of the reasons I can see there's new "qt5.patcher" installer task that simply rewrites all referenced Qt frameworks to their paths using "install_name_tool". This solves the problem when referencing framework, but this is awkward solution. > > Why not use @rpath? And make all Qt frameworks to use id of @rpath/QtNAME/Versions/VERSION/NAME, i.e. @rpath/QtCore/Versions/5/QtCore > > Anyway pre-built SDKs come in 64-bit flavor on Mac, so they will run need at least Leopard 10.5 where @rpath is supported. I already talked to Morten about that a while ago, and there's probably nothing preventing us from switching to using @rpath, since Qt 5 no longer supports the older platforms that don't have it. The installer would still need to patch the installed Qt though, because qmake and QtCore have paths hardcoded / compiled into them (e.g. the paths returned from QLibraryInfo::location). That was only not necessary for the Qt4 installers because they were installed into a predefined location. You could *not* change the install path in the Qt4 installers. Br, Eike > Just to have a reference I've created bug entry for that: > > https://bugreports.qt-project.org/browse/QTBUG-31814 > > Best regards, > -- > Adam Strzelecki | nanoant.com | twitter.com/nanoant > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From Lars.Knoll at digia.com Tue Jun 18 10:15:57 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Tue, 18 Jun 2013 08:15:57 +0000 Subject: [Development] Removing the use of 'register' In-Reply-To: <6594600.K2k6cLfzKQ@gargamel> Message-ID: On 15.06.13 10:49, "Olivier Goffart" wrote: >On Saturday 15 June 2013 00:59:18 Giuseppe D'Angelo wrote: >> On 15 June 2013 00:37, Thiago Macieira >>wrote: >> > C++11 did not change the meaning of the keyword. This is a completely >> > made-up warning by Clang, like the GCC warning that says const in >>prvalue >> > return types makes no sense or the one telling you to use () around && >> > with ||. >> No, "register" is officially deprecated (N3337 §D.2 [depr.register]), >> so the warning "makes sense". My concern was about getting such >> warnings from code we don't have control upon, that is, 3rdparty code >> (qtbase/3rdparty, webkit, v8...) > >We need to remove 'register' in our code. Especially in public headers. > >For third party code such as v8 or webkit, it does not make sens to patch >those project for that (But we could submit patches upstream, if we >really >want to.) I'm in favour os simply removing all usages. I don't think register makes sense anymore with today's compilers, and I can't see a valid reason for us to use it in our code. Cheers, Lars From stephen.kelly at kdab.com Tue Jun 18 11:30:51 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Tue, 18 Jun 2013 11:30:51 +0200 Subject: [Development] New installers available In-Reply-To: <2994952.1mNEtk2tTO@hal> References: <2994952.1mNEtk2tTO@hal> Message-ID: <1497162.svMElf08R8@hal> On Friday, June 14, 2013 14:33:02 Stephen Kelly wrote: > On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: > > Hi all! > > > > Last night we succeed to create new packages with updated content(based on > > qt5.git from yesterday) and now we are really close to Qt5.1 RC1. > > According > > to our understanding these two changes are still needed before we can > > create final RC1 packages but does anyone know something else which really > > needs to be in before we can make the release candidate? > > This one: > > https://codereview.qt-project.org/#change,58667 > > Without it, no one using CMake can test the package on windows. I see that the RC1 has been tagged. The tag is the commit just before the above change was integrated. So, the cmake files are dead on arrival on Windows in the RC1. Nice one guys. Why ask the question for what needs to be in if you're not going to react to the answer? Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From Jani.Heikkinen at digia.com Tue Jun 18 11:34:07 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Tue, 18 Jun 2013 09:34:07 +0000 Subject: [Development] Qt 5.1 release candidate out Message-ID: Hi All, We have now released Qt 5.1 release candidate, see https://blog.qt.digia.com/blog/2013/06/18/qt-5-1-release-candidate-available/ Big thanks for everyone involved! Let's now continue our effort to get final out during next few weeks. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From karsten.heimrich at digia.com Tue Jun 18 12:29:56 2013 From: karsten.heimrich at digia.com (Karsten Heimrich) Date: Tue, 18 Jun 2013 12:29:56 +0200 Subject: [Development] rationale/justification for bundled clucene library (in qttools src/assistant/3rdparty/) In-Reply-To: References: Message-ID: <51C036A4.5080608@digia.com> Hi, On 14.06.2013 10:27, Robert Knight wrote: > On a related note, if anyone finds the time I think it would be worth > looking at replacing Clucene with SQLite's full text search. It is > simpler in many respects - you can use the existing Qt SQLite API, the > search DB is a single file, it is more robust against corruption and > it would make for one less dependency. > > Regards, > Rob. > > On 13 June 2013 20:07, Rex Dieter wrote: >> Working my way through fedora package reviews for qt5 bits, and a concern >> was raised over the bundling of clucene in qttools assistant. >> >> What's the rationale or justification for this (versus using a system >> clucene library)? >> >> My naive attempt to patch to use system clucene fails, >> http://rdieter.fedorapeople.org/rpms/qt5/qttools-opensource-src-5.0.2-system_clucene.patch >> but that may well be part of the reason why it cannot be used. >> >> -- rex while I'm all for it, either use the system CLucene or replace the full text search with a sqlite backend, I'm sorry to say that I right now lack the time to do this. Still I'm open for patches and improvements regarding Clucene. -- Karsten From ono at java.pl Tue Jun 18 12:44:22 2013 From: ono at java.pl (Adam Strzelecki) Date: Tue, 18 Jun 2013 12:44:22 +0200 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> Message-ID: Probably I am duplicating discussion at: https://bugreports.qt-project.org/browse/QTBUG-31814 but anyway it would be worth to let everyone know the insights made here. > Because we are using the same installer framework for all platforms. Which has the advantage of a) less reproduced work for packaging, b) the ability to at some point provide online updates, c) probably more Yes, that fair point. Still once we don't need any patching (see below) I don't see the point of having installer app at all, if we have Qt5.1.sdk folder in the dmg that can by dragged anywhere by the developer, this makes the maintenance even easier :> > /Developer does no longer exists since some Xcode versions, so there is no standard install location for "development tools" anymore. I agree. Apple dropped /Developer because Xcode.app is now self contained app, which resolved long-standing problem with uninstallation and managing multiple Xcode version, now you just drag Xcode.app to trash. > I already talked to Morten about that a while ago, and there's probably nothing preventing us from switching to using @rpath, since Qt 5 no longer supports the older platforms that don't have it. Great to hear that. > The installer would still need to patch the installed Qt though, because qmake and QtCore have paths hardcoded / compiled into them (e.g. the paths returned from QLibraryInfo::location). That was only not necessary for the Qt4 installers because they were installed into a predefined location. You could *not* change the install path in the Qt4 installers. Ad detailed at https://bugreports.qt-project.org/browse/QTBUG-31814#comment-206336 I don't see any reason that qmake and QtCore could not use paths relative to current executable rather than hardcoding absolute paths. This together with @rpath will make both SDK and Qt apps work well regardless where user puts them or moves them afterwards and follow platform specific app directory layout. Also this would resolve https://bugreports.qt-project.org/browse/QTBUG-29550 Cheers, -- Adam From Tuukka.Turunen at digia.com Tue Jun 18 12:51:07 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Tue, 18 Jun 2013 10:51:07 +0000 Subject: [Development] New installers available In-Reply-To: <1497162.svMElf08R8@hal> References: <2994952.1mNEtk2tTO@hal> <1497162.svMElf08R8@hal> Message-ID: <1B00CEBCD57FD445BD8228C9300DAE294D838E77@IT-EXMB02-HKI.it.local> Hi, That change was unfortunately merged too late to be included to RC. It will be in the RC2 / 5.1.0 final. Yours, -- Tuukka Stephen Kelly kirjoitti 18.6.2013 11:31: On Friday, June 14, 2013 14:33:02 Stephen Kelly wrote: > On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: > > Hi all! > > > > Last night we succeed to create new packages with updated content(based on > > qt5.git from yesterday) and now we are really close to Qt5.1 RC1. > > According > > to our understanding these two changes are still needed before we can > > create final RC1 packages but does anyone know something else which really > > needs to be in before we can make the release candidate? > > This one: > > https://codereview.qt-project.org/#change,58667 > > Without it, no one using CMake can test the package on windows. I see that the RC1 has been tagged. The tag is the commit just before the above change was integrated. So, the cmake files are dead on arrival on Windows in the RC1. Nice one guys. Why ask the question for what needs to be in if you're not going to react to the answer? Thanks, -- Stephen Kelly > | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- An HTML attachment was scrubbed... URL: From stephen.kelly at kdab.com Tue Jun 18 14:07:47 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Tue, 18 Jun 2013 14:07:47 +0200 Subject: [Development] New installers available In-Reply-To: <1B00CEBCD57FD445BD8228C9300DAE294D838E77@IT-EXMB02-HKI.it.local> References: <1497162.svMElf08R8@hal> <1B00CEBCD57FD445BD8228C9300DAE294D838E77@IT-EXMB02-HKI.it.local> Message-ID: <1589848.HLhgL9DC6x@hal> On Tuesday, June 18, 2013 10:51:07 Turunen Tuukka wrote: > That change was unfortunately merged too late to be included to RC. It will > be in the RC2 / 5.1.0 final. Hi there, That's not a very good answer. Anyone want to try again? Given that the question was asked, and given that I answered it within a few hours, why was there no response along the lines of 'we don't care about your change and we're going to ignore it', so that I could call such a response unreasonable, and reiterate that the patch is important? > On Friday, June 14, 2013 14:33:02 Stephen Kelly wrote: > > On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: > > > does anyone know something else which > > > really > > > needs to be in before we can make the release candidate? > > This one: > > https://codereview.qt-project.org/#change,58667 Given that the question was asked, was any answer actually wanted? Given that there was no response, was the answer actually seen? Given that there was an answer, why didn't it block the RC? Given that there was an answer, was it discussed? Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From Lars.Knoll at digia.com Tue Jun 18 15:16:42 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Tue, 18 Jun 2013 13:16:42 +0000 Subject: [Development] New installers available In-Reply-To: <1589848.HLhgL9DC6x@hal> Message-ID: Hi Stephen, I think there should have been an answer on the list to the concern. But having said that I don't think this should have blocked the RC. It's something we can put into the known issues section on the wiki. And IMO it was really important to finally get the RC out. Cheers, Lars On 18.06.13 14:07, "Stephen Kelly" wrote: >On Tuesday, June 18, 2013 10:51:07 Turunen Tuukka wrote: >> That change was unfortunately merged too late to be included to RC. It >>will >> be in the RC2 / 5.1.0 final. > >Hi there, > >That's not a very good answer. Anyone want to try again? > >Given that the question was asked, and given that I answered it within a >few >hours, why was there no response along the lines of 'we don't care about >your >change and we're going to ignore it', so that I could call such a >response >unreasonable, and reiterate that the patch is important? > >> On Friday, June 14, 2013 14:33:02 Stephen Kelly wrote: >> > On Friday, June 14, 2013 11:52:37 Heikkinen Jani wrote: >> > > does anyone know something else which >> > > really >> > > needs to be in before we can make the release candidate? >> > This one: >> > https://codereview.qt-project.org/#change,58667 > > > >Given that the question was asked, was any answer actually wanted? > >Given that there was no response, was the answer actually seen? > >Given that there was an answer, why didn't it block the RC? > >Given that there was an answer, was it discussed? > >Thanks, > >-- >Stephen Kelly | Software Engineer >KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company >www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 >KDAB - Qt Experts - Platform-Independent Software Solutions From jgastal at profusion.mobi Tue Jun 18 15:57:57 2013 From: jgastal at profusion.mobi (Jonas Gastal) Date: Tue, 18 Jun 2013 10:57:57 -0300 Subject: [Development] QNetworkRequest autoDecompress public API review Message-ID: In working to solve [1] I created the change [2] which was approved for merging with a note of something for later fixing. However on trying to merge it CI showed what turned out to be an issue with the compression test that was related to Thiago's comment about the usage of #ifndef QT_NO_COMPRESS on QNetworkRequest. Solving this in a satisfactory manner will require adding two new methods to QNetworkRequest, I'm thus asking for an API review. The methods would be: bool autoDecompress() const; void setAutoDecompress(bool autoDecompress); The default value for this would be true as that is what QHttpNetworkConnection does now, that way behavior will not change. The "Accept-Encoding" header would NOT be filled in by QNetworkRequest::addDefaultHeaders() but rather by the HTTP implementation in use(normally QHttpNetworkConnection) taking in consideration the following: - If the users sets an "Accept-Encoding" header auto decompress is set to false; - If the user has request auto decompress not be done, "Accept-Encoding" is not set; - If the user has requested auto decompress be done, the HTTP implementation can set the "Accept-Encoding" to whatever values it can handle decompressing. If the HTTP implementation doesn't support any compression(for example our internal implementation when compiled with QT_NO_COMPRESSS) and the user requests auto decompress, the HTTP implementation will just silently set "Accept-Encoding" as "identity" and the user will have lost some performance but his program will not break. Does this look ok? [1] http://bugreports.qt-project.org/browse/QTBUG-9463 [2]https://codereview.qt-project.org/47395 -------------- next part -------------- An HTML attachment was scrubbed... URL: From stephen.kelly at kdab.com Tue Jun 18 16:01:52 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Tue, 18 Jun 2013 16:01:52 +0200 Subject: [Development] New installers available In-Reply-To: References: Message-ID: <1598864.vFymyYnsfE@hal> On Tuesday, June 18, 2013 13:16:42 you wrote: > Hi Stephen, > > I think there should have been an answer on the list to the concern. Yes. There's no point in posing such questions if the answers are ignored. Do you think it's important to ask for a list of important patches at all, or should we just forego that entirely? Not asking would probably help get an RC out sooner. > But having said that I don't think this should have blocked the RC. Is that the kind of claim that should be debated on a case-by-case basis? Is that what you intend to ensure happens in the future (ensuring that there is time for such discussion, and that the discussion happens)? Or do you want to be more clear on what is and is not a release blocking issue? Is it always just your call? Then why ask for a list of important patches? You say that completely non-working cmake files is not a blocker for the RC. Qt 5.0.0 was also released (to the surprise of many and to my embarassment, despite raising it as an issue) with broken cmake files. Now the 5.1.0 RC1 is released with cmake files embarassingly completely non-working on Windows. The brokenness was not discovered by CI because the build tree is so very different from the install tree. This relates to the removal of the dlls from the lib directory, which happened recently. Unfortunately, it seems that buildsystem changes are very common very late into the release cycle. You seem to want to ensure that I have no time to check whether such changes break the cmake files entirely. What is your position on whether completely broken cmake files block the 5.1.0 final release? Consider that such problems are always fixed very quickly when discovered. The only delay with the patch I linked to was due to the CI system. > It's > something we can put into the known issues section on the wiki. And IMO it > was really important to finally get the RC out. That's a very obvious position for you to take. What causes you to consider 'release as soon as possible, no matter what' over one extra day to take a patch noted as important, after a list of such patches was requested? What are the particular issues that prevented releasing the RC two weeks ago? What is in-scope for legitimate quality-concerns, in your view? Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From loaden at gmail.com Tue Jun 18 16:21:55 2013 From: loaden at gmail.com (Yuchen Deng) Date: Tue, 18 Jun 2013 22:21:55 +0800 Subject: [Development] New installers available In-Reply-To: <1598864.vFymyYnsfE@hal> References: <1598864.vFymyYnsfE@hal> Message-ID: I totally support Stephen point! you are not alone! BTW, It's seems I discovered the problem, and say the `lib/Qt*.dll` can be safety delete. It will broken CMake build just in recently. but seems nobody care. I don't know how to search in the list, so pls just ignored what I say. anyway, it's done. and we have to move on. 2013/6/18 Stephen Kelly > On Tuesday, June 18, 2013 13:16:42 you wrote: > > Hi Stephen, > > > > I think there should have been an answer on the list to the concern. > > Yes. There's no point in posing such questions if the answers are ignored. > > Do you think it's important to ask for a list of important patches at all, > or > should we just forego that entirely? Not asking would probably help get an > RC > out sooner. > > > But having said that I don't think this should have blocked the RC. > > Is that the kind of claim that should be debated on a case-by-case basis? > Is > that what you intend to ensure happens in the future (ensuring that there > is > time for such discussion, and that the discussion happens)? > > Or do you want to be more clear on what is and is not a release blocking > issue? Is it always just your call? Then why ask for a list of important > patches? > > You say that completely non-working cmake files is not a blocker for the > RC. > Qt 5.0.0 was also released (to the surprise of many and to my embarassment, > despite raising it as an issue) with broken cmake files. Now the 5.1.0 RC1 > is > released with cmake files embarassingly completely non-working on Windows. > > The brokenness was not discovered by CI because the build tree is so very > different from the install tree. This relates to the removal of the dlls > from > the lib directory, which happened recently. Unfortunately, it seems that > buildsystem changes are very common very late into the release cycle. You > seem > to want to ensure that I have no time to check whether such changes break > the > cmake files entirely. > > What is your position on whether completely broken cmake files block the > 5.1.0 > final release? Consider that such problems are always fixed very quickly > when > discovered. The only delay with the patch I linked to was due to the CI > system. > > > It's > > something we can put into the known issues section on the wiki. And IMO > it > > was really important to finally get the RC out. > > That's a very obvious position for you to take. > > What causes you to consider 'release as soon as possible, no matter what' > over > one extra day to take a patch noted as important, after a list of such > patches > was requested? > > What are the particular issues that prevented releasing the RC two weeks > ago? > What is in-scope for legitimate quality-concerns, in your view? > > Thanks, > > -- > Stephen Kelly | Software Engineer > KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company > www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 > KDAB - Qt Experts - Platform-Independent Software Solutions > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -- Best Regards Yuchen -------------- next part -------------- An HTML attachment was scrubbed... URL: From Lars.Knoll at digia.com Tue Jun 18 16:34:17 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Tue, 18 Jun 2013 14:34:17 +0000 Subject: [Development] New installers available In-Reply-To: <1598864.vFymyYnsfE@hal> Message-ID: On 18.06.13 16:01, "Stephen Kelly" wrote: >On Tuesday, June 18, 2013 13:16:42 you wrote: >> Hi Stephen, >> >> I think there should have been an answer on the list to the concern. > >Yes. There's no point in posing such questions if the answers are ignored. > >Do you think it's important to ask for a list of important patches at >all, or >should we just forego that entirely? Not asking would probably help get >an RC >out sooner. That wasn't the point. What I meant above is that this should have been discussed on the ML or on IRC with a public resolution on whether this blocks or not. That hasn't happened which is IMO the bigger problem, not that the patch will only be in the RC2 or final. >> But having said that I don't think this should have blocked the RC. > >Is that the kind of claim that should be debated on a case-by-case basis? >Is >that what you intend to ensure happens in the future (ensuring that there >is >time for such discussion, and that the discussion happens)? This was my personal opinion. Again, we should have had a discussion about it. > > >Or do you want to be more clear on what is and is not a release blocking >issue? Is it always just your call? Then why ask for a list of important >patches? I actually missed that mail unfortunately and only saw it today. > >You say that completely non-working cmake files is not a blocker for the >RC. >Qt 5.0.0 was also released (to the surprise of many and to my >embarassment, >despite raising it as an issue) with broken cmake files. Now the 5.1.0 >RC1 is >released with cmake files embarassingly completely non-working on Windows. > >The brokenness was not discovered by CI because the build tree is so very >different from the install tree. This relates to the removal of the dlls >from >the lib directory, which happened recently. Unfortunately, it seems that >buildsystem changes are very common very late into the release cycle. You >seem >to want to ensure that I have no time to check whether such changes break >the >cmake files entirely. I'm pretty sure the intention wasn't to make your life difficult. > >What is your position on whether completely broken cmake files block the >5.1.0 >final release? Consider that such problems are always fixed very quickly >when >discovered. The only delay with the patch I linked to was due to the CI >system. IMO this should really be fixed for the final. What I meant above is that we should currently rather get the RC out, because we need the feedback in time before everybody leaves on vacation. We had the problem last summer and not getting the release out before the summer break delayed 5.0 significantly. > >> It's >> something we can put into the known issues section on the wiki. And IMO >>it >> was really important to finally get the RC out. > >That's a very obvious position for you to take. > >What causes you to consider 'release as soon as possible, no matter what' >over >one extra day to take a patch noted as important, after a list of such >patches >was requested? Again, see above. It should have been discussed. But at some point we simply need to get something out, simply because it it will help us more then waiting further. The main problem is that getting this in would have required another submodule update (containing also many other patches), and we've seen before that this can easily lead to more then a day in delays. > >What are the particular issues that prevented releasing the RC two weeks >ago? >What is in-scope for legitimate quality-concerns, in your view? I wish there was a simple answer to that. But there isn't and it'll always be somewhat subjective as to how important a certain bug fix is. Cheers, Lars From stephen.kelly at kdab.com Tue Jun 18 16:44:39 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Tue, 18 Jun 2013 16:44:39 +0200 Subject: [Development] New installers available In-Reply-To: References: Message-ID: <9166131.FAVOdD0YbF@hal> On Tuesday, June 18, 2013 14:34:17 you wrote: > On 18.06.13 16:01, "Stephen Kelly" wrote: > >On Tuesday, June 18, 2013 13:16:42 you wrote: > >> Hi Stephen, > >> > >> I think there should have been an answer on the list to the concern. > > > >Yes. There's no point in posing such questions if the answers are ignored. > > > >Do you think it's important to ask for a list of important patches at > >all, or > >should we just forego that entirely? Not asking would probably help get > >an RC > >out sooner. > > That wasn't the point. What I meant above is that this should have been > discussed on the ML or on IRC with a public resolution on whether this > blocks or not. > > That hasn't happened which is IMO the bigger problem, not that the patch > will only be in the RC2 or final. Yes. I fully agree. > > >> But having said that I don't think this should have blocked the RC. > > > >Is that the kind of claim that should be debated on a case-by-case basis? > >Is > >that what you intend to ensure happens in the future (ensuring that there > >is > >time for such discussion, and that the discussion happens)? > > This was my personal opinion. Again, we should have had a discussion about > it. I was more trying to figure out with the above and below paragraph if you think things like this should be resolved on a case-by-case basis, or based on a policy? > The main problem is that getting this in would have required another > submodule update (containing also many other patches), and we've seen > before that this can easily lead to more then a day in delays. Yes. However, qt5.git has contained a submodule update with this patch since yesterday afternoon. The only remaining task is to roll updated packages, which seems far less problematic/flaky than CI. Thanks for your answers! -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From Tuukka.Turunen at digia.com Tue Jun 18 16:50:29 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Tue, 18 Jun 2013 14:50:29 +0000 Subject: [Development] New installers available In-Reply-To: <9166131.FAVOdD0YbF@hal> Message-ID: On 18.6.2013 17.44, "Stephen Kelly" wrote: > >However, qt5.git has contained a submodule update with this patch since >yesterday afternoon. The only remaining task is to roll updated packages, >which seems far less problematic/flaky than CI. There are actually quite many steps to take also for the packaging, getting all needed packages to build, check that they are ok, update online repositories etc etc after the submodule update has been completed. Most of these are automated, but there is also significant amount of manual work involved. The fact that we cover a very large number of different platforms and configurations as well as alternate ways of distribution brings a lot of value for the users, but it also adds a lot to the effort needed to deploy a successful release. Yours, Tuukka From simon.hausmann at digia.com Tue Jun 18 16:54:54 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Tue, 18 Jun 2013 16:54:54 +0200 Subject: [Development] QNetworkRequest autoDecompress public API review In-Reply-To: References: Message-ID: <1736427.vFBEsHjYHr@rhea> On Tuesday 18. June 2013 10.57.57 Jonas Gastal wrote: > In working to solve [1] I created the change [2] which was approved for > merging with a note of something for later fixing. However on trying to > merge it CI showed what turned out to be an issue with the compression test > that was related to Thiago's comment about the usage of #ifndef > QT_NO_COMPRESS on QNetworkRequest. > > Solving this in a satisfactory manner will require adding two new methods > to QNetworkRequest, I'm thus asking for an API review. The methods would be: > > bool autoDecompress() const; > void setAutoDecompress(bool autoDecompress); I'm not sure a verb is a good idea for a C++ property name, for example req->autoDecompress() reads like it would _do_ something, when it's actually just a getter. Does this have to be a standalone property, or would it fit into the Attribute enum? Alternatively, perhaps the "is" prefix could be used here? Simon > The default value for this would be true as that is what > QHttpNetworkConnection does now, that way behavior will not change. The > "Accept-Encoding" header would NOT be filled in by > QNetworkRequest::addDefaultHeaders() but rather by the HTTP implementation > in use(normally QHttpNetworkConnection) taking in consideration the > following: > - If the users sets an "Accept-Encoding" header auto decompress is set to > false; > - If the user has request auto decompress not be done, "Accept-Encoding" > is not set; > - If the user has requested auto decompress be done, the HTTP > implementation can set the "Accept-Encoding" to whatever values it can > handle decompressing. > > If the HTTP implementation doesn't support any compression(for example our > internal implementation when compiled with QT_NO_COMPRESSS) and the user > requests auto decompress, the HTTP implementation will just silently set > "Accept-Encoding" as "identity" and the user will have lost some > performance but his program will not break. > > Does this look ok? > > [1] http://bugreports.qt-project.org/browse/QTBUG-9463 > [2]https://codereview.qt-project.org/47395 From markus at woboq.com Tue Jun 18 16:57:37 2013 From: markus at woboq.com (Markus Goetz) Date: Tue, 18 Jun 2013 16:57:37 +0200 Subject: [Development] QNetworkRequest autoDecompress public API review In-Reply-To: <1736427.vFBEsHjYHr@rhea> References: <1736427.vFBEsHjYHr@rhea> Message-ID: <51C07561.3070503@woboq.com> On 18.06.13 16:54, Simon Hausmann wrote: > On Tuesday 18. June 2013 10.57.57 Jonas Gastal wrote: >> >> bool autoDecompress() const; >> void setAutoDecompress(bool autoDecompress); > I'm not sure a verb is a good idea for a C++ property name, for example > req->autoDecompress() reads like it would _do_ something, when it's actually > just a getter. > > Does this have to be a standalone property, or would it fit into the Attribute > enum? Alternatively, perhaps the "is" prefix could be used here? > > I'd also vote for a QNetworkRequest attribute. Let's not have too many symbols in the classes. Maybe even make the name more specific by having "HTTP" inside it? And maybe with "should" since it is for the request, "is" sounds like a fact that is already decided. From phartmann at blackberry.com Tue Jun 18 16:58:11 2013 From: phartmann at blackberry.com (Peter Hartmann) Date: Tue, 18 Jun 2013 16:58:11 +0200 Subject: [Development] QNetworkRequest autoDecompress public API review In-Reply-To: <1736427.vFBEsHjYHr@rhea> References: <1736427.vFBEsHjYHr@rhea> Message-ID: <51C07583.4070505@blackberry.com> On 06/18/2013 04:54 PM, Simon Hausmann wrote: > I'm not sure a verb is a good idea for a C++ property name, for example > req->autoDecompress() reads like it would_do_ something, when it's actually > just a getter. > > Does this have to be a standalone property, or would it fit into the Attribute > enum? Alternatively, perhaps the "is" prefix could be used here? actually my personal preference would also be an enum value enabled via setAttribute(), because that is how we control other features as well (pipelining, caching, cookies...). Peter --------------------------------------------------------------------- This transmission (including any attachments) may contain confidential information, privileged material (including material protected by the solicitor-client or other applicable privileges), or constitute non-public information. Any use of this information by anyone other than the intended recipient is prohibited. If you have received this transmission in error, please immediately reply to the sender and delete this information from your system. Use, dissemination, distribution, or reproduction of this transmission by unintended recipients is not authorized and may be unlawful. From thiago.macieira at intel.com Tue Jun 18 18:26:59 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 18 Jun 2013 09:26:59 -0700 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> Message-ID: <2951947.7JdxCA8aUo@tjmaciei-mobl2> On terça-feira, 18 de junho de 2013 12.44.22, Adam Strzelecki wrote: > Ad detailed at > https://bugreports.qt-project.org/browse/QTBUG-31814#comment-206336 I don't > see any reason that qmake and QtCore could not use paths relative to > current executable rather than hardcoding absolute paths. That might work for when QtCore is bundled with the executable, but it doesn't if QtCore is still installed system-wide and the executable (your application) is somewhere else completely. How will it find the plugins? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From alan.ezust at gmail.com Tue Jun 18 20:32:03 2013 From: alan.ezust at gmail.com (Alan Ezust) Date: Tue, 18 Jun 2013 11:32:03 -0700 Subject: [Development] URLs in QML/JS In-Reply-To: References: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> Message-ID: On Mon, Jun 17, 2013 at 2:31 PM, Alan Alpert <416365416c at gmail.com> wrote: > On Mon, Jun 17, 2013 at 1:32 PM, Hausmann Simon > wrote: > > I'd like to make URLs a better supported citizen in the world of QML's > > JavaScript, and it appears that a few options present themselves: > > > > (1) We could just create more or less a 1:1 API mapping of QUrl. A url > object > > in JavaScript would continue to have a toString method, for convenient > > processing with functions that expect strings. But otherwise it would > have > > properties such as scheme, authority, path. Unfortunately the formatting > options of > > QUrl's C++ API don't seem to map very well to a JS property based API, > so we'd > > have to stick with the defaults (PrettyDecoded?) > > > > (2) There appears to be development towards creating a specified URL > JavaScript > > API in the world wide web. The most recent spec appears to be from the > whatwg: > > http://url.spec.whatwg.org/ and it seems quite reasonable, as well as > > https://dvcs.w3.org/hg/url/raw-file/tip/Overview.html. However those > are drafts > > and therefore likely subject to change, I think. > > > > > > Can anyone see a clear preference of (1) over the (2)? (1) is > non-standard and > > likely to cause incompatibility issues in the future when integrating > with > > third-party JS libraries. OTOH (2) may take who-knows-how-long until it > finalizes. > > I prefer (1), although it should ideally be a 1:1 mapping of > functionality with an API designed for QML. We'll have incompatibility > either way if it's a changing spec. We went with a draft spec for the > QtQuick.LocalStorage API and I don't think that's compatible with how > browsers implement local storage anymore. Better to add the > compatibility in a separate layer/step (which we'll need anyways for > browser objects). > I agree, I'd like to see QUrl (as well as a few other Qt types) in QML with APIs as close to the Qt APIs as possible. Don't worry about conforming to a standard javascript API until there is one. Another type I'd like to see in QML is the QTimer type, with notify properties and all. -------------- next part -------------- An HTML attachment was scrubbed... URL: From lpapp at kde.org Tue Jun 18 20:52:58 2013 From: lpapp at kde.org (Laszlo Papp) Date: Tue, 18 Jun 2013 21:52:58 +0300 Subject: [Development] a bit big change in qtquickcontrols recently In-Reply-To: References: <325F0BE3-867B-4F5A-8039-2C1BB1FD49DB@digia.com> Message-ID: On Mon, Jun 17, 2013 at 10:13 PM, Alan Alpert <416365416c at gmail.com> wrote: > It'll be more effective if it's done at the time of loading each file, > which would actually need some framework integration. Otherwise the > best solution is bundling everything up into one resource and signing > that. So at the very least, consolidating the files will make code > signing easier, like it will for deployment. > Security is not about easier for me, but safer. Anyway, I think bundled or not should be secure enough in the long future eventually on the platforms available. Admittedly, it is very hard to reach that state. Laszlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From ono at java.pl Tue Jun 18 21:31:44 2013 From: ono at java.pl (Adam Strzelecki) Date: Tue, 18 Jun 2013 21:31:44 +0200 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: <2951947.7JdxCA8aUo@tjmaciei-mobl2> References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> <2951947.7JdxCA8aUo@tjmaciei-mobl2> Message-ID: <56451847-2F2E-4D82-9CB9-63411E370277@java.pl> > That might work for when QtCore is bundled with the executable, but it doesn't > if QtCore is still installed system-wide and the executable (your application) > is somewhere else completely. How will it find the plugins? I am perfectly aware than on some platforms it isn't possible to get path for the executable, requires messing with /proc or it may not even exists. That's why I all stuff below applies to OSX, and maybe can be brought to Windows. As a full-time Mac developer I may be biased towards way of OSX, but I think there's something wrong conceptually with Qt Mac frameworks architecture. Basically Qt Mac SDK looks like a mixture of contradictory OSX and UNIX concepts, where UNIX libraries use compile time "prefix" (/usr /usr/local /opt /sw), Mac frameworks never expect their location to be some particular path. So if libqcocoa.dylib is QtWidgets.framework plugin which is a Mac framework, it may be better idea to keep it as QtWidgets.framework/Version/5/PlugIns/Cocoa.bundle/Contents/MacOS/Cocoa. IMHO Some.app/Contents/PlugIns is reserved for application plugins not for their frameworks. This also applies to Qt built-in translations that should be in framework Resources etc. etc. So all frameworks know where to look for their plugins translations, etc. etc. because they're carried with them. Finally Qt SDK would be just a bunch of frameworks you can (selectively) link to, move around, copy to your app bundle, w/o any extra path tweaking. SDK could be just dmg package of: Qt5.1.sdk: Samples/ Frameworks/ QT Creator.app If one don't need some features in the app they can be stripped away from particular framework, i.e. removing Headers/, particular translations in Resources/, particular widget backends in QtWidgets PlugIns/. What would be even more cool is to put the "moc", "qmake" tools into QtCore.framework/Versions/5/Support (symlinked to QtCore.framework/Support). Altogether this would make Qt SDK 100% OSX friendly. No need for installers, just add QtCore.framework/Versions/5/Support if you want use command line tools or symlink them to /usr/local/bin Some examples taken from my box: $ ls -l `which ruby` lrwxr-xr-x 1 root wheel 76 26 lip 2012 /usr/bin/ruby -> ../../System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby $ ls -l `which java` lrwxr-xr-x 1 root wheel 74 17 kwi 18:17 /usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java Regards, -- Adam Strzelecki | nanoant.com | twitter.com/nanoant From jake.petroules at petroules.com Tue Jun 18 21:44:08 2013 From: jake.petroules at petroules.com (Jake Thomas Petroules) Date: Tue, 18 Jun 2013 15:44:08 -0400 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: <56451847-2F2E-4D82-9CB9-63411E370277@java.pl> References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> <2951947.7JdxCA8aUo@tjmaciei-mobl2> <56451847-2F2E-4D82-9CB9-63411E370277@java.pl> Message-ID: I like this idea very much and think we should look into it further. There is a long way we can go with integrating Qt into Apple platforms better at every level and this would be a great start. -- Jake Petroules Chief Technology Officer Petroules Corporation · www.petroules.com Email: jake.petroules at petroules.com On Jun 18, 2013, at 3:31 PM, Adam Strzelecki wrote: >> That might work for when QtCore is bundled with the executable, but it doesn't >> if QtCore is still installed system-wide and the executable (your application) >> is somewhere else completely. How will it find the plugins? > > I am perfectly aware than on some platforms it isn't possible to get path for the executable, requires messing with /proc or it may not even exists. That's why I all stuff below applies to OSX, and maybe can be brought to Windows. > > As a full-time Mac developer I may be biased towards way of OSX, but I think there's something wrong conceptually with Qt Mac frameworks architecture. > > Basically Qt Mac SDK looks like a mixture of contradictory OSX and UNIX concepts, where UNIX libraries use compile time "prefix" (/usr /usr/local /opt /sw), Mac frameworks never expect their location to be some particular path. > > So if libqcocoa.dylib is QtWidgets.framework plugin which is a Mac framework, it may be better idea to keep it as QtWidgets.framework/Version/5/PlugIns/Cocoa.bundle/Contents/MacOS/Cocoa. IMHO Some.app/Contents/PlugIns is reserved for application plugins not for their frameworks. > > This also applies to Qt built-in translations that should be in framework Resources etc. etc. > > So all frameworks know where to look for their plugins translations, etc. etc. because they're carried with them. > > Finally Qt SDK would be just a bunch of frameworks you can (selectively) link to, move around, copy to your app bundle, w/o any extra path tweaking. SDK could be just dmg package of: > Qt5.1.sdk: > Samples/ > Frameworks/ > QT Creator.app > > If one don't need some features in the app they can be stripped away from particular framework, i.e. removing Headers/, particular translations in Resources/, particular widget backends in QtWidgets PlugIns/. > > What would be even more cool is to put the "moc", "qmake" tools into QtCore.framework/Versions/5/Support (symlinked to QtCore.framework/Support). > > Altogether this would make Qt SDK 100% OSX friendly. No need for installers, just add QtCore.framework/Versions/5/Support if you want use command line tools or symlink them to /usr/local/bin > > Some examples taken from my box: > > $ ls -l `which ruby` > lrwxr-xr-x 1 root wheel 76 26 lip 2012 /usr/bin/ruby -> ../../System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby > $ ls -l `which java` > lrwxr-xr-x 1 root wheel 74 17 kwi 18:17 /usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java > > Regards, > -- > Adam Strzelecki | nanoant.com | twitter.com/nanoant > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From qt.mirror.bot at gmail.com Tue Jun 18 22:24:50 2013 From: qt.mirror.bot at gmail.com (Mirror Bot Qt) Date: Tue, 18 Jun 2013 22:24:50 +0200 Subject: [Development] Git mirror in github? In-Reply-To: References: Message-ID: How to checkout qt5 and etc from github $ git clone git at github.com:qtproject/qt5.git $ cd qt5 $ ./init-repository -f --no-webkit --mirror git at github.com:qtproject Cheers, Qt Mirror Bot https://github.com/qtproject/ -------------- next part -------------- An HTML attachment was scrubbed... URL: From raul at innovaatik.ee Tue Jun 18 22:28:22 2013 From: raul at innovaatik.ee (Raul Metsma) Date: Tue, 18 Jun 2013 23:28:22 +0300 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: <56451847-2F2E-4D82-9CB9-63411E370277@java.pl> References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> <2951947.7JdxCA8aUo@tjmaciei-mobl2> <56451847-2F2E-4D82-9CB9-63411E370277@java.pl> Message-ID: <172BD313-6760-445E-9BED-CF454F76B062@innovaatik.ee> I was also wondering why not distribute plugins in framework bundle. It is easier to deploy frameworks with final application bundle and not have to mess with plugin paths. Raul Metsma On Jun 18, 2013, at 10:31 PM, Adam Strzelecki wrote: >> That might work for when QtCore is bundled with the executable, but it doesn't >> if QtCore is still installed system-wide and the executable (your application) >> is somewhere else completely. How will it find the plugins? > > I am perfectly aware than on some platforms it isn't possible to get path for the executable, requires messing with /proc or it may not even exists. That's why I all stuff below applies to OSX, and maybe can be brought to Windows. > > As a full-time Mac developer I may be biased towards way of OSX, but I think there's something wrong conceptually with Qt Mac frameworks architecture. > > Basically Qt Mac SDK looks like a mixture of contradictory OSX and UNIX concepts, where UNIX libraries use compile time "prefix" (/usr /usr/local /opt /sw), Mac frameworks never expect their location to be some particular path. > > So if libqcocoa.dylib is QtWidgets.framework plugin which is a Mac framework, it may be better idea to keep it as QtWidgets.framework/Version/5/PlugIns/Cocoa.bundle/Contents/MacOS/Cocoa. IMHO Some.app/Contents/PlugIns is reserved for application plugins not for their frameworks. > > This also applies to Qt built-in translations that should be in framework Resources etc. etc. > > So all frameworks know where to look for their plugins translations, etc. etc. because they're carried with them. > > Finally Qt SDK would be just a bunch of frameworks you can (selectively) link to, move around, copy to your app bundle, w/o any extra path tweaking. SDK could be just dmg package of: > Qt5.1.sdk: > Samples/ > Frameworks/ > QT Creator.app > > If one don't need some features in the app they can be stripped away from particular framework, i.e. removing Headers/, particular translations in Resources/, particular widget backends in QtWidgets PlugIns/. > > What would be even more cool is to put the "moc", "qmake" tools into QtCore.framework/Versions/5/Support (symlinked to QtCore.framework/Support). > > Altogether this would make Qt SDK 100% OSX friendly. No need for installers, just add QtCore.framework/Versions/5/Support if you want use command line tools or symlink them to /usr/local/bin > > Some examples taken from my box: > > $ ls -l `which ruby` > lrwxr-xr-x 1 root wheel 76 26 lip 2012 /usr/bin/ruby -> ../../System/Library/Frameworks/Ruby.framework/Versions/Current/usr/bin/ruby > $ ls -l `which java` > lrwxr-xr-x 1 root wheel 74 17 kwi 18:17 /usr/bin/java -> /System/Library/Frameworks/JavaVM.framework/Versions/Current/Commands/java > > Regards, > -- > Adam Strzelecki | nanoant.com | twitter.com/nanoant > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From awagger at gmail.com Tue Jun 18 22:31:34 2013 From: awagger at gmail.com (Axel Waggershauser) Date: Tue, 18 Jun 2013 22:31:34 +0200 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: <1528733.QK58YtMd8l@tjmaciei-mobl2> References: <2663698.W6o0QhPuDu@tjmaciei-mobl2> <5001CAF1-A0E6-4D37-9706-4409B0A42252@innovaatik.ee> <1528733.QK58YtMd8l@tjmaciei-mobl2> Message-ID: Now that RC1 is out (without an ANGLE based mingw installer) and my question got lost somewhere along the way, I dare to repeat it: What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any plans regarding that? Thanks, Axel From alan.ezust at gmail.com Wed Jun 19 02:49:08 2013 From: alan.ezust at gmail.com (Alan Ezust) Date: Tue, 18 Jun 2013 17:49:08 -0700 Subject: [Development] URLs in QML/JS In-Reply-To: References: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> Message-ID: On Tue, Jun 18, 2013 at 11:32 AM, Alan Ezust wrote: > > Another type I'd like to see in QML is the QTimer type, with notify > properties and all. > > Oops, I forgot this is related to Cascades QML, so please ignore this line. :-) The QML Timer is great and I wish that was available in Cascades. -------------- next part -------------- An HTML attachment was scrubbed... URL: From Kai.Koehne at digia.com Wed Jun 19 08:20:00 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Wed, 19 Jun 2013 06:20:00 +0000 Subject: [Development] Qt 5.1 installers ready for testing In-Reply-To: References: <2663698.W6o0QhPuDu@tjmaciei-mobl2> <5001CAF1-A0E6-4D37-9706-4409B0A42252@innovaatik.ee> <1528733.QK58YtMd8l@tjmaciei-mobl2> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C4489@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > Subject: Re: [Development] Qt 5.1 installers ready for testing > > Now that RC1 is out (without an ANGLE based mingw installer) and my > question got lost somewhere along the way, I dare to repeat it: > > What about a windows mingw "non-opengl" (a.k.a. ANGLE) package? Any plans > regarding that? I'm not aware of any concrete plans, but your voice has been heard :) Anyhow, let's first get 5.1.0 out ... Regards Kai From stephen.kelly at kdab.com Wed Jun 19 09:21:41 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Wed, 19 Jun 2013 09:21:41 +0200 Subject: [Development] New installers available In-Reply-To: References: Message-ID: <2168239.QZJDNHHGl2@hal> On Tuesday, June 18, 2013 14:50:29 you wrote: > On 18.6.2013 17.44, "Stephen Kelly" wrote: > >However, qt5.git has contained a submodule update with this patch since > >yesterday afternoon. The only remaining task is to roll updated packages, > >which seems far less problematic/flaky than CI. > > There are actually quite many steps to take also for the packaging, > getting all needed packages to build, check that they are ok, update > online repositories etc etc after the submodule update has been completed. > Most of these are automated, but there is also significant amount of > manual work involved. > > The fact that we cover a very large number of different platforms and > configurations as well as alternate ways of distribution brings a lot of > value for the users, but it also adds a lot to the effort needed to deploy > a successful release. > I appreciate that. Thanks for the information. -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From stephen.kelly at kdab.com Wed Jun 19 09:24:38 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Wed, 19 Jun 2013 09:24:38 +0200 Subject: [Development] New installers available In-Reply-To: References: Message-ID: <1398261.bevFHuBtvj@hal> On Tuesday, June 18, 2013 14:34:17 Knoll Lars wrote: > That hasn't happened which is IMO the bigger problem, not that the patch > will only be in the RC2 or final. The problem is that if there is no RC2, then * The cmake files for that platform never get tested * The patch to fix the files on that platform never get tested So, this should be a serious enough issue to warrant an RC2 anyway. Otherwise, this 'unpredictability' is why I asked ossi this morning not to remove a workaround I made recently: https://codereview.qt-project.org/#patch,unified,59236,2,mkspecs/features/data/cmake/Qt5BasicConfig.cmake.in Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From Eike.Ziller at digia.com Wed Jun 19 09:46:55 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Wed, 19 Jun 2013 07:46:55 +0000 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> Message-ID: <8F889494-F907-4B2A-94F2-5FEF68883F8A@digia.com> On 18.06.2013, at 12:44, Adam Strzelecki wrote: > Probably I am duplicating discussion at: https://bugreports.qt-project.org/browse/QTBUG-31814 but anyway it would be worth to let everyone know the insights made here. > >> Because we are using the same installer framework for all platforms. Which has the advantage of a) less reproduced work for packaging, b) the ability to at some point provide online updates, c) probably more > > Yes, that fair point. Still once we don't need any patching (see below) I don't see the point of having installer app at all, if we have Qt5.1.sdk folder in the dmg that can by dragged anywhere by the developer, this makes the maintenance even easier :> Since Qt is huge I would claim that many people would prefer to have a component selection where they can choose what parts they'd like to omit. Sources or no sources, extra tools or not, which Qt versions for which target platforms they actually want etc. We are also working on getting online installers again, where only the parts that you selected are actually downloaded. Also the installer automatically registers all installed Qt versions with the necessary tool chains (think e.g. SDK/compiler settings for mobile platforms) in the installed Qt Creator. And I'm most certainly still missing some things why it is preferable for Qt packages to have a real installer already now or in the future, instead of just a disk image with the contents. >> /Developer does no longer exists since some Xcode versions, so there is no standard install location for "development tools" anymore. > > I agree. Apple dropped /Developer because Xcode.app is now self contained app, which resolved long-standing problem with uninstallation and managing multiple Xcode version, now you just drag Xcode.app to trash. And even though Xcode itself is now "just" an application, itself acts as an installer for additional components, like SDKs and documentation packages. The Qt installer doesn't install anything outside the installation directory, which you can also just remove to "uninstall", and installing into different directories will create independent installations that do not conflict. That said, I'm not against improving the structure of Qt/Mac regarding e.g. rpath, plugins etc, but that discussion is independent (*) of the discussion of using an installer for Qt on Mac or not. (*) in the sense of that even if there was no patching needed to make Qt work in principle without an installer, there are enough reasons to use an installer anyhow. Br, Eike >> I already talked to Morten about that a while ago, and there's probably nothing preventing us from switching to using @rpath, since Qt 5 no longer supports the older platforms that don't have it. > > Great to hear that. > >> The installer would still need to patch the installed Qt though, because qmake and QtCore have paths hardcoded / compiled into them (e.g. the paths returned from QLibraryInfo::location). That was only not necessary for the Qt4 installers because they were installed into a predefined location. You could *not* change the install path in the Qt4 installers. > > Ad detailed at https://bugreports.qt-project.org/browse/QTBUG-31814#comment-206336 I don't see any reason that qmake and QtCore could not use paths relative to current executable rather than hardcoding absolute paths. > > This together with @rpath will make both SDK and Qt apps work well regardless where user puts them or moves them afterwards and follow platform specific app directory layout. > > Also this would resolve https://bugreports.qt-project.org/browse/QTBUG-29550 > > Cheers, > -- > Adam -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From sergio.ahumada at digia.com Wed Jun 19 11:00:30 2013 From: sergio.ahumada at digia.com (Sergio Ahumada) Date: Wed, 19 Jun 2013 11:00:30 +0200 Subject: [Development] REMINDER: Module maintainers to check change logs for 5.1.0 Message-ID: <51C1732E.1030502@digia.com> Hi, I'd like to remind all modules maintainers to check that the dist/changes-5.1.0 file exists in the release branch for all repositories of modules you maintain, and also check that the content is right. Please go ahead and fix/add whatever is needed as soon as possible. Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt From ola at silentwings.no Wed Jun 19 11:28:29 2013 From: ola at silentwings.no (=?ISO-8859-1?Q?Ola_R=F8er_Thorsen?=) Date: Wed, 19 Jun 2013 11:28:29 +0200 Subject: [Development] Multimedia video playback broken in Qt 5.x for Windows WMF OpenGL version In-Reply-To: References: <51BEAE5A.10201@silentwings.no> <51BEF086.5050609@digia.com> <58A4B461-D94B-4C01-802F-E5275CA212B2@digia.com>, <51BEFB40.5020905@silentwings.no> Message-ID: <51C179BD.2020402@silentwings.no> I have done some more testing now, using the new RC1. The issue only happens using Angle, not with OpenGL. Here is my bug report, https://bugreports.qt-project.org/browse/QTBUG-31859 I've only got the one laptop with this problem, which is a bit older. The more recent ones we have work OK. I did test this with a couple of our customer's laptops, they had the same "black video" problem, so it seems to be significant enough. As noted in the bug report, OpenGL on these machines did play the video, but was unusable otherwise with too many graphical glitches (shader issues I would think). Best regards, Ola Røer Thorsen Den 2013-06-17 20:55, skrev Lopes Yoann: > "While discussing this, I also found that using the Angle-version on > "cheaper" Windows 7 laptops with Intel GPUs, the video is just black. " > > Does this happen with the OpenGL build as well? > This is not something I was aware of, you can create a bug report. > Yoann Lopes > Senior Software Engineer - Digia, Qt > Visit us on: http://qt.digia.com > ------------------------------------------------------------------------ > *From:* development-bounces+yoann.lopes=digia.com at qt-project.org > [development-bounces+yoann.lopes=digia.com at qt-project.org] on behalf > of Ola Røer Thorsen [ola at silentwings.no] > *Sent:* Monday, June 17, 2013 2:04 PM > *To:* > *Subject:* Re: [Development] Multimedia video playback broken in Qt > 5.x for Windows WMF OpenGL version > > Mitch, > thanks for the feedback! I have a Asus G74S laptop with nvidia a 560M > GPU. I've created a bug report here: > https://bugreports.qt-project.org/browse/QTBUG-31800 > > Yoann, > thanks for the information. I'll try to use Angle instead for now, but > this will become an issue once we need to use more advanced OpenGL > features. I use Qt to overlay data on top of a 3D viewer application. > > For the moment, the other issue I found last week is more important > and is valid for both the Angle and OpenGL versions, > https://bugreports.qt-project.org/browse/QTBUG-31731 > > While discussing this, I also found that using the Angle-version on > "cheaper" Windows 7 laptops with Intel GPUs, the video is just black. > There is no apparent error messages. The video appears to be playing, > but the actual texture is completely black. Same video plays back fine > in Windows Media Player on the same machines. This is partially why I > wanted to try the OpenGL-version to see if that was any better. Is > this also a known issue, or should I create an issue on the tracker > for this as well? > > Best regards, > Ola Røer Thorsen > > Den 2013-06-17 13:40, skrev Lopes Yoann: >> Hi, >> >> This is a known issue. >> >> Angle and OpenGL builds use different decoding pipelines. With Angle, >> the plugin can do hardware decoding using DXVA, while when using pure >> OpenGL it is not possible and the pipeline is setup with a custom >> video sink (software decoding) that is known to be buggy... >> >> If you can, use the Angle build. Not only you'll get better >> performance but it will also be much more stable. >> >> The problem you are reporting should probably be fixed anyway, please >> create a bug report. >> >> Yoann Lopes >> Senior Software Engineer - Digia, Qt >> Visit us on: http://qt.digia.com >> >> On Jun 17, 2013, at 1:18 PM, Mitch Curtis wrote: >> >>> On 06/17/2013 08:36 AM, Ola Røer Thorsen wrote: >>>> Hi, >>>> >>>> during developing an application which amongst other things plays back >>>> video files using the Qt 5.1 beta version on Windows 7, I've run into a >>>> serious problem with the media backend. >>>> >>>> Basically if I try to play back some video file, use "Big buck bunny" >>>> for example from here, >>>> http://www.bigbuckbunny.org/index.php/download/ , >>>> take the 854x480p h264 file (or any other for that matter). Use the >>>> CuteTime demo player from here, >>>> https://github.com/nezticle/cutetime >>>> as >>>> it shows the same issue that I get in my own player. >>>> >>>> Playback starts OK but if you let it play until 3:34, it will play in >>>> "fast-forward". Trying to seek before this happens will make the video >>>> hang. Before 3:34 there will be the occational video stutter, with this >>>> debug output appearing on the console: >>>> currentPresentTime = 102.334 and sampleTime is 102.249 >>>> >>>> This only happens using the OpenGL build, not if you use the >>>> Angle-build. The issue always happens at about 3:34 into the film, also >>>> with my own video files. I have not been able to reproduce this using >>>> one of the example players that come with Qt, it seems like it is >>>> somehow triggered by having more than just a video item on the screen >>>> using Quick2 (such as a text label with the current media position). >>>> >>>> If any of you could please try this out as well and confirm it's not >>>> just on my computer, I'll file a bug report? >>>> >>>> I've briefly looked into the WMF backend code and found that there is >>>> indeed some ifdef's concerning the use of either OpenGL or Angle. >>>> >>>> Best regards, >>>> Ola Røer Thorsen >>>> >>>> >>>> >>>> >>>> >>>> _______________________________________________ >>>> Development mailing list >>>> Development at qt-project.org >>>> http://lists.qt-project.org/mailman/listinfo/development >>>> >>> >>> Hi Ola. >>> >>> I can confirm this with the latest SDK beta on Windows 7 64-bit, so >>> please create a bug report. Which video card do you have? >>> _______________________________________________ >>> Development mailing list >>> Development at qt-project.org >>> http://lists.qt-project.org/mailman/listinfo/development >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Kai.Koehne at digia.com Wed Jun 19 12:06:10 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Wed, 19 Jun 2013 10:06:10 +0000 Subject: [Development] Heads-up: QDir::mkpath in 5.1 RC is broken on Windows Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C45BE@IT-EXMB01-HKI.it.local> Hi there, Just managed to track down a couple of seemingly independent issues with the 5.1 RC. It turns out that QDir::mkpath is broken if the directory to create isn't on the same drive as the current working directory: https://bugreports.qt-project.org/browse/QTBUG-31862 Now that we identified the issue, a fix should be ready soon. Anyhow, if you've 'weird' errors with 5.1 RC on windows, you now know what to look for :) Regards Kai PS: Will also update the known issues page for rc1 From ono at java.pl Wed Jun 19 12:34:53 2013 From: ono at java.pl (Adam Strzelecki) Date: Wed, 19 Jun 2013 12:34:53 +0200 Subject: [Development] Why custom installer on Mac, why not using @rpath? In-Reply-To: <8F889494-F907-4B2A-94F2-5FEF68883F8A@digia.com> References: <346A118B-533D-4947-A87B-BE9C53FB63DC@digia.com> <8F889494-F907-4B2A-94F2-5FEF68883F8A@digia.com> Message-ID: <9486A2C8-51EB-422B-9308-E2C0A1BE6EC8@java.pl> > Since Qt is huge I would claim that many people would prefer to have a component selection where they can choose what parts they'd like to omit. Sources or no sources, extra tools or not, (…) I think your points are very fair. Then win-win would be to keep the installer, but not compress the SDK into installers bundle "installer.dat" (applies just to Mac, where dmg provides already packaging and compression, but also random file access), but keep the SDK files there next to installer (either hidden or not), i.e.: Install Qt SDK.app Qt5.1.sdk/ - Frameworks/ - Sources/ Tools/ - Qt Creator.app/ This will also make installer.app launch quicker because no need to compute 400MB dat file signature for Gatekeeper, where anyway dmg does consistency check upon open. > That said, I'm not against improving the structure of Qt/Mac regarding e.g. rpath, plugins etc, but that discussion is independent (*) of the discussion of using an installer for Qt on Mac or not. > (*) in the sense of that even if there was no patching needed to make Qt work in principle without an installer, there are enough reasons to use an installer anyhow. Agreed. Regards, -- Adam Strzelecki | nanoant.com | twitter.com/nanoant From tmp at barmes.org Wed Jun 19 12:40:34 2013 From: tmp at barmes.org (Carmelo San Giovanni) Date: Wed, 19 Jun 2013 12:40:34 +0200 Subject: [Development] QML Video and Nvidia VDPAU Message-ID: Hi, I need to play some videos in a QML ui using hardware accelleration through NVidia's VDPAU API. VDPAU support is installed and I can use it on mplayer (with a huge cpu usage saving), with this command: mplayer -vo vdpau -vc ffh264vdpau video.mp4 Playing h264 video with native QML Video element (QtMultimediaKit), gstreamer backend says to me: "Ignoring VDPAU decoder h264_vdpau. We can't handle this outside of ffmpeg". I think I need to embed mplayer into a QML widget implementing also OpenGL support. Has someone already done the same or can just give me some advice about it? Thanks in advance. From sierdzio at gmail.com Wed Jun 19 13:31:34 2013 From: sierdzio at gmail.com (Tomasz Siekierda) Date: Wed, 19 Jun 2013 13:31:34 +0200 Subject: [Development] Qt 5.1 release candidate out In-Reply-To: References: Message-ID: On 18 June 2013 11:34, Heikkinen Jani wrote: > Hi All, > > We have now released Qt 5.1 release candidate, see > https://blog.qt.digia.com/blog/2013/06/18/qt-5-1-release-candidate-available/ > > Big thanks for everyone involved! > > Let's now continue our effort to get final out during next few weeks. > > Br, > Jani Hi, a forum user reported an error in the installer on Windows. I have created a bug report on Jira based on their input. Jira item: https://bugreports.qt-project.org/browse/QTBUG-31866 Forum thread: https://qt-project.org/forums/viewthread/29021/ Cheers, sierdzio From sscc at mweb.co.za Wed Jun 19 13:40:05 2013 From: sscc at mweb.co.za (Alex Strickland) Date: Wed, 19 Jun 2013 13:40:05 +0200 Subject: [Development] Qt 5.1 release candidate out In-Reply-To: References: Message-ID: <51C19895.7050202@mweb.co.za> On 2013/06/19 01:31 PM, Tomasz Siekierda wrote: > Hi, a forum user reported an error in the installer on Windows. I have > created a bug report on Jira based on their input. > > Jira item: https://bugreports.qt-project.org/browse/QTBUG-31866 > Forum thread: https://qt-project.org/forums/viewthread/29021/ Sounds like this: https://bugreports.qt-project.org/browse/QTBUG-31862 -- Regards Alex From Tuukka.Turunen at digia.com Wed Jun 19 13:49:11 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Wed, 19 Jun 2013 11:49:11 +0000 Subject: [Development] New installers available In-Reply-To: <1398261.bevFHuBtvj@hal> Message-ID: On 19.6.2013 10.24, "Stephen Kelly" wrote: >On Tuesday, June 18, 2013 14:34:17 Knoll Lars wrote: >> That hasn't happened which is IMO the bigger problem, not that the patch >> will only be in the RC2 or final. > >The problem is that if there is no RC2, then > >* The cmake files for that platform never get tested >* The patch to fix the files on that platform never get tested > >So, this should be a serious enough issue to warrant an RC2 anyway. Whether or not there is RC2 is for the release team to decide, but even without RC2 issued through the blog etc, there will for sure be new packages available for testing before the final. Furthermore, it is also normal process to have enough time for the final to be tested before issuing it, so it is possible to verify that things are in shape. Only thing we need to be aware of is the fact that we are close to summer vacations and in case we fail to issue 5.1.0 in the coming weeks, there is possibility for a bit longer delay due to some of the needed developers being away. Release team meetings are done via IRC, and it should be quite easy to follow those and participate the process? Yours, Tuukka From raul at innovaatik.ee Wed Jun 19 14:19:32 2013 From: raul at innovaatik.ee (Raul Metsma) Date: Wed, 19 Jun 2013 15:19:32 +0300 Subject: [Development] Qt 5.1 release candidate out In-Reply-To: References: Message-ID: <932BE5A9-DC25-4774-BA86-88ABACD54686@innovaatik.ee> One more issue. If you add after install more components with MaintenanceTool.exe then it fails to register new qt set to qtcreator. First investigation shows that it does not run qtpatcher on added component, qmake -query shows wrong paths Another note http://qt-project.org/wiki/Qt510RC1KnownIssues • The libraries in the binary installer now are compiled with c++11 support, which requires linking against libstdc++. This library is available only on 10.7 onwards it should be libc++ not libstdc++ Raul Metsma On Jun 19, 2013, at 2:31 PM, Tomasz Siekierda wrote: > On 18 June 2013 11:34, Heikkinen Jani wrote: >> Hi All, >> >> We have now released Qt 5.1 release candidate, see >> https://blog.qt.digia.com/blog/2013/06/18/qt-5-1-release-candidate-available/ >> >> Big thanks for everyone involved! >> >> Let's now continue our effort to get final out during next few weeks. >> >> Br, >> Jani > > Hi, a forum user reported an error in the installer on Windows. I have > created a bug report on Jira based on their input. > > Jira item: https://bugreports.qt-project.org/browse/QTBUG-31866 > Forum thread: https://qt-project.org/forums/viewthread/29021/ > > Cheers, > sierdzio > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From Tim.Jenssen at digia.com Wed Jun 19 15:03:14 2013 From: Tim.Jenssen at digia.com (Jenssen Tim) Date: Wed, 19 Jun 2013 13:03:14 +0000 Subject: [Development] Qt 5.1 release candidate out In-Reply-To: <932BE5A9-DC25-4774-BA86-88ABACD54686@innovaatik.ee> References: , <932BE5A9-DC25-4774-BA86-88ABACD54686@innovaatik.ee> Message-ID: <5A741CD7E24AB34A8C8DF7D446719B731593A275@IT-EXMB02-HKI.it.local> Von: Raul Metsma [raul at innovaatik.ee] Gesendet: Mittwoch, 19. Juni 2013 14:19 An: development at qt-project.org Betreff: Re: [Development] Qt 5.1 release candidate out One more issue. If you add after install more components with MaintenanceTool.exe then it fails to register new qt set to qtcreator. First investigation shows that it does not run qtpatcher on added component, qmake -query shows wrong paths ^^^ Right. Can you create a bugreport about that issue? From Simon.Hausmann at digia.com Wed Jun 19 17:26:49 2013 From: Simon.Hausmann at digia.com (Hausmann Simon) Date: Wed, 19 Jun 2013 15:26:49 +0000 Subject: [Development] URLs in QML/JS In-Reply-To: References: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> , Message-ID: Thanks Alan x2 :) Sounds like QUrl bindings are the way to go. Simon Alan Ezust wrote: On Mon, Jun 17, 2013 at 2:31 PM, Alan Alpert <416365416c at gmail.com> wrote: On Mon, Jun 17, 2013 at 1:32 PM, Hausmann Simon > wrote: > I'd like to make URLs a better supported citizen in the world of QML's > JavaScript, and it appears that a few options present themselves: > > (1) We could just create more or less a 1:1 API mapping of QUrl. A url object > in JavaScript would continue to have a toString method, for convenient > processing with functions that expect strings. But otherwise it would have > properties such as scheme, authority, path. Unfortunately the formatting options of > QUrl's C++ API don't seem to map very well to a JS property based API, so we'd > have to stick with the defaults (PrettyDecoded?) > > (2) There appears to be development towards creating a specified URL JavaScript > API in the world wide web. The most recent spec appears to be from the whatwg: > http://url.spec.whatwg.org/ and it seems quite reasonable, as well as > https://dvcs.w3.org/hg/url/raw-file/tip/Overview.html. However those are drafts > and therefore likely subject to change, I think. > > > Can anyone see a clear preference of (1) over the (2)? (1) is non-standard and > likely to cause incompatibility issues in the future when integrating with > third-party JS libraries. OTOH (2) may take who-knows-how-long until it finalizes. I prefer (1), although it should ideally be a 1:1 mapping of functionality with an API designed for QML. We'll have incompatibility either way if it's a changing spec. We went with a draft spec for the QtQuick.LocalStorage API and I don't think that's compatible with how browsers implement local storage anymore. Better to add the compatibility in a separate layer/step (which we'll need anyways for browser objects). I agree, I'd like to see QUrl (as well as a few other Qt types) in QML with APIs as close to the Qt APIs as possible. Don't worry about conforming to a standard javascript API until there is one. Another type I'd like to see in QML is the QTimer type, with notify properties and all. -------------- next part -------------- An HTML attachment was scrubbed... URL: From raul at innovaatik.ee Wed Jun 19 19:54:56 2013 From: raul at innovaatik.ee (Raul Metsma) Date: Wed, 19 Jun 2013 20:54:56 +0300 Subject: [Development] Qt 5.1 release candidate out In-Reply-To: <5A741CD7E24AB34A8C8DF7D446719B731593A275@IT-EXMB02-HKI.it.local> References: , <932BE5A9-DC25-4774-BA86-88ABACD54686@innovaatik.ee> <5A741CD7E24AB34A8C8DF7D446719B731593A275@IT-EXMB02-HKI.it.local> Message-ID: On Jun 19, 2013, at 4:03 PM, Jenssen Tim wrote: > Von: Raul Metsma [raul at innovaatik.ee] > Gesendet: Mittwoch, 19. Juni 2013 14:19 > An: development at qt-project.org > Betreff: Re: [Development] Qt 5.1 release candidate out > > One more issue. > If you add after install more components with MaintenanceTool.exe then it fails to register new qt set to qtcreator. > First investigation shows that it does not run qtpatcher on added component, qmake -query shows wrong paths > > > ^^^ > Right. Can you create a bugreport about that issue? QTBUG-31875 Raul Metsma From Jani.Heikkinen at digia.com Thu Jun 20 11:57:54 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Thu, 20 Jun 2013 09:57:54 +0000 Subject: [Development] New Qt5.1 snapshot available Message-ID: Hi all, There is new snapshot available after RC1. Unfortunately there is problems in the Linux builds and that's why only Windows & Mac offline installers are available. Fixing is ongoing, let's hope we can have all installers available tomorrow! You can download newest installers from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Below is listed changes included since RC1: Qtsdk: * QTBUG-29802: Make database plug-ins/derivers avaliable by default * QTBUG-28963: cannot unmount DMG after installing Qt OSX package and starting creator * Update installer graphics * Do not mention SDK in user visible installer texts * Change "Qt" as a name of the field in online installer qt-creator * QTCREATORBUG-9558 * AndroidRunner: Fix CheckPidTimer to not fire forever qtbase: * Android Mute and FastForward keys mapped wrong * make Makefiles not depend on .qmake.super * QTBUG-31289 fix rcc & uic .depend_commands * always $-escape make commands * QTBUG-31289 fix command over-escaping in vcproj files * assemble the tool commands at use time, after all * QTBUG-31750 OSX: Disable window restoration for the Mac color panel * QTBUG-29161 Cocoa color dialog cannot be modal, but should show anyway * QTBUG-31566 OSX color dialog can be accepted repeatedly * QTBUG-31667 network requests: do not access 1st byte of empty byte array * QTBUG-31745 Doc: Remove Tweet Search demo from the list of highlighted examples * Adjust the cmake files to find the dlls in the bin dir. * qtdeclarative: * QTBUG-31699 photosurface demo: behavior depends on initialization order * stabilize tst_touchmouse. * QFileDialogHelper: Force QWindow before setting flags. qtdoc: * Doc: Added a link to Qt Quick Controls Overview * QTBUG-31737 Document the deprecation of WFlags Qtmultimedia: * Android: Fix for uncaught java exception. * Fix for url bug in the qmlvideo examples. Qtquickcontrols: * QTBUG-31778 Doc: Fix QCH documentation structure for Qt Quick Layouts * Revert "Add qml/js files in resource files" * Doc: Fixed Qt Quick Layouts listing in qch files. * QTBUG-31565 Add qml/js files in resource files qttools * QTBUG-31153 Find the cmake version template in the install location. Qttranslations * QTBUG-31727 fix qm output dir for non-prefix builds Qtwebkit * [Qt][Mac] Disable QTKit video on OS X. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From aleixpol at kde.org Thu Jun 20 19:57:57 2013 From: aleixpol at kde.org (Aleix Pol) Date: Thu, 20 Jun 2013 19:57:57 +0200 Subject: [Development] System-wide font preferences for monospace font In-Reply-To: References: <4d920a99-158c-49a9-9e55-cbad3c8e9d8f@flaska.net> <2065002.NUq3h4afad@tjmaciei-mobl2> <22c33e39-16f2-478b-8694-edceab544cc1@flaska.net> Message-ID: On Wed, May 15, 2013 at 5:40 PM, Jan Kundrát wrote: > On Thursday, 9 May 2013 22:41:07 CEST, Jan Kundrát wrote: > > However, both KDE and Gnome's settings each include more data, > > including the font size and options like bold, italic etc. Are > > these also handled by fontconfig, so that when I ask for a > > "Monospace" I always get the font with a correct size and > > "style"? > > It doesn't seem so, based on my reading of the docs. If I am right, this > means that there is some value in having a cross-platform way of obtaining > "user's preferred fixed-width font, including the font size". For example > on this machine, I have a "DejaVu Sans 10" as the default font but > "Monospace 9", whatever it actually is, as the fixed width font. If I > relied on fontconfig, I'd get a 10pt "Monospace" which is too big for my > preferences. > > Am I right here? > > Cheers, > Jan > > -- > Trojitá, a fast Qt IMAP e-mail client -- http://trojita.flaska.net/ > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > Hi, Sorry for reviving this thread but it didn't reach any conclusion and we still need this to move forward. I'd like to add a QStandardFonts class (e.g. [1], completely open to discussion) and a FixedFont to the QPlatformThemes::Font enum. Do you guys would be interested in me working in this direction? I'd say it's interesting because it lets applications integrate with what the system is supposed to look like. Qt already is doing this for widgets internally, giving (some of) that data will definitely be useful for applications as well. Aleix [1] class QStandardFonts { public: QFont defaultFont(); QFont fixedFont(); QFont toolBarFont(); QFont menuFont(); QFont windowTitleFont(); QFont smallestReadableFont(); } -------------- next part -------------- An HTML attachment was scrubbed... URL: From alexpux at gmail.com Fri Jun 21 08:16:07 2013 From: alexpux at gmail.com (Alexey Pavlov) Date: Fri, 21 Jun 2013 09:16:07 +0300 Subject: [Development] Building Qt with MSYS Message-ID: Hi everybody! I am building Qt under MSYS. I create MSYS2 based on recent Cygwin sources and now be able to build Qt using MSYS tools (m4, flex, ruby, python, perl). All ok except I can't use msys-perl because it use bash configure script (when building from git sources) that is incomplete to build under Windows. Can it be fixed? Regards, Alexey. -------------- next part -------------- An HTML attachment was scrubbed... URL: From mabrand at mabrand.nl Fri Jun 21 10:11:14 2013 From: mabrand at mabrand.nl (Mark Brand) Date: Fri, 21 Jun 2013 10:11:14 +0200 Subject: [Development] Building Qt with MSYS In-Reply-To: References: Message-ID: <3627033.AiMxPFFe6c@hitch> > On Friday 21 June 2013 09:16:07 Alexey Pavlov wrote: > > Hi everybody! > > > I am building Qt under MSYS. I create MSYS2 based on recent Cygwin sources > and now be able to build Qt using MSYS tools (m4, flex, ruby, python, > perl). All ok except I can't use msys-perl because it use bash configure > script (when building from git sources) that is incomplete to build under > Windows. Can it be fixed? Hi Alexey, I don't know how far you can get using the configure script under MSYS or Cygwin, but it *might* work, at least for some configurations. The configure script can definitely be used for cross-compiling Qt 4 and Qt 5 on unix targeting MinGW. To get some ideas look at the src/qt*.mk sources in the MXE project http://mxe.cc. Mark From jpnurmi at digia.com Fri Jun 21 15:48:02 2013 From: jpnurmi at digia.com (Nurmi J-P) Date: Fri, 21 Jun 2013 13:48:02 +0000 Subject: [Development] Settings API for QML In-Reply-To: <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local> References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local> Message-ID: <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> Hi, Returning to the subject, here's a simplified proposal: import QtQuick 2.0 import Qt.labs.settings 1.0 Item { id: window width: settings.width height: settings.height Settings { id: settings category: "Geometry" property int width: 800 property int height: 600 } Component.onDestruction: { settings.width = window.width settings.height = window.height } } Implementation based on Joao's old prototype: https://codereview.qt-project.org/#change,59149 In short, the idea is to keep the API as minimal as possible, leaving the category/group as the only configurable property. I was delighted to find out that QCoreApplication::applicationName was already exposed to QML, but I would propose exposing organization name too (https://codereview.qt-project.org/#change,59524) in order to provide a bit better control over the settings location. The tricky thing is to get those initialized in pure QML applications before constructing a Settings object. Perhaps Component could have an attached onConstruction signal that would get triggered when construction begins? -- J-P Nurmi From Simon.Hausmann at digia.com Fri Jun 21 18:58:33 2013 From: Simon.Hausmann at digia.com (Hausmann Simon) Date: Fri, 21 Jun 2013 16:58:33 +0000 Subject: [Development] Settings API for QML In-Reply-To: <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local>, <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> Message-ID: Hi, I like this, but as a next step I think it would be good to get rid of the manual JS code for saving. What about a general syntax of annotating properties? Then settings could be implemented on top by introspecting for properties annotated with settings tags and then save/restore then. Inspired by IDL, how about square brackets with key and optional value pairs, comma separated? [persistent] property into scale: 1.0 [persistent] width: 800 [Something, someKey=someValue] property string foo; What do you think? Simon Nurmi J-P wrote: Hi, Returning to the subject, here's a simplified proposal: import QtQuick 2.0 import Qt.labs.settings 1.0 Item { id: window width: settings.width height: settings.height Settings { id: settings category: "Geometry" property int width: 800 property int height: 600 } Component.onDestruction: { settings.width = window.width settings.height = window.height } } Implementation based on Joao's old prototype: https://codereview.qt-project.org/#change,59149 In short, the idea is to keep the API as minimal as possible, leaving the category/group as the only configurable property. I was delighted to find out that QCoreApplication::applicationName was already exposed to QML, but I would propose exposing organization name too (https://codereview.qt-project.org/#change,59524) in order to provide a bit better control over the settings location. The tricky thing is to get those initialized in pure QML applications before constructing a Settings object. Perhaps Component could have an attached onConstruction signal that would get triggered when construction begins? -- J-P Nurmi _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From jeremy.k.list at gmail.com Fri Jun 21 23:24:29 2013 From: jeremy.k.list at gmail.com (Jeremy Katz) Date: Fri, 21 Jun 2013 14:24:29 -0700 Subject: [Development] Settings API for QML In-Reply-To: References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local>, <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> Message-ID: <51C4C48D.8010405@gmail.com> On 06/21/2013 09:58 AM, Hausmann Simon wrote: > Hi, > > I like this, but as a next step I think it would be good to get rid of the manual JS code for saving. > > What about a general syntax of annotating properties? Then settings could be implemented on top by introspecting for properties annotated with settings tags and then save/restore then. I feel like discussion of what this is for has taken a secondary position to syntax and implementation details. * Is access limited to the application, shared (system wide or multiple scopes?), or both? * If shared, does an application receive notification of external updates? * If shared, does an application have control over when changes are propagated? * Is this targeting a designated storage format, or system (plugin?) implementation defined? * Is the storage meant to be usable by non-Qt applications? * Is the storage hierarchical? To some degree, all of these have been discussed. Have any conclusions been reached, or are we waiting for a decision by implementation? Jeremy From lorn.potter at gmail.com Sat Jun 22 00:14:25 2013 From: lorn.potter at gmail.com (Lorn Potter) Date: Sat, 22 Jun 2013 08:14:25 +1000 Subject: [Development] Q_PLUGIN_METADATA documentation Message-ID: <51C4D041.5050107@gmail.com> Hi *, While working on QTBUG-31900, there was a change in qtbase - 732dcfe7 which broke loading of sensorgesture plugins. It turns out, the plugin loader is now only loading the first sensorgesture plugin found. If I remove the FILE portion of the Q_PLUGIN_METADATA entry they all load and tests pass. The json file for all sensorgestures plugins contains the same thing: { "Keys": [ "notused" ] } This has been working fine since 5.0 The documentation here: http://qt-project.org/doc/qt-5.0/qtcore/qtplugin.html#Q_PLUGIN_METADATA says nothing about the contents of the json file, what is possible for it to contain, what it should contain, or even it's purpose. The example mentioned there only refers back to this page. Can someone explain this? and perhaps beef up that documentation? -- Lorn Potter Senior Software Engineer, QtSensors/QtSensorGestures/QtSystemInfo From 416365416c at gmail.com Sat Jun 22 04:30:05 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 21 Jun 2013 19:30:05 -0700 Subject: [Development] URLs in QML/JS In-Reply-To: References: <9160F3295FA8E24781968BBD40362991A77378@IT-EXMB01-HKI.it.local> Message-ID: On Tue, Jun 18, 2013 at 5:49 PM, Alan Ezust wrote: > > > On Tue, Jun 18, 2013 at 11:32 AM, Alan Ezust wrote: >> >> >> Another type I'd like to see in QML is the QTimer type, with notify >> properties and all. >> > > Oops, I forgot this is related to Cascades QML, so please ignore this line. > :-) > The QML Timer is great and I wish that was available in Cascades. Known issue. This is one reason why Timer was moved to QtQml in Qt 5. Once Cascades ports to Qt 5 then it will immediately become usable because it no longer pulls in the GUI elements. Technically it's usable now, but you don't want to import all of QtQuick just for the Timer when nothing else will work. -- Alan Alpert From 416365416c at gmail.com Sat Jun 22 04:38:33 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 21 Jun 2013 19:38:33 -0700 Subject: [Development] Settings API for QML In-Reply-To: <51C4C48D.8010405@gmail.com> References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local> <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> <51C4C48D.8010405@gmail.com> Message-ID: On Fri, Jun 21, 2013 at 2:24 PM, Jeremy Katz wrote: > On 06/21/2013 09:58 AM, Hausmann Simon wrote: >> Hi, >> >> I like this, but as a next step I think it would be good to get rid of the manual JS code for saving. >> >> What about a general syntax of annotating properties? Then settings could be implemented on top by introspecting for properties annotated with settings tags and then save/restore then. My biggest concern about that approach right now is the scope of the change. We can't back out language features as easily as we can a module. I'd approve adding a Qt.labs.settings element, with the API specified by JP, because it gives us what we need and is the most easily changeable. If we get to annotating properties, we drop the Qt.labs.settings element (after a period of deprecation). We can play around with the backend so long as the QML API works, because while a consistent and reliable on disk format is important for a complete API, for a labs module I'm happy with just the QML API while we figure out other implementation details. The need for this feature seems great enough that people are willing to sacrifice some of the important details in order to get the basic functionality available to QML now (5.2). > I feel like discussion of what this is for has taken a secondary > position to syntax and implementation details. I feel that the "why" discussion was already solved. The "how" is coming up again because it's the sticking point. Here's my understanding of what's needed: > * Is access limited to the application, shared (system wide or multiple > scopes?), or both? Application (although in a more usable format than QtQuick.LocalStorage) > * If shared, does an application receive notification of external > updates? > > * If shared, does an application have control over when changes are > propagated? > > * Is this targeting a designated storage format, or system (plugin?) > implementation defined? No. The storage format is one of the biggest sticking points because QSettings has no friends anymore. But that's not really useful for the usecase (given that it is not intended for shared settings). > * Is the storage meant to be usable by non-Qt applications? > > * Is the storage hierarchical? > > > To some degree, all of these have been discussed. Have any conclusions > been reached, or are we waiting for a decision by implementation? There are unanswered questions about the implementation, but usually having something that works trumps those whether we're waiting or not ;). -- Alan Alpert From andrew.den.exter at qinetic.com.au Sat Jun 22 05:49:12 2013 From: andrew.den.exter at qinetic.com.au (Andrew den Exter) Date: Sat, 22 Jun 2013 13:49:12 +1000 Subject: [Development] Settings API for QML In-Reply-To: References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local> <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> <51C4C48D.8010405@gmail.com> Message-ID: On Sat, Jun 22, 2013 at 12:38 PM, Alan Alpert <416365416c at gmail.com> wrote: > On Fri, Jun 21, 2013 at 2:24 PM, Jeremy Katz > wrote: > > On 06/21/2013 09:58 AM, Hausmann Simon wrote: > >> Hi, > >> > >> I like this, but as a next step I think it would be good to get rid of > the manual JS code for saving. > >> > >> What about a general syntax of annotating properties? Then settings > could be implemented on top by introspecting for properties annotated with > settings tags and then save/restore then. > > My biggest concern about that approach right now is the scope of the > change. We can't back out language features as easily as we can a > module. > > I'd approve adding a Qt.labs.settings element, with the API specified > by JP, because it gives us what we need and is the most easily > changeable. If we get to annotating properties, we drop the > Qt.labs.settings element (after a period of deprecation). We can play > around with the backend so long as the QML API works, because while a > consistent and reliable on disk format is important for a complete > API, for a labs module I'm happy with just the QML API while we figure > out other implementation details. > > So I haven't really been following this conversation much but by amazing coincidence I not long ago happened to cobble together something that has an API very similar to what JP is proposing, it's worked quite well for me and I can thoroughly recommend the approach. So if anyone's interested in a proof of concept I have one. Although it is implemented using gconf for reasons of circumstance so not an actual implementation proposal. And the code split between two repo' is a little unfortunate, but hey the (mostly) same API works with c++ too. https://github.com/nemomobile/nemo-qml-plugin-configuration/pull/2 https://github.com/nemomobile/mlite/pull/4 Andrew -------------- next part -------------- An HTML attachment was scrubbed... URL: From Simon.Hausmann at digia.com Sat Jun 22 09:02:51 2013 From: Simon.Hausmann at digia.com (Hausmann Simon) Date: Sat, 22 Jun 2013 07:02:51 +0000 Subject: [Development] Settings API for QML In-Reply-To: References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local> <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> <51C4C48D.8010405@gmail.com>, Message-ID: You're right, the language extension can be totally separate from settings at the moment. It makes indeed most sense to land things in pieces like you proposed. Simon Alan Alpert <416365416c at gmail.com> wrote: On Fri, Jun 21, 2013 at 2:24 PM, Jeremy Katz wrote: > On 06/21/2013 09:58 AM, Hausmann Simon wrote: >> Hi, >> >> I like this, but as a next step I think it would be good to get rid of the manual JS code for saving. >> >> What about a general syntax of annotating properties? Then settings could be implemented on top by introspecting for properties annotated with settings tags and then save/restore then. My biggest concern about that approach right now is the scope of the change. We can't back out language features as easily as we can a module. I'd approve adding a Qt.labs.settings element, with the API specified by JP, because it gives us what we need and is the most easily changeable. If we get to annotating properties, we drop the Qt.labs.settings element (after a period of deprecation). We can play around with the backend so long as the QML API works, because while a consistent and reliable on disk format is important for a complete API, for a labs module I'm happy with just the QML API while we figure out other implementation details. The need for this feature seems great enough that people are willing to sacrifice some of the important details in order to get the basic functionality available to QML now (5.2). > I feel like discussion of what this is for has taken a secondary > position to syntax and implementation details. I feel that the "why" discussion was already solved. The "how" is coming up again because it's the sticking point. Here's my understanding of what's needed: > * Is access limited to the application, shared (system wide or multiple > scopes?), or both? Application (although in a more usable format than QtQuick.LocalStorage) > * If shared, does an application receive notification of external > updates? > > * If shared, does an application have control over when changes are > propagated? > > * Is this targeting a designated storage format, or system (plugin?) > implementation defined? No. The storage format is one of the biggest sticking points because QSettings has no friends anymore. But that's not really useful for the usecase (given that it is not intended for shared settings). > * Is the storage meant to be usable by non-Qt applications? > > * Is the storage hierarchical? > > > To some degree, all of these have been discussed. Have any conclusions > been reached, or are we waiting for a decision by implementation? There are unanswered questions about the implementation, but usually having something that works trumps those whether we're waiting or not ;). -- Alan Alpert _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From jpnurmi at digia.com Sat Jun 22 12:16:27 2013 From: jpnurmi at digia.com (Nurmi J-P) Date: Sat, 22 Jun 2013 10:16:27 +0000 Subject: [Development] Settings API for QML In-Reply-To: References: <50C75B8F.8050008@familiesomers.nl> <96526296-78E7-47B1-AB1F-64807B79466A@digia.com> <1843006.POohb1FX8h@rhea> <66BFFE861C7DE34D9B0372D8EAAB18E2A2DAD7@IT-EXMB01-HKI.it.local> <4BA188C112EE2C49AACEB40BB06DF7D73B2624@IT-EXMB01-HKI.it.local> <51C4C48D.8010405@gmail.com>, Message-ID: <4739AA4F-5268-4ADB-926F-4752EB39DDE1@digia.com> On Jun 22, 2013, at 9:02 AM, Hausmann Simon wrote: > You're right, the language extension can be totally separate from settings at the moment. It makes indeed most sense to land things in pieces like you proposed. > > Simon > > Alan Alpert <416365416c at gmail.com> wrote: > > > On Fri, Jun 21, 2013 at 2:24 PM, Jeremy Katz wrote: >> On 06/21/2013 09:58 AM, Hausmann Simon wrote: >>> Hi, >>> >>> I like this, but as a next step I think it would be good to get rid of the manual JS code for saving. >>> >>> What about a general syntax of annotating properties? Then settings could be implemented on top by introspecting for properties annotated with settings tags and then save/restore then. > > My biggest concern about that approach right now is the scope of the > change. We can't back out language features as easily as we can a > module. > > I'd approve adding a Qt.labs.settings element, with the API specified > by JP, because it gives us what we need and is the most easily > changeable. If we get to annotating properties, we drop the > Qt.labs.settings element (after a period of deprecation). We can play > around with the backend so long as the QML API works, because while a > consistent and reliable on disk format is important for a complete > API, for a labs module I'm happy with just the QML API while we figure > out other implementation details. > > The need for this feature seems great enough that people are willing > to sacrifice some of the important details in order to get the basic > functionality available to QML now (5.2). > >> I feel like discussion of what this is for has taken a secondary >> position to syntax and implementation details. > > I feel that the "why" discussion was already solved. The "how" is > coming up again because it's the sticking point. Here's my > understanding of what's needed: > >> * Is access limited to the application, shared (system wide or multiple >> scopes?), or both? > > Application (although in a more usable format than QtQuick.LocalStorage) > >> * If shared, does an application receive notification of external >> updates? >> >> * If shared, does an application have control over when changes are >> propagated? >> >> * Is this targeting a designated storage format, or system (plugin?) >> implementation defined? > > No. The storage format is one of the biggest sticking points because > QSettings has no friends anymore. But that's not really useful for the > usecase (given that it is not intended for shared settings). > >> * Is the storage meant to be usable by non-Qt applications? >> >> * Is the storage hierarchical? >> >> >> To some degree, all of these have been discussed. Have any conclusions >> been reached, or are we waiting for a decision by implementation? > > There are unanswered questions about the implementation, but usually > having something that works trumps those whether we're waiting or not > ;). > As Alan clarified, the proposal is to provide a stopgap solution via the labs module. I think we all agree that it's currently unnecessarily tedious for QML application developers to bake their own persistent settings solutions. Personally I've done it so far in quite a few QML apps using either QSettings in C++ or LocalStorage in QML. While QSettings has its flaws and limitations, it can handle the main use case (simple persistent settings backend without notifications, bells and whistles) just fine. IMHO it's a matter of documenting the limitations and stating clearly that it's not a full-blown publish and subscribe system. Furthermore, keeping the API minimal and QSettings-agnostic might even make it possible to port it over to the mighty new settings system once someone implements it. :) -- J-P Nurmi From glen.mabey at swri.org Sun Jun 23 03:24:21 2013 From: glen.mabey at swri.org (Glen Mabey) Date: Sun, 23 Jun 2013 01:24:21 +0000 Subject: [Development] documentation of operators on a simple class -- qfloat16 References: <20130623005337.5C28830651@fork.qtproject.c.bitbit.net> Message-ID: <52A58481-558A-425D-855A-CE155AE795CB@electro.swri.edu> Hello -- I recently submitted qfloat16 as a new core class implementing a 16-bit floating point storage class. I realize that the Qt Coding Standards require that classes start with a capital Q, but this one behaves so much like a basic type that it seemed to fit in much better with qreal, qint32, and the like than QList and other heavy-duty classes. I also felt that the operators should not be individually documented, as their behavior is really determined by IEEE 754, with the one exception that is identified in my modifications to the comments in qglobal.cpp . However, the Qt Doc Bot did not sympathize with my feelings, understandably. But really I need some feedback as to whether I'm really justified in putting #ifndef Q_QDOC around *all* of the methods … that just seems rather heavy-handed. What do you think? Glen Begin forwarded message: > From: "Qt Doc Bot (Code Review)" > Subject: Change in qt/qtbase[dev]: initial submission of qfloat16 as a global class. > Date: June 22, 2013 7:53:37 PM CDT > To: Glen Mabey > Cc: Qt Sanity Bot > Reply-To: > > Qt Doc Bot has posted comments on this change. > > Change subject: initial submission of qfloat16 as a global class. > ...................................................................... > > > Patch Set 1: I would prefer that you didn't submit this > > This change introduces 30 new documentation errors. > > New qdoc warnings: > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:101: warning: No documentation for 'qfloat16::operator==()' > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:52: warning: No documentation for 'qfloat16::qfloat16()' > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:53: warning: No documentation for 'qfloat16::qfloat16()' > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:54: warning: No documentation for 'qfloat16::operator float()' > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:56: warning: No documentation for 'qfloat16::operator-()' > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:58: warning: No documentation for 'qfloat16::operator+()' From lpapp at kde.org Sun Jun 23 07:45:50 2013 From: lpapp at kde.org (Laszlo Papp) Date: Sun, 23 Jun 2013 08:45:50 +0300 Subject: [Development] documentation of operators on a simple class -- qfloat16 In-Reply-To: <52A58481-558A-425D-855A-CE155AE795CB@electro.swri.edu> References: <20130623005337.5C28830651@fork.qtproject.c.bitbit.net> <52A58481-558A-425D-855A-CE155AE795CB@electro.swri.edu> Message-ID: Would have been useful to give a direct link to the change like others do? On Sun, Jun 23, 2013 at 4:24 AM, Glen Mabey wrote: > Hello -- > > I recently submitted qfloat16 as a new core class implementing a 16-bit > floating point storage class. > > I realize that the Qt Coding Standards require that classes start with a > capital Q, but this one behaves so much like a basic type that it seemed to > fit in much better with qreal, qint32, and the like than QList and other > heavy-duty classes. > > I also felt that the operators should not be individually documented, as > their behavior is really determined by IEEE 754, with the one exception > that is identified in my modifications to the comments in qglobal.cpp . > > However, the Qt Doc Bot did not sympathize with my feelings, > understandably. > > But really I need some feedback as to whether I'm really justified in > putting #ifndef Q_QDOC around *all* of the methods … that just seems rather > heavy-handed. > > What do you think? > > Glen > > Begin forwarded message: > > > From: "Qt Doc Bot (Code Review)" > > Subject: Change in qt/qtbase[dev]: initial submission of qfloat16 as a > global class. > > Date: June 22, 2013 7:53:37 PM CDT > > To: Glen Mabey > > Cc: Qt Sanity Bot > > Reply-To: > > > > Qt Doc Bot has posted comments on this change. > > > > Change subject: initial submission of qfloat16 as a global class. > > ...................................................................... > > > > > > Patch Set 1: I would prefer that you didn't submit this > > > > This change introduces 30 new documentation errors. > > > > New qdoc warnings: > > > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:101: warning: No > documentation for 'qfloat16::operator==()' > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:52: warning: No > documentation for 'qfloat16::qfloat16()' > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:53: warning: No > documentation for 'qfloat16::qfloat16()' > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:54: warning: No > documentation for 'qfloat16::operator float()' > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:56: warning: No > documentation for 'qfloat16::operator-()' > > +/tmp/qdoc_Zixejb/qtbase/src/corelib/global/qfloat16.h:58: warning: No > documentation for 'qfloat16::operator+()' > > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From alexpux at gmail.com Mon Jun 24 07:37:05 2013 From: alexpux at gmail.com (Alexey Pavlov) Date: Mon, 24 Jun 2013 09:37:05 +0400 Subject: [Development] Update configure script Message-ID: Hi! I see that top configure script are updated from Perl version to Bash version. But it doesn't work, for example for shadows builds, because: srcpath=`dirname $0` configure=$srcpath/qtbase/configure *<-- This line get relative path of configure script if I build outside source tree* if [ ! -e "$configure" ]; then echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 exit 1 fi mkdir -p qtbase || exit echo "+ cd qtbase" cd qtbase || exit *<-- After that line relative path is break because we change directory* echo "+ $configure $@" "*../*$configure" "$@" || exit 1 *<-- Proposed solution is using "../" before configure* echo "+ cd .." cd .. echo "+ qtbase/bin/qmake $srcpath" exec qtbase/bin/qmake "$srcpath" Regards, Alexey. -------------- next part -------------- An HTML attachment was scrubbed... URL: From Sergio.Ahumada at digia.com Mon Jun 24 07:49:42 2013 From: Sergio.Ahumada at digia.com (Ahumada Sergio) Date: Mon, 24 Jun 2013 05:49:42 +0000 Subject: [Development] Update configure script In-Reply-To: References: Message-ID: <9B4D1DADF5006F4DB6666312421B98E50100BE65@IT-EXMB01-HKI.it.local> Hi, This is already fixed in the release branch https://codereview.qt-project.org/59617 and will be fixed in the stable branch as soon as possible. Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt ________________________________ From: development-bounces+sergio.ahumada=digia.com at qt-project.org [development-bounces+sergio.ahumada=digia.com at qt-project.org] on behalf of Alexey Pavlov [alexpux at gmail.com] Sent: Monday, June 24, 2013 07:37 To: development at qt-project.org Subject: [Development] Update configure script Hi! I see that top configure script are updated from Perl version to Bash version. But it doesn't work, for example for shadows builds, because: srcpath=`dirname $0` configure=$srcpath/qtbase/configure <-- This line get relative path of configure script if I build outside source tree if [ ! -e "$configure" ]; then echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 exit 1 fi mkdir -p qtbase || exit echo "+ cd qtbase" cd qtbase || exit <-- After that line relative path is break because we change directory echo "+ $configure $@" "../$configure" "$@" || exit 1 <-- Proposed solution is using "../" before configure echo "+ cd .." cd .. echo "+ qtbase/bin/qmake $srcpath" exec qtbase/bin/qmake "$srcpath" Regards, Alexey. -------------- next part -------------- An HTML attachment was scrubbed... URL: From simon.hausmann at digia.com Mon Jun 24 10:26:33 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Mon, 24 Jun 2013 10:26:33 +0200 Subject: [Development] QML engine changes Message-ID: <1525942.bRdby09J1O@rhea> Hi, As you may have heard (or read), Lars, Erik and I have been working on some bigger changes for qtdeclarative for a while. In a nutshell we've replaced the V8 JavaScript engine with a new engine that we wrote (based on work by Roberto and Aaron). We've progressed rather well and in our wip/v4 branch in qtdeclarative we're now passing all auto tests (as well as the ECMAScript 262 test suite). So that's why we'd like to propose merging this work into qtdeclarative mainline (dev branch), in the coming days/week(s) - in time for Qt 5.2 though. We think that this work brings in many advantages, among others much improved maintenance (we know how this thing works, which isn't something we can confidently say about V8 as much as we'd like to), a unified code path in QML [1], much less code overall and great opportunities for optimizations (way beyond what's possible with V8's API layer - you'd be surprised how often even in today's QML usage the V8 code path is not actually taken because it's slower that the built-in interpreter). So this is a heads-up and of course a last call for objections :) Simon [1] Did you know what when you read a URL property in QML binding expressions, sometimes it's a string and sometimes it's an opaque variant? That's because the builtin interpreter in qtdeclarative and V8 behave different. We're fixing that :) From bjoern.breitmeyer at kdab.com Mon Jun 24 10:50:54 2013 From: bjoern.breitmeyer at kdab.com (=?ISO-8859-1?Q?Bj=F6rn?= Breitmeyer) Date: Mon, 24 Jun 2013 10:50:54 +0200 Subject: [Development] QML engine changes In-Reply-To: <1525942.bRdby09J1O@rhea> References: <1525942.bRdby09J1O@rhea> Message-ID: <3912080.0nvSJx7ejH@bjoern-lpc> Hi, Does that include to get rid of v8 as an JS engine option for QML2? I have not tested it yet, but it would be interesting to know if the new engine also uses just in time compilation, as we had quite some work done to get v8 running on WinCE due to wrong ARM abis for Windows CE among other things. Best regards Björn Breitmeyer Am Montag, 24. Juni 2013, 10:26:33 schrieb Simon Hausmann: > Hi, > > As you may have heard (or read), Lars, Erik and I have been working on some > bigger changes for qtdeclarative for a while. In a nutshell we've replaced > the V8 JavaScript engine with a new engine that we wrote (based on work by > Roberto and Aaron). We've progressed rather well and in our wip/v4 branch > in qtdeclarative we're now passing all auto tests (as well as the > ECMAScript 262 test suite). So that's why we'd like to propose merging this > work into qtdeclarative mainline (dev branch), in the coming days/week(s) - > in time for Qt 5.2 though. > > We think that this work brings in many advantages, among others much > improved maintenance (we know how this thing works, which isn't something > we can confidently say about V8 as much as we'd like to), a unified code > path in QML [1], much less code overall and great opportunities for > optimizations (way beyond what's possible with V8's API layer - you'd be > surprised how often even in today's QML usage the V8 code path is not > actually taken because it's slower that the built-in interpreter). > > > So this is a heads-up and of course a last call for objections :) > > > > Simon > > > [1] Did you know what when you read a URL property in QML binding > expressions, sometimes it's a string and sometimes it's an opaque variant? > That's because the builtin interpreter in qtdeclarative and V8 behave > different. We're fixing that :) > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development Join us in October at Qt Developer Days 2013 - https://devdays.kdab.com -- Björn Breitmeyer | bjoern.breitmeyer at kdab.com | Software Engineer KDAB (Deutschland) GmbH&Co KG, a KDAB Group company Germany: +49-30-521325470, Sweden (HQ): +46-563-540090 KDAB - Qt Experts - Platform-independent software solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: smime.p7s Type: application/pkcs7-signature Size: 4854 bytes Desc: not available URL: From simon.hausmann at digia.com Mon Jun 24 11:50:40 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Mon, 24 Jun 2013 11:50:40 +0200 Subject: [Development] QML engine changes In-Reply-To: <3912080.0nvSJx7ejH@bjoern-lpc> References: <1525942.bRdby09J1O@rhea> <3912080.0nvSJx7ejH@bjoern-lpc> Message-ID: <3796323.XdnfloCPsg@rhea> On Monday 24. June 2013 10.50.54 Björn Breitmeyer wrote: > Hi, > > Does that include to get rid of v8 as an JS engine option for QML2? Yes, that's exactly the proposed change. > I have not tested it yet, but it would be interesting to know if the new > engine also uses just in time compilation, as we had quite some work done > to get v8 running on WinCE due to wrong ARM abis for Windows CE among other > things. Yes it does just-in-time compilation and will require most probably some changes to work under Windows CE. (but it should be less than the changes require for V8, if my memory of the v8 changes serves me right) Simon > Am Montag, 24. Juni 2013, 10:26:33 schrieb Simon Hausmann: > > Hi, > > > > As you may have heard (or read), Lars, Erik and I have been working on > > some > > bigger changes for qtdeclarative for a while. In a nutshell we've replaced > > the V8 JavaScript engine with a new engine that we wrote (based on work by > > Roberto and Aaron). We've progressed rather well and in our wip/v4 branch > > in qtdeclarative we're now passing all auto tests (as well as the > > ECMAScript 262 test suite). So that's why we'd like to propose merging > > this > > work into qtdeclarative mainline (dev branch), in the coming days/week(s) > > - > > in time for Qt 5.2 though. > > > > We think that this work brings in many advantages, among others much > > improved maintenance (we know how this thing works, which isn't something > > we can confidently say about V8 as much as we'd like to), a unified code > > path in QML [1], much less code overall and great opportunities for > > optimizations (way beyond what's possible with V8's API layer - you'd be > > surprised how often even in today's QML usage the V8 code path is not > > actually taken because it's slower that the built-in interpreter). > > > > > > So this is a heads-up and of course a last call for objections :) > > > > > > > > Simon > > > > > > [1] Did you know what when you read a URL property in QML binding > > expressions, sometimes it's a string and sometimes it's an opaque variant? > > That's because the builtin interpreter in qtdeclarative and V8 behave > > different. We're fixing that :) > > _______________________________________________ > > Development mailing list > > Development at qt-project.org > > http://lists.qt-project.org/mailman/listinfo/development > > Join us in October at Qt Developer Days 2013 - https://devdays.kdab.com From chris.adams at qinetic.com.au Mon Jun 24 13:18:41 2013 From: chris.adams at qinetic.com.au (Chris Adams) Date: Mon, 24 Jun 2013 21:18:41 +1000 Subject: [Development] QML engine changes In-Reply-To: <3796323.XdnfloCPsg@rhea> References: <1525942.bRdby09J1O@rhea> <3912080.0nvSJx7ejH@bjoern-lpc> <3796323.XdnfloCPsg@rhea> Message-ID: Hi, This is really exciting news! Good stuff! > Hi, > > > > Does that include to get rid of v8 as an JS engine option for QML2? > > Yes, that's exactly the proposed change. > > > I have not tested it yet, but it would be interesting to know if the new > > engine also uses just in time compilation, as we had quite some work done > > to get v8 running on WinCE due to wrong ARM abis for Windows CE among > other > > things. > > Yes it does just-in-time compilation and will require most probably some > changes to work under Windows CE. (but it should be less than the changes > require for V8, if my memory of the v8 changes serves me right) > Is there an "interpreter only (no JIT)" compile-time option? Presumably that's required for iOS adoption, for example? I wonder how much performance delta there is between JIT and pure interpretted, with a tight enough interpreter loop, if you make some simplifying assumptions (eg, types can't change at runtime / enforce no property deletion or dynamic property addition to objects or prototypes / disallow eval()). Of course, some of those limitations would no doubt break existing client code, but I personally think that weak typing is the major negative of JavaScript :-/ > > Hi, > > > > > > As you may have heard (or read), Lars, Erik and I have been working on > > > some > > > bigger changes for qtdeclarative for a while. In a nutshell we've > replaced > > > the V8 JavaScript engine with a new engine that we wrote (based on > work by > > > Roberto and Aaron). We've progressed rather well and in our wip/v4 > branch > > > in qtdeclarative we're now passing all auto tests (as well as the > > > ECMAScript 262 test suite). So that's why we'd like to propose merging > > > this > > > work into qtdeclarative mainline (dev branch), in the coming > days/week(s) > > > - > > > in time for Qt 5.2 though. > This confuses me a bit. Why isn't the implementation tuned specifically for QML, instead of being a fully-compliant ecmascript implementation? There are currently some problems with using 3rd party JS libraries in QML applications, simply because the environment doesn't have the stuff usually supplied by the browser (and the difficulties in injecting properties in the context at import time), so I don't know how many people actually use "eval()" in their QML code, for example. And I think some extremely impressive performance improvements could be gained by integrating more tightly with the QML engine. Something Aaron mentioned to me a little while ago, is the possibility of doing a two-stage binding generation (it's not too clean, but it's extremely impressive): build pre-optimized binaries; run the application on device; application emits the IR for the bindings during first time evaluation, back to QtCreator; collect the IR and do a reverse transform into C++ code; generate optimized binaries. All of the type information is generated/known at the time the IR is generated, so there shouldn't be any problems compiling the resultant reverse transform; you end up with super-fast bindings implementation, and no JIT required in the final binaries. If any bindings change at runtime, just use an interpreter to evaluate the expression. Of course there are issues (dynamically load QML resources from the web, for example, might result in different bindings at runtime) and I may have misunderstood some vital elements of the concept when Aaron explained it to me, but it seems like a really interesting area of research. In general, I think there's a lot of scope for improving the tooling around QML, but I guess that's no surprise to anyone. > > > > > > We think that this work brings in many advantages, among others much > > > improved maintenance (we know how this thing works, which isn't > something > > > we can confidently say about V8 as much as we'd like to), a unified > code > > > path in QML [1], much less code overall and great opportunities for > > > optimizations (way beyond what's possible with V8's API layer - you'd > be > > > surprised how often even in today's QML usage the V8 code path is not > > > actually taken because it's slower that the built-in interpreter). > > > > > > > > > So this is a heads-up and of course a last call for objections :) > > > > > > > > > > > > Simon > > > > > > > > > [1] Did you know what when you read a URL property in QML binding > > > expressions, sometimes it's a string and sometimes it's an opaque > variant? > > > That's because the builtin interpreter in qtdeclarative and V8 behave > > > different. We're fixing that :) > Hehe. At one stage there were three separate jsValueToMetatype() conversion functions in the codebase o_O. Anyway, I'm really excited about this change. Congrats and thanks to Erik, Lars and yourself for your impressive work! Cheers, Chris. -------------- next part -------------- An HTML attachment was scrubbed... URL: From simon.hausmann at digia.com Mon Jun 24 13:30:18 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Mon, 24 Jun 2013 13:30:18 +0200 Subject: [Development] QML engine changes In-Reply-To: References: <1525942.bRdby09J1O@rhea> <3796323.XdnfloCPsg@rhea> Message-ID: <2019549.gHZdPA8bjg@rhea> On Monday 24. June 2013 21.18.41 Chris Adams wrote: > Hi, > > This is really exciting news! Good stuff! > > > Hi, > > > > > Does that include to get rid of v8 as an JS engine option for QML2? > > > > Yes, that's exactly the proposed change. > > > > > I have not tested it yet, but it would be interesting to know if the new > > > engine also uses just in time compilation, as we had quite some work > > > done > > > to get v8 running on WinCE due to wrong ARM abis for Windows CE among > > > > other > > > > > things. > > > > Yes it does just-in-time compilation and will require most probably some > > changes to work under Windows CE. (but it should be less than the changes > > require for V8, if my memory of the v8 changes serves me right) > > Is there an "interpreter only (no JIT)" compile-time option? Presumably > that's required for iOS adoption, for example? Yes. > I wonder how much performance delta there is between JIT and pure > interpretted, with a tight enough interpreter loop, if you make some > simplifying assumptions (eg, types can't change at runtime / enforce no > property deletion or dynamic property addition to objects or prototypes / > disallow eval()). Of course, some of those limitations would no doubt > break existing client code, but I personally think that weak typing is the > major negative of JavaScript :-/ I'm also not sure yet about the exact difference between JIT and interpreter, but type propagation is something that Erik has been working on, based on the assumption that while JS is untyped, QML is in fact strongly typed. That is one of those areas with a huge potential. > > > Hi, > > > > > > > As you may have heard (or read), Lars, Erik and I have been working on > > > > some > > > > bigger changes for qtdeclarative for a while. In a nutshell we've > > > > replaced > > > > > > the V8 JavaScript engine with a new engine that we wrote (based on > > > > work by > > > > > > Roberto and Aaron). We've progressed rather well and in our wip/v4 > > > > branch > > > > > > in qtdeclarative we're now passing all auto tests (as well as the > > > > ECMAScript 262 test suite). So that's why we'd like to propose merging > > > > this > > > > work into qtdeclarative mainline (dev branch), in the coming > > > > days/week(s) > > > > > > - > > > > in time for Qt 5.2 though. > > This confuses me a bit. Why isn't the implementation tuned specifically > for QML, instead of being a fully-compliant ecmascript implementation? Because we want to continue to support the use-case of import "Foo.js" as Bar; I've personally used that for a little spare time app I wrote, when I was super happy to discover that a piece of functionality I needed was available as third-party JS library that I could just exclude. But spec compliance does not imply tuning, and indeed I think generally any optimization we do will most likely be geared towards QML, as long as it doesn't pessimize the regular JS execution. > There are currently some problems with using 3rd party JS libraries in QML > applications, simply because the environment doesn't have the stuff usually > supplied by the browser (and the difficulties in injecting properties in > the context at import time), so I don't know how many people actually use > "eval()" in their QML code, for example. And I think some extremely > impressive performance improvements could be gained by integrating more > tightly with the QML engine. Absolutely, that remains a goal (tight integration). > Something Aaron mentioned to me a little while ago, is the possibility of > doing a two-stage binding generation (it's not too clean, but it's > extremely impressive): build pre-optimized binaries; run the application on > device; application emits the IR for the bindings during first time > evaluation, back to QtCreator; collect the IR and do a reverse transform > into C++ code; generate optimized binaries. All of the type information is > generated/known at the time the IR is generated, so there shouldn't be any > problems compiling the resultant reverse transform; you end up with > super-fast bindings implementation, and no JIT required in the final > binaries. If any bindings change at runtime, just use an interpreter to > evaluate the expression. That's an interesting idea! > Of course there are issues (dynamically load QML resources from the web, > for example, might result in different bindings at runtime) and I may have > misunderstood some vital elements of the concept when Aaron explained it to > me, but it seems like a really interesting area of research. > > In general, I think there's a lot of scope for improving the tooling around > QML, but I guess that's no surprise to anyone. > > > > > We think that this work brings in many advantages, among others much > > > > improved maintenance (we know how this thing works, which isn't > > > > something > > > > > > we can confidently say about V8 as much as we'd like to), a unified > > > > code > > > > > > path in QML [1], much less code overall and great opportunities for > > > > optimizations (way beyond what's possible with V8's API layer - you'd > > > > be > > > > > > surprised how often even in today's QML usage the V8 code path is not > > > > actually taken because it's slower that the built-in interpreter). > > > > > > > > > > > > So this is a heads-up and of course a last call for objections :) > > > > > > > > > > > > > > > > Simon > > > > > > > > > > > > [1] Did you know what when you read a URL property in QML binding > > > > expressions, sometimes it's a string and sometimes it's an opaque > > > > variant? > > > > > > That's because the builtin interpreter in qtdeclarative and V8 behave > > > > different. We're fixing that :) > > Hehe. At one stage there were three separate jsValueToMetatype() > conversion functions in the codebase o_O. > > Anyway, I'm really excited about this change. Congrats and thanks to Erik, > Lars and yourself for your impressive work! At this points we also need to shout "Thank you" to you guys, btw! The auto- test coverage you guys produced is extremely good and is giving us much of the needed confidence to propose this merge in the first place. Simon From markus at woboq.com Mon Jun 24 17:20:46 2013 From: markus at woboq.com (Markus Goetz) Date: Mon, 24 Jun 2013 17:20:46 +0200 Subject: [Development] Qt Documentation discoverability in Google Message-ID: <51C863CE.80603@woboq.com> Hi, I remember that gooling for "QWidget" or "QNetworkAccessManager" gave you the documentation page (usually of the latest Qt release) as a first hit. This is not the case anymore, I'm getting an outdated MeeGo Harmattan 4.7 result or Blackberry docs now as the first results. One way to fix this would probably be if qt.nokia.com/doc and doc.trolltech.com would not be blindly forwarded to qt.digia.com but take the 'path' part of the requested URL and also append that on the forward to qt-project.org/doc. Then google would forward that old link juice and the correct Qt documentation could be the first result..) bye, Markus From dangelog at gmail.com Mon Jun 24 17:32:55 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Mon, 24 Jun 2013 17:32:55 +0200 Subject: [Development] Qt Documentation discoverability in Google In-Reply-To: <51C863CE.80603@woboq.com> References: <51C863CE.80603@woboq.com> Message-ID: On 24 June 2013 17:20, Markus Goetz wrote: > Hi, > > I remember that gooling for "QWidget" or "QNetworkAccessManager" gave > you the documentation page (usually of the latest Qt release) as a first > hit. > > This is not the case anymore, I'm getting an outdated MeeGo Harmattan > 4.7 result or Blackberry docs now as the first results. > > One way to fix this would probably be if qt.nokia.com/doc and > doc.trolltech.com would not be blindly forwarded to qt.digia.com but > take the 'path' part of the requested URL and also append that on the > forward to qt-project.org/doc. Then google would forward that old link > juice and the correct Qt documentation could be the first result..) That's more or less what I proposed to do in https://bugreports.qt-project.org/browse/QTWEBSITE-504 , but I don't know the control we have on qt.nokia.com / doc.trolltech.com domains... -- Giuseppe D'Angelo From Lars.Knoll at digia.com Mon Jun 24 17:50:17 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Mon, 24 Jun 2013 15:50:17 +0000 Subject: [Development] Qt Documentation discoverability in Google In-Reply-To: Message-ID: On 6/24/13 5:32 PM, "Giuseppe D'Angelo" wrote: >On 24 June 2013 17:20, Markus Goetz wrote: >> Hi, >> >> I remember that gooling for "QWidget" or "QNetworkAccessManager" gave >> you the documentation page (usually of the latest Qt release) as a first >> hit. >> >> This is not the case anymore, I'm getting an outdated MeeGo Harmattan >> 4.7 result or Blackberry docs now as the first results. >> >> One way to fix this would probably be if qt.nokia.com/doc and >> doc.trolltech.com would not be blindly forwarded to qt.digia.com but >> take the 'path' part of the requested URL and also append that on the >> forward to qt-project.org/doc. Then google would forward that old link >> juice and the correct Qt documentation could be the first result..) > >That's more or less what I proposed to do in >https://bugreports.qt-project.org/browse/QTWEBSITE-504 , but I don't >know the control we have on qt.nokia.com / doc.trolltech.com >domains... Unfortunately I don't think we have any control on them :/ Lars From charleyb123 at gmail.com Mon Jun 24 17:51:38 2013 From: charleyb123 at gmail.com (Charley Bay) Date: Mon, 24 Jun 2013 09:51:38 -0600 Subject: [Development] QML engine changes In-Reply-To: <2019549.gHZdPA8bjg@rhea> References: <1525942.bRdby09J1O@rhea> <3796323.XdnfloCPsg@rhea> <2019549.gHZdPA8bjg@rhea> Message-ID: Simon sayeth: > Chris replied: > > This is really exciting news! Good stuff! > +1 > > I wonder how much performance delta there is between JIT and pure > > interpretted, with a tight enough interpreter loop, if you make some > > simplifying assumptions (eg, types can't change at runtime / enforce no > > property deletion or dynamic property addition to objects or prototypes / > > disallow eval()). , > +1, I'm very interested in this QML-engine integration beyond what was possible with V8: *- Strong type safety *- Optimizations (e.g., object-paths) *- more/better JIT options *- more/better bytecode/packaging/deployment options *- more/better future QML tooling (e.g., runtime debugging/inspection around the "QML-engine") Chris: > > ,, but I personally think that weak typing is the > > major negative of JavaScript :-/ > +1 Simon: > I'm also not sure yet about the exact difference between JIT and > interpreter, > but type propagation is something that Erik has been working on, based on > the > assumption that while JS is untyped, QML is in fact strongly typed. That is > one of those areas with a huge potential. > +1 Simon: > > > > > Roberto and Aaron). We've progressed rather well and in our > wip/v4 branch in qtdeclarative we're now passing all auto tests (as well as > the > > > > > ECMAScript 262 test suite). So that's why we'd like to propose > merging this work into qtdeclarative mainline (dev branch), in the > coming days/week(s) in time for Qt 5.2 though. > Chris: > > This confuses me a bit. Why isn't the implementation tuned > specifically for QML, instead of being a fully-compliant ecmascript > implementation? > Simon: > Because we want to continue to support the use-case of import "Foo.js" as > Bar; > I've personally used that for a little spare time app I wrote, when I was > super happy to discover that a piece of functionality I needed was > available > as third-party JS library that I could just exclude. But spec compliance > does > not imply tuning, and indeed I think generally any optimization we do will > most likely be geared towards QML, as long as it doesn't pessimize the > regular > JS execution. > Ok, that makes sense, so I won't argue against it. However, I agree with Chris that "ecmascript" compliance isn't a big wish/need/goal for me. I'd prefer to give (design) priorities to: *- strong typing *- (tight) QML-engine integration with running system (e.g., internal QML runtime system with "bindings" is quite different than the mechanisms intended by an ECMA-script engine) *- performance (e.g, "byte-code", JIT, optimized object-paths) *- deployment/packaging options (e.g., binary byte-code) And, of course, I totally applaud the removal of "eval()" and other runtime code issues that block iOS deployment (I'm not targeting that platform, I just agree with Apple's complaint about embedding V8, and don't want opportunities for "malicious injection" in my systems). Chris: > > And I think some extremely > > impressive performance improvements could be gained by integrating > more tightly with the QML engine. > Simon: > Absolutely, that remains a goal (tight integration). > +1, I support this direction. Chris: > > Something Aaron mentioned to me a little while ago, is the possibility > of doing a two-stage binding generation (it's not too clean, but it's > > extremely impressive): build pre-optimized binaries; run the application > on > > device; application emits the IR for the bindings during first time > > evaluation, back to QtCreator; collect the IR and do a reverse transform > > into C++ code; generate optimized binaries. All of the type information > is > > generated/known at the time the IR is generated, so there shouldn't be > any > > problems compiling the resultant reverse transform; you end up with > > super-fast bindings implementation, and no JIT required in the final > > binaries. If any bindings change at runtime, just use an interpreter to > > evaluate the expression. > Simon: > That's an interesting idea! > Whoa... THAT'S COOL. I'm very interested in more on this. Please feel free to share thoughts on this topic or other experimentation along these lines. (This could be *extremely* useful; I could see tooling be put in-place to simplify/automate this process.) > > > > So this is a heads-up and of course a last call for objections :) > No objection -- :/me strong supporter! Chris: > > Anyway, I'm really excited about this change. Congrats and thanks to > Erik, Lars and yourself for your impressive work! > +1 -charley -------------- next part -------------- An HTML attachment was scrubbed... URL: From lorn.potter at gmail.com Mon Jun 24 23:21:37 2013 From: lorn.potter at gmail.com (Lorn Potter) Date: Tue, 25 Jun 2013 07:21:37 +1000 Subject: [Development] Qt Documentation discoverability in Google In-Reply-To: <51C863CE.80603@woboq.com> References: <51C863CE.80603@woboq.com> Message-ID: <51C8B861.60003@gmail.com> On 25/06/13 01:20, Markus Goetz wrote: > Hi, > > I remember that gooling for "QWidget" or "QNetworkAccessManager" gave > you the documentation page (usually of the latest Qt release) as a first > hit. > > This is not the case anymore, I'm getting an outdated MeeGo Harmattan > 4.7 result or Blackberry docs now as the first results. I've noticed this too when using google for searching Qt docs. I switched. Try https://duckduckgo.com > > One way to fix this would probably be if qt.nokia.com/doc and > doc.trolltech.com would not be blindly forwarded to qt.digia.com but > take the 'path' part of the requested URL and also append that on the > forward to qt-project.org/doc. Then google would forward that old link > juice and the correct Qt documentation could be the first result..) > > bye, > Markus > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -- Lorn Potter Senior Software Engineer, QtSensors/QtSensorGestures/QtSystemInfo From andre.poenitz at mathematik.tu-chemnitz.de Mon Jun 24 23:58:17 2013 From: andre.poenitz at mathematik.tu-chemnitz.de (=?iso-8859-1?Q?Andr=E9_P=F6nitz?=) Date: Mon, 24 Jun 2013 23:58:17 +0200 Subject: [Development] QML engine changes In-Reply-To: <2019549.gHZdPA8bjg@rhea> References: <1525942.bRdby09J1O@rhea> <3796323.XdnfloCPsg@rhea> <2019549.gHZdPA8bjg@rhea> Message-ID: <20130624215817.GA8402@klara.mpi.htwm.de> [Upfront: I am _really_ happy to see V8 and the glue code its service required to be on its way out. But...] On Mon, Jun 24, 2013 at 01:30:18PM +0200, Simon Hausmann wrote: > > This confuses me a bit. Why isn't the implementation tuned specifically > > for QML, instead of being a fully-compliant ecmascript implementation? > > Because we want to continue to support the use-case of import "Foo.js" as Bar; > I've personally used that for a little spare time app I wrote, when I was > super happy to discover that a piece of functionality I needed was available > as third-party JS library that I could just exclude. [...] This still somewhat leaves the questions why that use case is so important that it justifies the hoops that need to be jumped through to make it happen (especially at the expense of more common uses that typically do not go much beyond arithmetic expressions and an 'if', or an occasional loop), and why 100% ECMA conformance for chunks of code that typically span not more than half a line is useful if the full file isn't conforming to any standard anyway. The obvious alternative would be to leave "full ECMA" to separate .js files (and do whatever needs to be done to make that work) and use inside .qml only the parts that are typically used in that context, perhaps garnished by some syntactic sugar to reduce boiler plate, and maybe restricted to the cases that are easily toolable - i.e. a real Domain Specific Language addressing exactly the task at hand. Andre' From thiago.macieira at intel.com Tue Jun 25 00:52:46 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Mon, 24 Jun 2013 15:52:46 -0700 Subject: [Development] Qt Documentation discoverability in Google In-Reply-To: References: Message-ID: <3051472.FdOSNCibnl@tjmaciei-mobl2> On segunda-feira, 24 de junho de 2013 15.50.17, Knoll Lars wrote: > On 6/24/13 5:32 PM, "Giuseppe D'Angelo" wrote: > >On 24 June 2013 17:20, Markus Goetz wrote: > >> Hi, > >> > >> I remember that gooling for "QWidget" or "QNetworkAccessManager" gave > >> you the documentation page (usually of the latest Qt release) as a first > >> hit. > >> > >> This is not the case anymore, I'm getting an outdated MeeGo Harmattan > >> 4.7 result or Blackberry docs now as the first results. > >> > >> One way to fix this would probably be if qt.nokia.com/doc and > >> doc.trolltech.com would not be blindly forwarded to qt.digia.com but > >> take the 'path' part of the requested URL and also append that on the > >> forward to qt-project.org/doc. Then google would forward that old link > >> juice and the correct Qt documentation could be the first result..) > > > >That's more or less what I proposed to do in > >https://bugreports.qt-project.org/browse/QTWEBSITE-504 , but I don't > >know the control we have on qt.nokia.com / doc.trolltech.com > >domains... > > Unfortunately I don't think we have any control on them :/ Do we need to? $ curl -s -D - http://doc.qt.nokia.com/foobar.html | grep Location: Location: http://doc.qt.digia.com/foobar.html $ curl -v -s -D - http://doc.trolltech.com/foobar.html * About to connect() to doc.trolltech.com port 80 (#0) * Trying 87.238.50.204... No route to host It would be nice if the Digia domain redirected to the official docs in qt- project.org/doc. And as a side note, any chance we can get an automatic search-and-redirect too? If I use "qt:qstring" in KDE, I get sent to http://qt-project.org/doc/qt-5.0/qtdoc/index.html The old TT webpage suggested pages if I had misspelt anything. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Tue Jun 25 04:40:09 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Mon, 24 Jun 2013 19:40:09 -0700 Subject: [Development] QML engine changes In-Reply-To: <20130624215817.GA8402@klara.mpi.htwm.de> References: <1525942.bRdby09J1O@rhea> <3796323.XdnfloCPsg@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> Message-ID: On Mon, Jun 24, 2013 at 2:58 PM, André Pönitz wrote: > > [Upfront: I am _really_ happy to see V8 and the glue code its service > required to be on its way out. But...] > > On Mon, Jun 24, 2013 at 01:30:18PM +0200, Simon Hausmann wrote: >> > This confuses me a bit. Why isn't the implementation tuned specifically >> > for QML, instead of being a fully-compliant ecmascript implementation? >> >> Because we want to continue to support the use-case of import "Foo.js" as Bar; >> I've personally used that for a little spare time app I wrote, when I was >> super happy to discover that a piece of functionality I needed was available >> as third-party JS library that I could just exclude. [...] > > This still somewhat leaves the questions why that use case is so important > that it justifies the hoops that need to be jumped through to make it > happen (especially at the expense of more common uses that typically do not > go much beyond arithmetic expressions and an 'if', or an occasional loop), > and why 100% ECMA conformance for chunks of code that typically span not > more than half a line is useful if the full file isn't conforming to any > standard anyway. Because there's a reason that it's "typically span not more than half a line" instead of "always span not more than half a line". We do see more advanced ECMAScript usage inside QML files, occasionally it's even a valid use case. So we need a complete language with a full specification for these edge cases, and either we make a new one arbitrarily which will be the exact same as ECMAScript for all common cases... or we keep using ECMAScript and maintain the previous and well-loved feature set. > The obvious alternative would be to leave "full ECMA" to separate .js files > (and do whatever needs to be done to make that work) and use inside .qml > only the parts that are typically used in that context, perhaps garnished by > some syntactic sugar to reduce boiler plate, and maybe restricted to the > cases that are easily toolable - i.e. a real Domain Specific Language > addressing exactly the task at hand. We already have a domain specific language, it's called QML and its domain is declarative UI. Part of this language is that you can embed imperative scripting snippets as property bindings, functions and signal handlers. Either we eat the imperative part into QML and make it a confusing cross-paradigm mess, or we maintain a "separate" language for that so that we can clearly differentiate the imperative and declarative parts. Even if we eat it and get an imperative-QML/declarative-QML split, we want maximal focus on declarative-QML and we want imperative-QML to be just some simple, generic-scripting language that we can spend less time on. Okay, let's build a language that's perfect for the task at hand for embedded script in QML. Top needs are: -imperative scripting language -implicit typing -C-like syntax JS already exists, provides all these abilities, and gets bonus points for the established base of users and generic libraries. I'm not saying I like JS, it's one of my least favorite languages. But it's a well-known generic scripting language that we can throw in without over-loading new users. Using JS fits all our needs well and means we can focus on evolving the QML declarative language instead of a scripting language. So it makes sense to use full ECMAScript in QML even without getting into the "the masses chose JS" argument, or the backwards-compatibility argument, both of which are also reason enough to maintain a full ECMAScript engine. I would be interested to hear your toolability complaints about JS embedded in QML, but that's a separate thread. They're probably valid concerns, but it might be just as easy to deal with them in V4 as it is to deal with them by writing a new language. -- Alan Alpert From 416365416c at gmail.com Tue Jun 25 04:57:57 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Mon, 24 Jun 2013 19:57:57 -0700 Subject: [Development] Q_PLUGIN_METADATA documentation In-Reply-To: <51C4D041.5050107@gmail.com> References: <51C4D041.5050107@gmail.com> Message-ID: On Fri, Jun 21, 2013 at 3:14 PM, Lorn Potter wrote: > Hi *, > > While working on QTBUG-31900, there was a change in qtbase - 732dcfe7 > which broke loading of sensorgesture plugins. > > It turns out, the plugin loader is now only loading the first > sensorgesture plugin found. > > If I remove the FILE portion of the Q_PLUGIN_METADATA entry they all > load and tests pass. > The json file for all sensorgestures plugins contains the same thing: > { "Keys": [ "notused" ] } > This has been working fine since 5.0 > > The documentation here: > http://qt-project.org/doc/qt-5.0/qtcore/qtplugin.html#Q_PLUGIN_METADATA > > says nothing about the contents of the json file, what is possible for > it to contain, what it should contain, or even it's purpose. AFAIK, the JSON file is there to provide plugin specific meta-data which can be queried without dlopen. It's use is optional and only there for plugins need it. I usually write my plugins without a JSON file because they don't need one. No problems so far... > The example mentioned there only refers back to this page. > > Can someone explain this? and perhaps beef up that documentation? I have no real idea how it works, I just use it occasionally ;) . But more documentation from those who know would be nice. -- Alan Alpert From 416365416c at gmail.com Tue Jun 25 05:10:08 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Mon, 24 Jun 2013 20:10:08 -0700 Subject: [Development] Qt Documentation discoverability in Google In-Reply-To: <3051472.FdOSNCibnl@tjmaciei-mobl2> References: <3051472.FdOSNCibnl@tjmaciei-mobl2> Message-ID: On Mon, Jun 24, 2013 at 3:52 PM, Thiago Macieira wrote: > On segunda-feira, 24 de junho de 2013 15.50.17, Knoll Lars wrote: >> On 6/24/13 5:32 PM, "Giuseppe D'Angelo" wrote: >> >On 24 June 2013 17:20, Markus Goetz wrote: >> >> Hi, >> >> >> >> I remember that gooling for "QWidget" or "QNetworkAccessManager" gave >> >> you the documentation page (usually of the latest Qt release) as a first >> >> hit. >> >> >> >> This is not the case anymore, I'm getting an outdated MeeGo Harmattan >> >> 4.7 result or Blackberry docs now as the first results. >> >> >> >> One way to fix this would probably be if qt.nokia.com/doc and >> >> doc.trolltech.com would not be blindly forwarded to qt.digia.com but >> >> take the 'path' part of the requested URL and also append that on the >> >> forward to qt-project.org/doc. Then google would forward that old link >> >> juice and the correct Qt documentation could be the first result..) >> > >> >That's more or less what I proposed to do in >> >https://bugreports.qt-project.org/browse/QTWEBSITE-504 , but I don't >> >know the control we have on qt.nokia.com / doc.trolltech.com >> >domains... >> >> Unfortunately I don't think we have any control on them :/ > > Do we need to? > > $ curl -s -D - http://doc.qt.nokia.com/foobar.html | grep Location: > Location: http://doc.qt.digia.com/foobar.html > > $ curl -v -s -D - http://doc.trolltech.com/foobar.html > * About to connect() to doc.trolltech.com port 80 (#0) > * Trying 87.238.50.204... No route to host > > It would be nice if the Digia domain redirected to the official docs in qt- > project.org/doc. > > And as a side note, any chance we can get an automatic search-and-redirect > too? If I use "qt:qstring" in KDE, I get sent to > http://qt-project.org/doc/qt-5.0/qtdoc/index.html > > The old TT webpage suggested pages if I had misspelt anything. I liked this feature too, vote for https://bugreports.qt-project.org/browse/QTWEBSITE-528 ! I presume that JIRA is a good place for filing website feature requests. The relevant people presumably watch their JIRA notifications more closely than the dev list. -- Alan Alpert From Jani.Heikkinen at digia.com Tue Jun 25 07:54:31 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Tue, 25 Jun 2013 05:54:31 +0000 Subject: [Development] New Qt5.1 snapshot available Message-ID: Good morning, There is again new snapshot(2013-06-25-65/) available in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It is already quite near of rc2 but some changes are still missing. Below is listed new changes since my previous mail: Qtsdk: · Fix warnings during installation, QTBUG-31955 · mkqt5bld: qtquickcontrols added to essentials list, QTBUG-31718 · Fix path for MaintenanceTool links * Make sure that createShortcuts() function is not global, QTIFW-294 * Add -no-c++11 to Mac configure options Qt5 · configure: Fix srcpath when you run configure in the top-level dir · rewrite top-level configures without perl, QTBUG-31786 qt-creator: · Fix broken list requests in CodePaster, QTCREATORBUG-9547 Br, Jani From: Heikkinen Jani Sent: 20. kesäkuuta 2013 12:58 To: development at qt-project.org; releasing at qt-project.org Subject: New Qt5.1 snapshot available Hi all, There is new snapshot available after RC1. Unfortunately there is problems in the Linux builds and that's why only Windows & Mac offline installers are available. Fixing is ongoing, let's hope we can have all installers available tomorrow! You can download newest installers from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Below is listed changes included since RC1: Qtsdk: · QTBUG-29802: Make database plug-ins/derivers avaliable by default · QTBUG-28963: cannot unmount DMG after installing Qt OSX package and starting creator · Update installer graphics · Do not mention SDK in user visible installer texts · Change "Qt" as a name of the field in online installer qt-creator · QTCREATORBUG-9558 · AndroidRunner: Fix CheckPidTimer to not fire forever qtbase: · Android Mute and FastForward keys mapped wrong · make Makefiles not depend on .qmake.super · QTBUG-31289 fix rcc & uic .depend_commands · always $-escape make commands · QTBUG-31289 fix command over-escaping in vcproj files · assemble the tool commands at use time, after all · QTBUG-31750 OSX: Disable window restoration for the Mac color panel · QTBUG-29161 Cocoa color dialog cannot be modal, but should show anyway · QTBUG-31566 OSX color dialog can be accepted repeatedly · QTBUG-31667 network requests: do not access 1st byte of empty byte array · QTBUG-31745 Doc: Remove Tweet Search demo from the list of highlighted examples · Adjust the cmake files to find the dlls in the bin dir. · qtdeclarative: · QTBUG-31699 photosurface demo: behavior depends on initialization order · stabilize tst_touchmouse. · QFileDialogHelper: Force QWindow before setting flags. qtdoc: · Doc: Added a link to Qt Quick Controls Overview · QTBUG-31737 Document the deprecation of WFlags Qtmultimedia: · Android: Fix for uncaught java exception. · Fix for url bug in the qmlvideo examples. Qtquickcontrols: · QTBUG-31778 Doc: Fix QCH documentation structure for Qt Quick Layouts · Revert "Add qml/js files in resource files" · Doc: Fixed Qt Quick Layouts listing in qch files. · QTBUG-31565 Add qml/js files in resource files qttools · QTBUG-31153 Find the cmake version template in the install location. Qttranslations · QTBUG-31727 fix qm output dir for non-prefix builds Qtwebkit · [Qt][Mac] Disable QTKit video on OS X. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From dangelog at gmail.com Tue Jun 25 08:09:38 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Tue, 25 Jun 2013 08:09:38 +0200 Subject: [Development] Q_PLUGIN_METADATA documentation In-Reply-To: <51C4D041.5050107@gmail.com> References: <51C4D041.5050107@gmail.com> Message-ID: On 22 June 2013 00:14, Lorn Potter wrote: > > The documentation here: > http://qt-project.org/doc/qt-5.0/qtcore/qtplugin.html#Q_PLUGIN_METADATA > > says nothing about the contents of the json file, what is possible for > it to contain, what it should contain, or even it's purpose. It's optional; it can contain any valid JSON. The idea is that you can load that JSON and thus do some inquires about the plugin _without_ dlopening the plugin itself, by using QPluginLoader::metaData. For instance, for an image plugin, you could figure out what are its supported image formats without the need to load the plugin, create an instance of some object and call some virtual method. HTH, -- Giuseppe D'Angelo From wssddc at wssddc.com Tue Jun 25 07:23:21 2013 From: wssddc at wssddc.com (Bob Babcock) Date: Tue, 25 Jun 2013 05:23:21 +0000 (UTC) Subject: [Development] Heads-up: QDir::mkpath in 5.1 RC is broken on Windows References: <5B2736A3C8B75B4BB66BC58DC5E889B08C45BE@IT-EXMB01-HKI.it.local> Message-ID: Koehne Kai wrote in news:5B2736A3C8B75B4BB66BC58DC5E889B08C45BE at IT-EXMB01-HKI.it.local: > Just managed to track down a couple of seemingly independent issues > with the 5.1 RC. It turns out that QDir::mkpath is broken if the > directory to create isn't on the same drive as the current working > directory: I see qmake failing if the build directory (on a different drive) does not exist. Sure sounds like the mkpath bug could explain this behavior, but I thought I should mention it in case something else is wrong. From Jani.Heikkinen at digia.com Tue Jun 25 09:29:42 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Tue, 25 Jun 2013 07:29:42 +0000 Subject: [Development] New Qt5.1 snapshot available Message-ID: Hi all, Quite many changes were missing from my previous mail, sorry about that. Here is list of missing changes: Qtbase: · CMake: Fix test for value starting with -L · Fix missing shortcuts for WindowContainers · QTBUG-31776 Fix missing focus events for mapped child windows · QTBUG-31806 Android: handle keyboard connect/disconnect · fix LD_LIBRARY_PATH manipulation in uic calls not being make-escaped · update QtNetwork changelog for 5.1.0 · QTBUG-30173 Tagged all those examples that work on an Android device · QTBUG-31476 QFactoryLoader: Release unused libraries. · QTBUG-31476 Remove unused member QFactoryLoaderPrivate::keyList. Qtdeclarative · QTBUG-31834 QColorDialogHelper: Force QWindow before setting flags · QTBUG-30173 Doc: Changed the title to avoid name conflicts and linking error Qtmultimedia · Add changes-5.1.0 file · QTBUG-31868 QTBUG-31476 Multimedia plugins now have a unique JSON metadata 'Keys' property. qtquick1 · Add changes-5.1.0 file qtquickcontrols · QTBUG-31796 Doc: Fix QCH filter attributes for Qt Quick Controls/Styles qtsensors · Fix loading of all sensorgesture plugins. Qttools · Add changes-5.1.0 file From: Heikkinen Jani Sent: 25. kesäkuuta 2013 8:55 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Good morning, There is again new snapshot(2013-06-25-65/) available in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It is already quite near of rc2 but some changes are still missing. Below is listed new changes since my previous mail: Qtsdk: · Fix warnings during installation, QTBUG-31955 · mkqt5bld: qtquickcontrols added to essentials list, QTBUG-31718 · Fix path for MaintenanceTool links * Make sure that createShortcuts() function is not global, QTIFW-294 * Add -no-c++11 to Mac configure options Qt5 · configure: Fix srcpath when you run configure in the top-level dir · rewrite top-level configures without perl, QTBUG-31786 qt-creator: · Fix broken list requests in CodePaster, QTCREATORBUG-9547 Br, Jani From: Heikkinen Jani Sent: 20. kesäkuuta 2013 12:58 To: development at qt-project.org; releasing at qt-project.org Subject: New Qt5.1 snapshot available Hi all, There is new snapshot available after RC1. Unfortunately there is problems in the Linux builds and that's why only Windows & Mac offline installers are available. Fixing is ongoing, let's hope we can have all installers available tomorrow! You can download newest installers from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Below is listed changes included since RC1: Qtsdk: · QTBUG-29802: Make database plug-ins/derivers avaliable by default · QTBUG-28963: cannot unmount DMG after installing Qt OSX package and starting creator · Update installer graphics · Do not mention SDK in user visible installer texts · Change "Qt" as a name of the field in online installer qt-creator · QTCREATORBUG-9558 · AndroidRunner: Fix CheckPidTimer to not fire forever qtbase: · Android Mute and FastForward keys mapped wrong · make Makefiles not depend on .qmake.super · QTBUG-31289 fix rcc & uic .depend_commands · always $-escape make commands · QTBUG-31289 fix command over-escaping in vcproj files · assemble the tool commands at use time, after all · QTBUG-31750 OSX: Disable window restoration for the Mac color panel · QTBUG-29161 Cocoa color dialog cannot be modal, but should show anyway · QTBUG-31566 OSX color dialog can be accepted repeatedly · QTBUG-31667 network requests: do not access 1st byte of empty byte array · QTBUG-31745 Doc: Remove Tweet Search demo from the list of highlighted examples · Adjust the cmake files to find the dlls in the bin dir. · qtdeclarative: · QTBUG-31699 photosurface demo: behavior depends on initialization order · stabilize tst_touchmouse. · QFileDialogHelper: Force QWindow before setting flags. qtdoc: · Doc: Added a link to Qt Quick Controls Overview · QTBUG-31737 Document the deprecation of WFlags Qtmultimedia: · Android: Fix for uncaught java exception. · Fix for url bug in the qmlvideo examples. Qtquickcontrols: · QTBUG-31778 Doc: Fix QCH documentation structure for Qt Quick Layouts · Revert "Add qml/js files in resource files" · Doc: Fixed Qt Quick Layouts listing in qch files. · QTBUG-31565 Add qml/js files in resource files qttools · QTBUG-31153 Find the cmake version template in the install location. Qttranslations · QTBUG-31727 fix qm output dir for non-prefix builds Qtwebkit · [Qt][Mac] Disable QTKit video on OS X. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From simon.hausmann at digia.com Tue Jun 25 11:14:27 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Tue, 25 Jun 2013 11:14:27 +0200 Subject: [Development] QML engine changes In-Reply-To: <20130624215817.GA8402@klara.mpi.htwm.de> References: <1525942.bRdby09J1O@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> Message-ID: <1685807.9fTUVD1qkJ@rhea> On Monday 24. June 2013 23.58.17 André Pönitz wrote: > [Upfront: I am _really_ happy to see V8 and the glue code its service > required to be on its way out. But...] > > On Mon, Jun 24, 2013 at 01:30:18PM +0200, Simon Hausmann wrote: > > > This confuses me a bit. Why isn't the implementation tuned specifically > > > for QML, instead of being a fully-compliant ecmascript implementation? > > > > Because we want to continue to support the use-case of import "Foo.js" as > > Bar; I've personally used that for a little spare time app I wrote, when > > I was super happy to discover that a piece of functionality I needed was > > available as third-party JS library that I could just exclude. [...] > > This still somewhat leaves the questions why that use case is so important > that it justifies the hoops that need to be jumped through to make it > happen (especially at the expense of more common uses that typically do not > go much beyond arithmetic expressions and an 'if', or an occasional loop), > and why 100% ECMA conformance for chunks of code that typically span not > more than half a line is useful if the full file isn't conforming to any > standard anyway. > > The obvious alternative would be to leave "full ECMA" to separate .js files > (and do whatever needs to be done to make that work) and use inside .qml > only the parts that are typically used in that context, perhaps garnished by > some syntactic sugar to reduce boiler plate, and maybe restricted to the > cases that are easily toolable - i.e. a real Domain Specific Language > addressing exactly the task at hand. I think that this point there are no hoops we need to jump through to get ECMAScript compliance. It was a high priority for during the development (what's done is done) and I think we can maintain the compliance at a very very low cost. Note that plenty of our own examples make use of "pure" JavaScript, and then the question is: Where do we draw the line? At the ECMAScript "classes"? At the exception throwing behaviour? To me the best question to those answers is simply: Just be fully spec compliant. Simon From lpapp at kde.org Tue Jun 25 13:14:18 2013 From: lpapp at kde.org (Laszlo Papp) Date: Tue, 25 Jun 2013 14:14:18 +0300 Subject: [Development] New Qt5.1 snapshot available In-Reply-To: References: Message-ID: Is it possible to run the installer in console mode? On Tue, Jun 25, 2013 at 10:29 AM, Heikkinen Jani wrote: > Hi all,**** > > Quite many changes were missing from my previous mail, sorry about that. > Here is list of missing changes:**** > > ** ** > > Qtbase:**** > > **· **CMake: Fix test for value starting with -L**** > > **· **Fix missing shortcuts for WindowContainers**** > > **· **QTBUG-31776 Fix missing focus events for mapped child windows > **** > > **· **QTBUG-31806 Android: handle keyboard connect/disconnect**** > > **· **fix LD_LIBRARY_PATH manipulation in uic calls not being > make-escaped**** > > **· **update QtNetwork changelog for 5.1.0**** > > **· **QTBUG-30173 Tagged all those examples that work on an > Android device**** > > **· **QTBUG-31476 QFactoryLoader: Release unused libraries.**** > > **· **QTBUG-31476 Remove unused member > QFactoryLoaderPrivate::keyList.**** > > ** ** > > Qtdeclarative**** > > **· **QTBUG-31834 QColorDialogHelper: Force QWindow before setting > flags**** > > **· **QTBUG-30173 Doc: Changed the title to avoid name conflicts > and linking error**** > > Qtmultimedia**** > > **· **Add changes-5.1.0 file**** > > **· **QTBUG-31868 QTBUG-31476 Multimedia plugins now have a unique > JSON metadata 'Keys' property.**** > > qtquick1**** > > **· **Add changes-5.1.0 file**** > > qtquickcontrols**** > > **· **QTBUG-31796 Doc: Fix QCH filter attributes for Qt Quick > Controls/Styles**** > > qtsensors**** > > **· **Fix loading of all sensorgesture plugins.**** > > Qttools**** > > **· **Add changes-5.1.0 file**** > > ** ** > > ** ** > > ** ** > > ** ** > > *From:* Heikkinen Jani > *Sent:* 25. kesäkuuta 2013 8:55 > *To:* development at qt-project.org; releasing at qt-project.org > *Subject:* RE: New Qt5.1 snapshot available**** > > ** ** > > Good morning,**** > > There is again new snapshot(2013-06-25-65/) available in > http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It is > already quite near of rc2 but some changes are still missing. Below is > listed new changes since my previous mail:**** > > ** ** > > Qtsdk:**** > > **· **Fix warnings during installation, QTBUG-31955 > **** > > **· **mkqt5bld: qtquickcontrols added to essentials list, > QTBUG-31718 > **** > > **· **Fix path for MaintenanceTool links**** > > - Make sure that createShortcuts() function is not global, QTIFW-294 > **** > - Add -no-c++11 to Mac configure options **** > > Qt5**** > > **· **configure: Fix srcpath when you run configure in the > top-level dir**** > > **· **rewrite top-level configures without perl, QTBUG-31786 > **** > > qt-creator:**** > > **· **Fix broken list requests in CodePaster, QTCREATORBUG-9547 > **** > > Br,**** > > Jani**** > > ** ** > > *From:* Heikkinen Jani > *Sent:* 20. kesäkuuta 2013 12:58 > *To:* development at qt-project.org; releasing at qt-project.org > *Subject:* New Qt5.1 snapshot available**** > > ** ** > > Hi all,**** > > There is new snapshot available after RC1. Unfortunately there is problems > in the Linux builds and that’s why only Windows & Mac offline installers > are available. Fixing is ongoing, let’s hope we can have all installers > available tomorrow!**** > > ** ** > > You can download newest installers from > http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/**** > > ** ** > > Below is listed changes included since RC1:**** > > Qtsdk:**** > > **· **QTBUG-29802: Make database plug-ins/derivers avaliable by > default**** > > **· **QTBUG-28963: cannot unmount DMG after installing Qt OSX > package and starting creator**** > > **· **Update installer graphics**** > > **· **Do not mention SDK in user visible installer texts**** > > **· **Change "Qt" as a name of the field in online installer > **** > > qt-creator**** > > **· **QTCREATORBUG-9558 > **** > > **· **AndroidRunner: Fix CheckPidTimer to not fire forever**** > > qtbase:**** > > **· **Android Mute and FastForward keys mapped wrong**** > > **· **make Makefiles not depend on .qmake.super**** > > **· **QTBUG-31289 fix rcc & uic .depend_commands**** > > **· **always $-escape make commands**** > > **· **QTBUG-31289 fix command over-escaping in vcproj files**** > > **· **assemble the tool commands at use time, after all**** > > **· **QTBUG-31750 OSX: Disable window restoration for the Mac > color panel**** > > **· **QTBUG-29161 Cocoa color dialog cannot be modal, but should > show anyway**** > > **· **QTBUG-31566 OSX color dialog can be accepted repeatedly**** > > **· **QTBUG-31667 network requests: do not access 1st byte of > empty byte array**** > > **· **QTBUG-31745 Doc: Remove Tweet Search demo from the list of > highlighted examples**** > > **· **Adjust the cmake files to find the dlls in the bin dir.**** > > **· **** ** > > qtdeclarative:**** > > **· **QTBUG-31699 photosurface demo: behavior depends on > initialization order**** > > **· **stabilize tst_touchmouse.**** > > **· **QFileDialogHelper: Force QWindow before setting flags.**** > > qtdoc:**** > > **· **Doc: Added a link to Qt Quick Controls Overview**** > > **· **QTBUG-31737 Document the deprecation of WFlags**** > > Qtmultimedia:**** > > **· **Android: Fix for uncaught java exception.**** > > **· **Fix for url bug in the qmlvideo examples.**** > > Qtquickcontrols:**** > > **· **QTBUG-31778 Doc: Fix QCH documentation structure for Qt > Quick Layouts**** > > **· **Revert "Add qml/js files in resource files"**** > > **· **Doc: Fixed Qt Quick Layouts listing in qch files.**** > > **· **QTBUG-31565 Add qml/js files in resource files**** > > qttools**** > > **· **QTBUG-31153 Find the cmake version template in the install > location.**** > > Qttranslations**** > > **· **QTBUG-31727 fix qm output dir for non-prefix builds**** > > Qtwebkit**** > > **· **[Qt][Mac] Disable QTKit video on OS X.**** > > ** ** > > Br, Jani**** > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Tim.Jenssen at digia.com Tue Jun 25 13:17:33 2013 From: Tim.Jenssen at digia.com (Jenssen Tim) Date: Tue, 25 Jun 2013 11:17:33 +0000 Subject: [Development] New Qt5.1 snapshot available In-Reply-To: References: , Message-ID: <5A741CD7E24AB34A8C8DF7D446719B7315941E91@IT-EXMB02-HKI.it.local> No it isn't, there is the possibility to run the installer without any input but it needs an X server on linux for example. ________________________________ Von: development-bounces+tim.jenssen=digia.com at qt-project.org [development-bounces+tim.jenssen=digia.com at qt-project.org]" im Auftrag von "Laszlo Papp [lpapp at kde.org] Gesendet: Dienstag, 25. Juni 2013 13:14 An: Heikkinen Jani Cc: development at qt-project.org; releasing at qt-project.org Betreff: Re: [Development] New Qt5.1 snapshot available Is it possible to run the installer in console mode? On Tue, Jun 25, 2013 at 10:29 AM, Heikkinen Jani > wrote: Hi all, Quite many changes were missing from my previous mail, sorry about that. Here is list of missing changes: Qtbase: • CMake: Fix test for value starting with -L • Fix missing shortcuts for WindowContainers • QTBUG-31776 Fix missing focus events for mapped child windows • QTBUG-31806 Android: handle keyboard connect/disconnect • fix LD_LIBRARY_PATH manipulation in uic calls not being make-escaped • update QtNetwork changelog for 5.1.0 • QTBUG-30173 Tagged all those examples that work on an Android device • QTBUG-31476 QFactoryLoader: Release unused libraries. • QTBUG-31476 Remove unused member QFactoryLoaderPrivate::keyList. Qtdeclarative • QTBUG-31834 QColorDialogHelper: Force QWindow before setting flags • QTBUG-30173 Doc: Changed the title to avoid name conflicts and linking error Qtmultimedia • Add changes-5.1.0 file • QTBUG-31868 QTBUG-31476 Multimedia plugins now have a unique JSON metadata 'Keys' property. qtquick1 • Add changes-5.1.0 file qtquickcontrols • QTBUG-31796 Doc: Fix QCH filter attributes for Qt Quick Controls/Styles qtsensors • Fix loading of all sensorgesture plugins. Qttools • Add changes-5.1.0 file From: Heikkinen Jani Sent: 25. kesäkuuta 2013 8:55 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Good morning, There is again new snapshot(2013-06-25-65/) available in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It is already quite near of rc2 but some changes are still missing. Below is listed new changes since my previous mail: Qtsdk: • Fix warnings during installation, QTBUG-31955 • mkqt5bld: qtquickcontrols added to essentials list, QTBUG-31718 • Fix path for MaintenanceTool links * Make sure that createShortcuts() function is not global, QTIFW-294 * Add -no-c++11 to Mac configure options Qt5 • configure: Fix srcpath when you run configure in the top-level dir • rewrite top-level configures without perl, QTBUG-31786 qt-creator: • Fix broken list requests in CodePaster, QTCREATORBUG-9547 Br, Jani From: Heikkinen Jani Sent: 20. kesäkuuta 2013 12:58 To: development at qt-project.org; releasing at qt-project.org Subject: New Qt5.1 snapshot available Hi all, There is new snapshot available after RC1. Unfortunately there is problems in the Linux builds and that’s why only Windows & Mac offline installers are available. Fixing is ongoing, let’s hope we can have all installers available tomorrow! You can download newest installers from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Below is listed changes included since RC1: Qtsdk: • QTBUG-29802: Make database plug-ins/derivers avaliable by default • QTBUG-28963: cannot unmount DMG after installing Qt OSX package and starting creator • Update installer graphics • Do not mention SDK in user visible installer texts • Change "Qt" as a name of the field in online installer qt-creator • QTCREATORBUG-9558 • AndroidRunner: Fix CheckPidTimer to not fire forever qtbase: • Android Mute and FastForward keys mapped wrong • make Makefiles not depend on .qmake.super • QTBUG-31289 fix rcc & uic .depend_commands • always $-escape make commands • QTBUG-31289 fix command over-escaping in vcproj files • assemble the tool commands at use time, after all • QTBUG-31750 OSX: Disable window restoration for the Mac color panel • QTBUG-29161 Cocoa color dialog cannot be modal, but should show anyway • QTBUG-31566 OSX color dialog can be accepted repeatedly • QTBUG-31667 network requests: do not access 1st byte of empty byte array • QTBUG-31745 Doc: Remove Tweet Search demo from the list of highlighted examples • Adjust the cmake files to find the dlls in the bin dir. • qtdeclarative: • QTBUG-31699 photosurface demo: behavior depends on initialization order • stabilize tst_touchmouse. • QFileDialogHelper: Force QWindow before setting flags. qtdoc: • Doc: Added a link to Qt Quick Controls Overview • QTBUG-31737 Document the deprecation of WFlags Qtmultimedia: • Android: Fix for uncaught java exception. • Fix for url bug in the qmlvideo examples. Qtquickcontrols: • QTBUG-31778 Doc: Fix QCH documentation structure for Qt Quick Layouts • Revert "Add qml/js files in resource files" • Doc: Fixed Qt Quick Layouts listing in qch files. • QTBUG-31565 Add qml/js files in resource files qttools • QTBUG-31153 Find the cmake version template in the install location. Qttranslations • QTBUG-31727 fix qm output dir for non-prefix builds Qtwebkit • [Qt][Mac] Disable QTKit video on OS X. Br, Jani _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From olszak.tomasz at gmail.com Tue Jun 25 13:21:33 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Tue, 25 Jun 2013 13:21:33 +0200 Subject: [Development] Qt 5.1 compile problem Message-ID: Hi, *compiler:* mipsel-linux-uclibc-g++ *configure args: *-no-pch -hostprefix $HOSTPREFIX -v -release -opengl es2 -opensource -confirm-license -make libs -device $DEVICE -device-option CROSS_COMPILE=$COMPILER_PREFIX -prefix /usr/local -sysroot $SYSROOT -nomake examples -nomake demos -no-pch -eglfs -qpa eglfs -system-libpng -no-widgets error (linking libQt5Network): .obj/release-shared/qnativesocketengine_unix.o: In function `QNativeSocketEnginePrivate::nativeSelect(int, bool) const': qnativesocketengine_unix.cpp:(.text+0x2744): undefined reference to `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' qnativesocketengine_unix.cpp:(.text+0x2774): undefined reference to `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' .obj/release-shared/qnativesocketengine_unix.o: In function `QNativeSocketEnginePrivate::nativeSelect(int, bool, bool, bool*, bool*) const': qnativesocketengine_unix.cpp:(.text+0x2884): undefined reference to `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' .obj/release-shared/qnativesocketengine_unix.o: In function `QNativeSocketEnginePrivate::nativeSelect(int, bool) const': qnativesocketengine_unix.cpp:(.text+0x2758): undefined reference to `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' qnativesocketengine_unix.cpp:(.text+0x2788): undefined reference to `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' .obj/release-shared/qnativesocketengine_unix.o:qnativesocketengine_unix.cpp:(.text+0x2890): more undefined references to `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' follow collect2: ld returned 1 exit status make[3]: *** [../../lib/libQt5Network.so.5.1.0] Does anyone have an idea what could cause the problem? I was able to built 5.0 for this specific target without any problem. -- regards / pozdrawiam, Tomasz Olszak Qt for Tizen | http://qt-project.org/wiki/Tizen Qt Certified Developer | http://qt-project.org http://linkedin.com/in/tolszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From Lars.Knoll at digia.com Tue Jun 25 14:38:05 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Tue, 25 Jun 2013 12:38:05 +0000 Subject: [Development] Qt 5.2 Message-ID: Hi everybody, With Qt 5.1 is now almost done, this is probably a good time to start thinking about Qt 5.2. There's a few things I'd like us to focus on for 5.2, but before we get to the content let's have a short look at the time schedule. Our goal should be to release 5.2 in November, so we have a bit of slack before christmas. Unfortunately we'll also need some time to still do feature development, so the proposal would be to aim for releasing the alpha end of September. Functionality wise, I can see a couple of areas that will be worked on for 5.2. I expect a lot of the discussions around 5.2 will happen at the contributor summit, but here's anyway a list of things I'm already seeing: * new Qml engine See also Simon's mail from a few days ago. We're already pretty close to merging this back into the dev branch. CI has been enabled on the v4 branch yesterday and the final problems are being fixed. Simon or myself will send a separate mail about it once we are ready to merge back. * Full Android and iOS support Both are expected to be fully working with 5.2. * Qt Quick Controls Add support for touch based devices * Add some of the former mobility modules back into the list of supported modules Alex Blasche has been trying to get an overview over these modules, and is working on prioritising things together with the people interested in them. The exact scope of what we're aiming for here will most likely be finalise during QtCS * Qt 3D Are we going to get this one ready in time for 5.2? * Qt Mac Extras and Qt Win Extras I hope we'll be able to add these modules to 5.2 as well. In addition, there's most likely a huge list of smaller features that are being planned by different people for 5.2. It would be good if everybody speaks up and tells us what they are planning for 5.2, so we can have a rough overview over what's coming. Finally, I'd like to discuss deprecation of two modules for 5.2: Qt Quick 1 and Qt OpenGL. The reason for deprecating these is that they offer older versions of functionality/APIs and we have replacement APIs that are for the most part better then what's being offered by these modules. In addition, we don't have anybody actively working on these modules and maintaining them. Qt Quick 1 has been superseded by Qt Quick 2 and is currently not being maintained by anybody. The best choice is in my opinion to start deprecating the module and focus our efforts and time on Qt Quick 2. Most of the functionality of Qt OpenGL is now being offered by Qt Gui and Qt Widgets. There's a small feature gap that we would still need to fill, but then we should be able to deprecate the module as well. Let's see what other things come up for 5.2. It'll be good to start collecting these things here on the mailing list already now, so that we can use that as input to the discussions at QtCS. Cheers, Lars From daniel.teske at digia.com Tue Jun 25 15:33:30 2013 From: daniel.teske at digia.com (Daniel Teske) Date: Tue, 25 Jun 2013 15:33:30 +0200 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <201306251533.30413.daniel.teske@digia.com> > Our goal should be to release 5.2 in November, so we have a bit of slack > before christmas. Unfortunately we'll also need some time to still do > feature development, so the proposal would be to aim for releasing the > alpha end of September. Shouldn't there be a discussion first on what went wrong with the 5.1 schedule? Because clearly we are way beyond the end of april target. If there's no discussion on why that happend and how we are going to improve the process, then this plan will be as unachievable as the last one. daniel From lpapp at kde.org Tue Jun 25 15:38:56 2013 From: lpapp at kde.org (Laszlo Papp) Date: Tue, 25 Jun 2013 16:38:56 +0300 Subject: [Development] New Qt5.1 snapshot available In-Reply-To: <5A741CD7E24AB34A8C8DF7D446719B7315941E91@IT-EXMB02-HKI.it.local> References: <5A741CD7E24AB34A8C8DF7D446719B7315941E91@IT-EXMB02-HKI.it.local> Message-ID: Shall I create a bug report for it or it is already done? On Tue, Jun 25, 2013 at 2:17 PM, Jenssen Tim wrote: > No it isn't, there is the possibility to run the installer without any > input but it needs an X server on linux for example. > > ------------------------------ > *Von:* development-bounces+tim.jenssen=digia.com at qt-project.org[development-bounces+tim.jenssen= > digia.com at qt-project.org]" im Auftrag von "Laszlo Papp [lpapp at kde.org] > *Gesendet:* Dienstag, 25. Juni 2013 13:14 > *An:* Heikkinen Jani > *Cc:* development at qt-project.org; releasing at qt-project.org > *Betreff:* Re: [Development] New Qt5.1 snapshot available > > Is it possible to run the installer in console mode? > > > On Tue, Jun 25, 2013 at 10:29 AM, Heikkinen Jani > wrote: > >> Hi all,**** >> >> Quite many changes were missing from my previous mail, sorry about that. >> Here is list of missing changes:**** >> >> ** ** >> >> Qtbase:**** >> >> **· **CMake: Fix test for value starting with -L**** >> >> **· **Fix missing shortcuts for WindowContainers**** >> >> **· **QTBUG-31776 Fix missing focus events for mapped child >> windows**** >> >> **· **QTBUG-31806 Android: handle keyboard connect/disconnect**** >> >> **· **fix LD_LIBRARY_PATH manipulation in uic calls not being >> make-escaped**** >> >> **· **update QtNetwork changelog for 5.1.0**** >> >> **· **QTBUG-30173 Tagged all those examples that work on an >> Android device**** >> >> **· **QTBUG-31476 QFactoryLoader: Release unused libraries.**** >> >> **· **QTBUG-31476 Remove unused member >> QFactoryLoaderPrivate::keyList.**** >> >> ** ** >> >> Qtdeclarative**** >> >> **· **QTBUG-31834 QColorDialogHelper: Force QWindow before >> setting flags**** >> >> **· **QTBUG-30173 Doc: Changed the title to avoid name conflicts >> and linking error**** >> >> Qtmultimedia**** >> >> **· **Add changes-5.1.0 file**** >> >> **· **QTBUG-31868 QTBUG-31476 Multimedia plugins now have a >> unique JSON metadata 'Keys' property.**** >> >> qtquick1**** >> >> **· **Add changes-5.1.0 file**** >> >> qtquickcontrols**** >> >> **· **QTBUG-31796 Doc: Fix QCH filter attributes for Qt Quick >> Controls/Styles**** >> >> qtsensors**** >> >> **· **Fix loading of all sensorgesture plugins.**** >> >> Qttools**** >> >> **· **Add changes-5.1.0 file**** >> >> ** ** >> >> ** ** >> >> ** ** >> >> ** ** >> >> *From:* Heikkinen Jani >> *Sent:* 25. kesäkuuta 2013 8:55 >> *To:* development at qt-project.org; releasing at qt-project.org >> *Subject:* RE: New Qt5.1 snapshot available**** >> >> ** ** >> >> Good morning,**** >> >> There is again new snapshot(2013-06-25-65/) available in >> http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It >> is already quite near of rc2 but some changes are still missing. Below is >> listed new changes since my previous mail:**** >> >> ** ** >> >> Qtsdk:**** >> >> **· **Fix warnings during installation, QTBUG-31955 >> **** >> >> **· **mkqt5bld: qtquickcontrols added to essentials list, >> QTBUG-31718 >> **** >> >> **· **Fix path for MaintenanceTool links**** >> >> - Make sure that createShortcuts() function is not global, QTIFW-294 >> **** >> - Add -no-c++11 to Mac configure options **** >> >> Qt5**** >> >> **· **configure: Fix srcpath when you run configure in the >> top-level dir**** >> >> **· **rewrite top-level configures without perl, QTBUG-31786 >> **** >> >> qt-creator:**** >> >> **· **Fix broken list requests in CodePaster, QTCREATORBUG-9547 >> **** >> >> Br,**** >> >> Jani**** >> >> ** ** >> >> *From:* Heikkinen Jani >> *Sent:* 20. kesäkuuta 2013 12:58 >> *To:* development at qt-project.org; releasing at qt-project.org >> *Subject:* New Qt5.1 snapshot available**** >> >> ** ** >> >> Hi all,**** >> >> There is new snapshot available after RC1. Unfortunately there is >> problems in the Linux builds and that’s why only Windows & Mac offline >> installers are available. Fixing is ongoing, let’s hope we can have all >> installers available tomorrow!**** >> >> ** ** >> >> You can download newest installers from >> http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/**** >> >> ** ** >> >> Below is listed changes included since RC1:**** >> >> Qtsdk:**** >> >> **· **QTBUG-29802: Make database plug-ins/derivers avaliable by >> default**** >> >> **· **QTBUG-28963: cannot unmount DMG after installing Qt OSX >> package and starting creator**** >> >> **· **Update installer graphics**** >> >> **· **Do not mention SDK in user visible installer texts**** >> >> **· **Change "Qt" as a name of the field in online >> installer**** >> >> qt-creator**** >> >> **· **QTCREATORBUG-9558 >> **** >> >> **· **AndroidRunner: Fix CheckPidTimer to not fire forever**** >> >> qtbase:**** >> >> **· **Android Mute and FastForward keys mapped wrong**** >> >> **· **make Makefiles not depend on .qmake.super**** >> >> **· **QTBUG-31289 fix rcc & uic .depend_commands**** >> >> **· **always $-escape make commands**** >> >> **· **QTBUG-31289 fix command over-escaping in vcproj files**** >> >> **· **assemble the tool commands at use time, after all**** >> >> **· **QTBUG-31750 OSX: Disable window restoration for the Mac >> color panel**** >> >> **· **QTBUG-29161 Cocoa color dialog cannot be modal, but should >> show anyway**** >> >> **· **QTBUG-31566 OSX color dialog can be accepted repeatedly**** >> >> **· **QTBUG-31667 network requests: do not access 1st byte of >> empty byte array**** >> >> **· **QTBUG-31745 Doc: Remove Tweet Search demo from the list of >> highlighted examples**** >> >> **· **Adjust the cmake files to find the dlls in the bin dir.**** >> >> **· **** ** >> >> qtdeclarative:**** >> >> **· **QTBUG-31699 photosurface demo: behavior depends on >> initialization order**** >> >> **· **stabilize tst_touchmouse.**** >> >> **· **QFileDialogHelper: Force QWindow before setting flags.**** >> >> qtdoc:**** >> >> **· **Doc: Added a link to Qt Quick Controls Overview**** >> >> **· **QTBUG-31737 Document the deprecation of WFlags**** >> >> Qtmultimedia:**** >> >> **· **Android: Fix for uncaught java exception.**** >> >> **· **Fix for url bug in the qmlvideo examples.**** >> >> Qtquickcontrols:**** >> >> **· **QTBUG-31778 Doc: Fix QCH documentation structure for Qt >> Quick Layouts**** >> >> **· **Revert "Add qml/js files in resource files"**** >> >> **· **Doc: Fixed Qt Quick Layouts listing in qch files.**** >> >> **· **QTBUG-31565 Add qml/js files in resource files**** >> >> qttools**** >> >> **· **QTBUG-31153 Find the cmake version template in the install >> location.**** >> >> Qttranslations**** >> >> **· **QTBUG-31727 fix qm output dir for non-prefix builds**** >> >> Qtwebkit**** >> >> **· **[Qt][Mac] Disable QTKit video on OS X.**** >> >> ** ** >> >> Br, Jani**** >> >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development >> >> > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Tue Jun 25 16:53:08 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 25 Jun 2013 07:53:08 -0700 Subject: [Development] Qt 5.1 compile problem In-Reply-To: References: Message-ID: <1970206.kjegGasPK0@tjmaciei-mobl2> On terça-feira, 25 de junho de 2013 13.21.33, Tomasz Olszak wrote: > .obj/release-shared/qnativesocketengine_unix.o: In function > `QNativeSocketEnginePrivate::nativeSelect(int, bool) const': > qnativesocketengine_unix.cpp:(.text+0x2744): undefined reference to > `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' I haven't rebuilt for MIPS in a couple of months, but I don't remember having this problem. My guess is that you have a polluted build: your QtNetwork 5.1 is linking to the installed QtCore 5.0. qt_safe_select is in QtCore (qcore_unix.cpp). In Qt 5.1, I changed the last parameter from timeval to timespec. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From olszak.tomasz at gmail.com Tue Jun 25 17:04:48 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Tue, 25 Jun 2013 17:04:48 +0200 Subject: [Development] Qt 5.1 compile problem In-Reply-To: <1970206.kjegGasPK0@tjmaciei-mobl2> References: <1970206.kjegGasPK0@tjmaciei-mobl2> Message-ID: 2013/6/25 Thiago Macieira > On terça-feira, 25 de junho de 2013 13.21.33, Tomasz Olszak wrote: > > .obj/release-shared/qnativesocketengine_unix.o: In function > > `QNativeSocketEnginePrivate::nativeSelect(int, bool) const': > > qnativesocketengine_unix.cpp:(.text+0x2744): undefined reference to > > `qt_safe_select(int, fd_set*, fd_set*, fd_set*, timespec const*)' > > I haven't rebuilt for MIPS in a couple of months, but I don't remember > having > this problem. My guess is that you have a polluted build: your QtNetwork > 5.1 > is linking to the installed QtCore 5.0. > > qt_safe_select is in QtCore (qcore_unix.cpp). In Qt 5.1, I changed the last > parameter from timeval to timespec. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > Right. Rootfs got messed up and I end up linking to old 5.0 libraries. Thanks! -- regards / pozdrawiam, Tomasz Olszak Qt for Tizen | http://qt-project.org/wiki/Tizen Qt Certified Developer | http://qt-project.org http://linkedin.com/in/tolszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From scapig2 at yandex.ru Tue Jun 25 20:24:43 2013 From: scapig2 at yandex.ru (Denis Shienkov) Date: Tue, 25 Jun 2013 22:24:43 +0400 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <51C9DFC3.6070901@gmail.com> References: <51C9DFC3.6070901@gmail.com> Message-ID: <51C9E06B.9010609@yandex.ru> Hello Qt developers. At present the "main" component was QTPLAYGROUND, but recently users began post bugs in "Qt" or "Other" components selection. Thus, it enters some confusion... Is planned a creation of a separate component for bug tracking of QtSerialPort? Best regards, Denis From thiago.macieira at intel.com Tue Jun 25 20:39:23 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 25 Jun 2013 11:39:23 -0700 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <51C9E06B.9010609@yandex.ru> References: <51C9DFC3.6070901@gmail.com> <51C9E06B.9010609@yandex.ru> Message-ID: <15957170.fqez1HaM8u@tjmaciei-mobl2> On terça-feira, 25 de junho de 2013 22.24.43, Denis Shienkov wrote: > Hello Qt developers. > > At present the "main" component was QTPLAYGROUND, but recently users > began post bugs in "Qt" or "Other" components selection. Thus, it enters > some confusion... > > Is planned a creation of a separate component for bug tracking of > QtSerialPort? Agreed, just call it "Serial Port". -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Lars.Knoll at digia.com Tue Jun 25 20:49:04 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Tue, 25 Jun 2013 18:49:04 +0000 Subject: [Development] Qt 5.2 In-Reply-To: <201306251533.30413.daniel.teske@digia.com> Message-ID: On 6/25/13 3:33 PM, "Daniel Teske" wrote: >> Our goal should be to release 5.2 in November, so we have a bit of slack >> before christmas. Unfortunately we'll also need some time to still do >> feature development, so the proposal would be to aim for releasing the >> alpha end of September. >Shouldn't there be a discussion first on what went wrong with the 5.1 >schedule? >Because clearly we are way beyond the end of april target. Yes, quite a few things took longer then originally anticipated. The feature freeze did already happen two weeks later then originally planned, then it took quite some time to get the alpha and beta packages out. In the end we had a week or two of delays on every stage of the release and that added up. >If there's no discussion on why that happend and how we are going to >improve >the process, then this plan will be as unachievable as the last one. This is something we'll need to discuss. The 5.1 plan was clearly too optimistic. So we need to go through the problems we had with 5.1 to make sure we don't repeat them if we want to have a chance to get 5.2 done in time. Cheers, Lars From Lars.Knoll at digia.com Tue Jun 25 20:55:57 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Tue, 25 Jun 2013 18:55:57 +0000 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <15957170.fqez1HaM8u@tjmaciei-mobl2> Message-ID: On 6/25/13 8:39 PM, "Thiago Macieira" wrote: >On terça-feira, 25 de junho de 2013 22.24.43, Denis Shienkov wrote: >> Hello Qt developers. >> >> At present the "main" component was QTPLAYGROUND, but recently users >> began post bugs in "Qt" or "Other" components selection. Thus, it enters >> some confusion... >> >> Is planned a creation of a separate component for bug tracking of >> QtSerialPort? > >Agreed, just call it "Serial Port". Agreed as well. Here you go: https://bugreports.qt-project.org/browse/QTBUG/component/20320 Cheers, Lars From scapig2 at yandex.ru Tue Jun 25 21:10:39 2013 From: scapig2 at yandex.ru (Denis Shienkov) Date: Tue, 25 Jun 2013 23:10:39 +0400 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: References: Message-ID: <51C9EB2F.2030308@yandex.ru> Many thanks. 25.06.2013 22:55, Knoll Lars пишет: > > On 6/25/13 8:39 PM, "Thiago Macieira" wrote: > >> On terça-feira, 25 de junho de 2013 22.24.43, Denis Shienkov wrote: >>> Hello Qt developers. >>> >>> At present the "main" component was QTPLAYGROUND, but recently users >>> began post bugs in "Qt" or "Other" components selection. Thus, it enters >>> some confusion... >>> >>> Is planned a creation of a separate component for bug tracking of >>> QtSerialPort? >> Agreed, just call it "Serial Port". > Agreed as well. Here you go: > https://bugreports.qt-project.org/browse/QTBUG/component/20320 > > Cheers, > Lars > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From andre.poenitz at mathematik.tu-chemnitz.de Tue Jun 25 22:54:45 2013 From: andre.poenitz at mathematik.tu-chemnitz.de (=?iso-8859-1?Q?Andr=E9_P=F6nitz?=) Date: Tue, 25 Jun 2013 22:54:45 +0200 Subject: [Development] QML engine changes In-Reply-To: <1685807.9fTUVD1qkJ@rhea> References: <1525942.bRdby09J1O@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> <1685807.9fTUVD1qkJ@rhea> Message-ID: <20130625205445.GB4979@klara.mpi.htwm.de> On Tue, Jun 25, 2013 at 11:14:27AM +0200, Simon Hausmann wrote: > On Monday 24. June 2013 23.58.17 André Pönitz wrote: > > [Upfront: I am _really_ happy to see V8 and the glue code its service > > required to be on its way out. But...] > > > > On Mon, Jun 24, 2013 at 01:30:18PM +0200, Simon Hausmann wrote: > > > > This confuses me a bit. Why isn't the implementation tuned specifically > > > > for QML, instead of being a fully-compliant ecmascript implementation? > > > > > > Because we want to continue to support the use-case of import "Foo.js" as > > > Bar; I've personally used that for a little spare time app I wrote, when > > > I was super happy to discover that a piece of functionality I needed was > > > available as third-party JS library that I could just exclude. [...] > > > > This still somewhat leaves the questions why that use case is so important > > that it justifies the hoops that need to be jumped through to make it > > happen (especially at the expense of more common uses that typically do not > > go much beyond arithmetic expressions and an 'if', or an occasional loop), > > and why 100% ECMA conformance for chunks of code that typically span not > > more than half a line is useful if the full file isn't conforming to any > > standard anyway. > > > > The obvious alternative would be to leave "full ECMA" to separate .js files > > (and do whatever needs to be done to make that work) and use inside .qml > > only the parts that are typically used in that context, perhaps garnished by > > some syntactic sugar to reduce boiler plate, and maybe restricted to the > > cases that are easily toolable - i.e. a real Domain Specific Language > > addressing exactly the task at hand. > > I think that this point there are no hoops we need to jump through to get > ECMAScript compliance. It was a high priority for during the development > (what's done is done) and I think we can maintain the compliance at a very > very low cost. I was not refering to the hoops _you_ (plural, refering to people in favour of the idea) need to jump trough to implement full ECMAScript, but the hoops the people working on the tooling side need to jump through to somehow cope with the result, and finally the users of such tools who need to work with those as a consequence. By now I lost count on how many attempts we had at providing somewhat decent like a visual design tool for QML, only to see it being obsoleted by random backend changes. A complete waste of resources, lasting for years by now. Like two weeks were spent alone for getting something as simple as hybrid stepping in the debugger betweem JS and C++ into a "somewhat working" state. That "success" lasted not even for a month. Etc, etc. > Note that plenty of our own examples make use of "pure" JavaScript, and then > the question is: Where do we draw the line? At the ECMAScript "classes"? At > the exception throwing behaviour? You could e.g. go through the current implementation of the desktop components and take a survey of the actual JS features used. As a first approximation, I would expect drawing the line between the used and the unused features there to be "good enough" for practical purposes. Some polishing, b; done. Everything beyond that should go to separate .js files. If someone wants or needs to use that - fine. But out-of-scope from a tooling perspective. > To me the best question to those answers is simply: Just be fully spec > compliant. Complying to some specification is - all other things being equal - a Good Thing. However, the "other things" are far from being equal in this particular case. Each procedural feature that's available in the "inline" JS in a .qml file hurts _badly_ on the tooling side. The more you add, the more it hurts. What you do, and what you take pride into achieving, hurts _me_. It hurts my work, it eats into my own resources, and more generally into the resources of the team on the tooling side, and last but not least into the resources available to general development of Qt. The staunch refusal to provide reasonable interfaces to the individual layers of the Qt Quick stack adds insult to injury, no matter how you put it. It's understandable, to certain degree, to rate one's physical ability to implement 100% ECMA conformance for certain chunks in a file higher then the resulting costs. But there is a limit on where it makes sense from a more "objective" point of view. Andre' From chrisw.qtdevel at psychogeeks.com Tue Jun 25 23:27:44 2013 From: chrisw.qtdevel at psychogeeks.com (Chris W) Date: Wed, 26 Jun 2013 07:27:44 +1000 Subject: [Development] Differences: QDesktopServices vs QStandardPaths Message-ID: <51CA0B50.6050609@psychogeeks.com> Hello, Were the following differences between the paths returned by Qt 4.8 QDesktopServices and 5.1 QStandardPaths intentional or bug-worthy? (They are annoying either way) #include #include int main(int argc, char **argv) { QCoreApplication app(argc, argv); app.setOrganizationName("ExampleOrg"); app.setOrganizationDomain("example.com.au"); app.setApplicationName("ExampleApp"); #if QT_VERSION >= QT_VERSION_CHECK(5,0,0) QStringList paths = QStandardPaths::standardLocations(QStandardPaths::DataLocation); #else QString paths = QDesktopServices::storageLocation(QDesktopServices::DataLocation); #endif qDebug() << qVersion() << paths; return 0; } Outputs under different Qt versions on 64-bit Linux: 4.8.4 "/home/chrisw/.local/share/data/ExampleOrg/ExampleApp" 5.1.0 ("/home/chrisw/.local/share/ExampleOrg/ExampleApp", "/usr/share/ExampleOrg/ExampleApp", "/usr/local/share/ExampleOrg/ExampleApp", "/usr/share/ExampleOrg/ExampleApp") Note the extra “data” directory in the Qt4 path vs. the first directory in Qt5. XDG_DATA_HOME is not set. This means ported Qt4-based code, when built with Qt5, looks in the wrong location for data that was previously installed/generated in the Qt4 DataLocation on deployed machines. As sierdzio points out here (http://qt-project.org/forums/viewthread/29223/) this is strictly neither a regression in QDesktopServices nor a bug in QStandardPaths. Aligning it now would be a regression in Qt5. Unless there's something I am missing, I will work around it by moving the data using an installer script, using the deprecated function in QDesktopServices, or coding alternate paths into the application startup. -- Chris Williams Life would be much easier if I had the source code. Anon. From loaden at gmail.com Wed Jun 26 01:34:28 2013 From: loaden at gmail.com (Yuchen Deng) Date: Wed, 26 Jun 2013 07:34:28 +0800 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: 2013/6/25 Knoll Lars > Are we going to get this one ready in time for 5.2? I prefer/hope this module can be added, It's should added in Qt 5.1 as plan, but it not. then It's plan adding in Qt5.2, It's seems still not? no, no. please. If it's still no way, could you please explain why? Thanks! -- Best Regards Yuchen -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Wed Jun 26 01:48:39 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 25 Jun 2013 16:48:39 -0700 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <2046537.0VfASH8DEU@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 07.34.28, Yuchen Deng wrote: > 2013/6/25 Knoll Lars > > > Are we going to get this one ready in time for 5.2? > > I prefer/hope this module can be added, It's should added in Qt 5.1 as > plan, but it not. then It's plan adding in Qt5.2, It's seems still not? > no, no. please. > If it's still no way, could you please explain why? Qt 5.1 is done. We've already released the first Release Candidate. We can't add a module now. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From lpapp at kde.org Wed Jun 26 04:11:42 2013 From: lpapp at kde.org (Laszlo Papp) Date: Wed, 26 Jun 2013 05:11:42 +0300 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: References: <15957170.fqez1HaM8u@tjmaciei-mobl2> Message-ID: Thank you. Lars, could you please remove the "qtserialport" component from playground? We have just received a bugreport in there: https://bugreports.qt-project.org/browse/QTPLAYGROUND-31 On Tue, Jun 25, 2013 at 9:55 PM, Knoll Lars wrote: > > > On 6/25/13 8:39 PM, "Thiago Macieira" wrote: > > >On terça-feira, 25 de junho de 2013 22.24.43, Denis Shienkov wrote: > >> Hello Qt developers. > >> > >> At present the "main" component was QTPLAYGROUND, but recently users > >> began post bugs in "Qt" or "Other" components selection. Thus, it enters > >> some confusion... > >> > >> Is planned a creation of a separate component for bug tracking of > >> QtSerialPort? > > > >Agreed, just call it "Serial Port". > > Agreed as well. Here you go: > https://bugreports.qt-project.org/browse/QTBUG/component/20320 > > Cheers, > Lars > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From 416365416c at gmail.com Wed Jun 26 06:00:45 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Tue, 25 Jun 2013 21:00:45 -0700 Subject: [Development] QML engine changes In-Reply-To: <20130625205445.GB4979@klara.mpi.htwm.de> References: <1525942.bRdby09J1O@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> <1685807.9fTUVD1qkJ@rhea> <20130625205445.GB4979@klara.mpi.htwm.de> Message-ID: On Tue, Jun 25, 2013 at 1:54 PM, André Pönitz wrote: > On Tue, Jun 25, 2013 at 11:14:27AM +0200, Simon Hausmann wrote: >> On Monday 24. June 2013 23.58.17 André Pönitz wrote: >> > [Upfront: I am _really_ happy to see V8 and the glue code its service >> > required to be on its way out. But...] >> > >> > On Mon, Jun 24, 2013 at 01:30:18PM +0200, Simon Hausmann wrote: >> > > > This confuses me a bit. Why isn't the implementation tuned specifically >> > > > for QML, instead of being a fully-compliant ecmascript implementation? >> > > >> > > Because we want to continue to support the use-case of import "Foo.js" as >> > > Bar; I've personally used that for a little spare time app I wrote, when >> > > I was super happy to discover that a piece of functionality I needed was >> > > available as third-party JS library that I could just exclude. [...] >> > >> > This still somewhat leaves the questions why that use case is so important >> > that it justifies the hoops that need to be jumped through to make it >> > happen (especially at the expense of more common uses that typically do not >> > go much beyond arithmetic expressions and an 'if', or an occasional loop), >> > and why 100% ECMA conformance for chunks of code that typically span not >> > more than half a line is useful if the full file isn't conforming to any >> > standard anyway. >> > >> > The obvious alternative would be to leave "full ECMA" to separate .js files >> > (and do whatever needs to be done to make that work) and use inside .qml >> > only the parts that are typically used in that context, perhaps garnished by >> > some syntactic sugar to reduce boiler plate, and maybe restricted to the >> > cases that are easily toolable - i.e. a real Domain Specific Language >> > addressing exactly the task at hand. >> >> I think that this point there are no hoops we need to jump through to get >> ECMAScript compliance. It was a high priority for during the development >> (what's done is done) and I think we can maintain the compliance at a very >> very low cost. > > I was not refering to the hoops _you_ (plural, refering to people in favour > of the idea) need to jump trough to implement full ECMAScript, but the > hoops the people working on the tooling side need to jump through to > somehow cope with the result, and finally the users of such tools who need > to work with those as a consequence. > > By now I lost count on how many attempts we had at providing somewhat > decent like a visual design tool for QML, only to see it being obsoleted by > random backend changes. A complete waste of resources, lasting for years by > now. Like two weeks were spent alone for getting something as simple as > hybrid stepping in the debugger betweem JS and C++ into a "somewhat > working" state. That "success" lasted not even for a month. Etc, etc. > >> Note that plenty of our own examples make use of "pure" JavaScript, and then >> the question is: Where do we draw the line? At the ECMAScript "classes"? At >> the exception throwing behaviour? > > You could e.g. go through the current implementation of the desktop > components and take a survey of the actual JS features used. > > As a first approximation, I would expect drawing the line between the used > and the unused features there to be "good enough" for practical purposes. > Some polishing, b; done. Everything beyond that should go to separate .js > files. If someone wants or needs to use that - fine. But out-of-scope from > a tooling perspective. > >> To me the best question to those answers is simply: Just be fully spec >> compliant. > > Complying to some specification is - all other things being equal - a Good Thing. > > However, the "other things" are far from being equal in this particular case. > Each procedural feature that's available in the "inline" JS in a .qml file > hurts _badly_ on the tooling side. The more you add, the more it hurts. > What you do, and what you take pride into achieving, hurts _me_. It hurts my > work, it eats into my own resources, and more generally into the resources > of the team on the tooling side, and last but not least into the resources > available to general development of Qt. Every individual feature hurts? So you noticed some specific relief when we deprecated the "with" statement? If you didn't, how would dropping other features (without dropping the essential procedural part of QML, such as if, for, while, switch and function) provide relief? > The staunch refusal to provide reasonable interfaces to the individual layers > of the Qt Quick stack adds insult to injury, no matter how you put it. Good thing we never did that. In fact, V4+V8->V4VM and QtDeclarative->QtQml+QtQuick both promise to improve the interfaces between individual aspects of the QtQuick stack. Now maybe these don't solve your specific toolability concerns. But as you haven't mentioned any specific concerns yet, I can only address the problems I'm aware of. As I said, I'd like to hear your toolability complaints about JS embedded in QML, in a separate thread. It will almost certainly be easier to address them with the new JS engine than the old one. -- Alan Alpert From thiago.macieira at intel.com Wed Jun 26 08:22:59 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Tue, 25 Jun 2013 23:22:59 -0700 Subject: [Development] Qt 5.1 header diff Message-ID: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> I've just noticed we haven't done the manual header diff to catch issues. We need to get this done by the end of this week if we want to catch, fix and release any issues by next Friday. Any volunteers to produce the diffs and send to the list? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Lars.Knoll at digia.com Wed Jun 26 08:58:18 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 06:58:18 +0000 Subject: [Development] Qt 5.2 In-Reply-To: <2046537.0VfASH8DEU@tjmaciei-mobl2> Message-ID: On 26.06.13 01:48, "Thiago Macieira" wrote: >On quarta-feira, 26 de junho de 2013 07.34.28, Yuchen Deng wrote: >> 2013/6/25 Knoll Lars >> >> > Are we going to get this one ready in time for 5.2? >> >> I prefer/hope this module can be added, It's should added in Qt 5.1 as >> plan, but it not. then It's plan adding in Qt5.2, It's seems still not? >> no, no. please. >> If it's still no way, could you please explain why? We have time based releases and include the modules that are ready. Sean did send a mail about Qt 3D explaining why it's not part of 5.1 to the mailing list some time earlier this year. Whether it'll be part of 5.2 depends on whether someone does the actual work in time (ie. Whether it's high enough on someone's priority list). Cheers, Lars > >Qt 5.1 is done. We've already released the first Release Candidate. We >can't >add a module now. > >-- >Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center From Lars.Knoll at digia.com Wed Jun 26 09:04:26 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 07:04:26 +0000 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: Message-ID: I can do that, but I can unfortunately not migrate the open bugs to the new component (as I can't migrate across Jira projects). You'd have to create a new report for each of the open bugs in the Jira Qt project. If you're ok with that I'll remove the serial port component in the playground project. Cheers, Lars From: Laszlo Papp > Date: onsdag 26. juni 2013 04:11 To: Lars Knoll > Cc: Thiago Macieira >, "development at qt-project.org" > Subject: Re: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker Thank you. Lars, could you please remove the "qtserialport" component from playground? We have just received a bugreport in there: https://bugreports.qt-project.org/browse/QTPLAYGROUND-31 On Tue, Jun 25, 2013 at 9:55 PM, Knoll Lars > wrote: On 6/25/13 8:39 PM, "Thiago Macieira" > wrote: >On terça-feira, 25 de junho de 2013 22.24.43, Denis Shienkov wrote: >> Hello Qt developers. >> >> At present the "main" component was QTPLAYGROUND, but recently users >> began post bugs in "Qt" or "Other" components selection. Thus, it enters >> some confusion... >> >> Is planned a creation of a separate component for bug tracking of >> QtSerialPort? > >Agreed, just call it "Serial Port". Agreed as well. Here you go: https://bugreports.qt-project.org/browse/QTBUG/component/20320 Cheers, Lars _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From Liang.Qi at digia.com Wed Jun 26 09:07:20 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Wed, 26 Jun 2013 07:07:20 +0000 Subject: [Development] Qt 5.2 In-Reply-To: References: , Message-ID: Hi, Yuchen, Yes, everyone wants to have as more features and modules as possible in the(every) release. But plan is just plan, some work hasn't finished, then can't be part of a release. If you really want to see sth happen, please join the development and push it as you want. The reason is much less important than the real work, especially in the open source world. Best Regards, Liang ________________________________ From: Yuchen Deng Sent: Wednesday, June 26, 2013 1:34 AM To: Knoll Lars Cc: development at qt-project.org Subject: Re: [Development] Qt 5.2 2013/6/25 Knoll Lars > Are we going to get this one ready in time for 5.2? I prefer/hope this module can be added, It's should added in Qt 5.1 as plan, but it not. then It's plan adding in Qt5.2, It's seems still not? no, no. please. If it's still no way, could you please explain why? Thanks! -- Best Regards Yuchen -------------- next part -------------- An HTML attachment was scrubbed... URL: From yves.bailly at sescoi.fr Wed Jun 26 09:19:29 2013 From: yves.bailly at sescoi.fr (Yves Bailly) Date: Wed, 26 Jun 2013 09:19:29 +0200 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <51CA9601.3070709@sescoi.fr> Hello, Le 25/06/2013 14:38, Knoll Lars a écrit : > [...] > Most of the functionality of Qt OpenGL is now being offered by Qt Gui and > Qt Widgets. There's a small feature gap that we would still need to fill, > but then we should be able to deprecate the module as well. Does "deprecating OpenGL module" mean "deprecating QGLWidget"? Personnaly I just hope not, unless there's a replacement. I really need to embed a QGLWidget (or more than one) in a GUI with "standard" widgets all around, and QWindow seems more for top-level GL display. Moreover OpenGL/ES is way too limited for my needs. Also I'm a bit worried when reading documentation like doc/qtgui/qtgui-index.html or doc/qtgui/painting-3d.html, seeing they don't even mention QGLWidget... But maybe there's a way to "embed" an OpenGL QWindow (or at least QSurface) in a widget? Unrelated side note: when reading the documentation about a class, e.g. QWidget, there's no link to "go up" or at least go back to the full class list. This is for the "offline" doc, the online doc http://qt-project.org/doc/qt-5.0/qtwidgets/qwidget.html has all the needed navigation links in a right-side pane. This pane would be great to have also in the offline doc. Regards, -- /- Yves Bailly - Software developer -\ \- Sescoi R&D - http://www.sescoi.fr -/ "The possible is done. The impossible is being done. For miracles, thanks to allow a little delay." From Lars.Knoll at digia.com Wed Jun 26 09:35:42 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 07:35:42 +0000 Subject: [Development] Qt 5.2 In-Reply-To: <51CA9601.3070709@sescoi.fr> Message-ID: On 26.06.13 09:19, "Yves Bailly" wrote: >Hello, > >Le 25/06/2013 14:38, Knoll Lars a écrit : >> [...] >> Most of the functionality of Qt OpenGL is now being offered by Qt Gui >>and >> Qt Widgets. There's a small feature gap that we would still need to >>fill, >> but then we should be able to deprecate the module as well. > >Does "deprecating OpenGL module" mean "deprecating QGLWidget"? Personnaly >I just hope not, unless there's a replacement. I really need to embed a >QGLWidget (or more than one) in a GUI with "standard" widgets all around, >and QWindow seems more for top-level GL display. Moreover OpenGL/ES is way >too limited for my needs. See the 'feature gap' note above. This is part of it, and we'd need to create a replacement in Qt Widgets (aka QOpenGLWidget) before we can deprecate it. Cheers, Lars > >Also I'm a bit worried when reading documentation like >doc/qtgui/qtgui-index.html >or doc/qtgui/painting-3d.html, seeing they don't even mention QGLWidget... >But maybe there's a way to "embed" an OpenGL QWindow (or at least >QSurface) >in a widget? > >Unrelated side note: when reading the documentation about a class, e.g. >QWidget, >there's no link to "go up" or at least go back to the full class list. >This is >for the "offline" doc, the online doc >http://qt-project.org/doc/qt-5.0/qtwidgets/qwidget.html >has all the needed navigation links in a right-side pane. This pane would >be >great to have also in the offline doc. > >Regards, > >-- > /- Yves Bailly - Software developer -\ > \- Sescoi R&D - http://www.sescoi.fr -/ >"The possible is done. The impossible is being done. For miracles, >thanks to allow a little delay." >_______________________________________________ >Development mailing list >Development at qt-project.org >http://lists.qt-project.org/mailman/listinfo/development From dangelog at gmail.com Wed Jun 26 09:52:46 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Wed, 26 Jun 2013 09:52:46 +0200 Subject: [Development] Qt 5.2 In-Reply-To: <51CA9601.3070709@sescoi.fr> References: <51CA9601.3070709@sescoi.fr> Message-ID: On 26 June 2013 09:19, Yves Bailly wrote: > > > Also I'm a bit worried when reading documentation like doc/qtgui/qtgui-index.html > or doc/qtgui/painting-3d.html, seeing they don't even mention QGLWidget... > But maybe there's a way to "embed" an OpenGL QWindow (or at least QSurface) > in a widget? It has been introduced in 5.1: QWidget::createWindowContainer. Cheers, -- Giuseppe D'Angelo From Kai.Koehne at digia.com Wed Jun 26 10:19:29 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Wed, 26 Jun 2013 08:19:29 +0000 Subject: [Development] Toolability of mixing QML and JS Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [...] > Now maybe these don't solve your specific toolability concerns. But as you > haven't mentioned any specific concerns yet, I can only address the problems > I'm aware of. As I said, I'd like to hear your toolability complaints about JS > embedded in QML, in a separate thread. Oh well, the issues have been discussed up every so often, right from the start of QML ... I guess the ship sailed long ago for a stricter separation between 'imperative' and 'declarative' parts but since you asked for it I can try to collect the main points it: - Designer: Any visual designer will only be able to cope with the declarative parts. JS snippets are opaque blobs. They are often written in a way that assume things about when they're evaluated, how often they're evaluated, expect a certain environment/backend that only the real application provides etc. The best a visual tool can do is warn about their use and ignore them (and hope that the declarative parts can stand on their own). - Editors: A lot of IDE's out there understand .js files. Writing a parser for only the declarative parts of QML is relatively easy. Writing a parser for .qml files that also understands all of JS, not so easy. - Performance: Moving from the QML land to the JS land and back has significant conversion costs. Given that some expressions are 'magically' faster (v4 optimized ones), and that it's often non-intuitive how often things are actually evaluated, this can be a source of hard-to-track performance issues. We came up with the QML Profiler also because of this. - Architecture: We only give the people a blurry advice where to draw the line between QML code, JS code, and C++ code. I guess most would agree that you should keep JS code to small snippets for 'production' code, but actually our examples do not reflect that at all. One result of this is that we were trying hard to come up with a debugger in Qt Creator that supports all languages, including mixed debugging of JS and C++ at the same time. - Compiling QML: It would be almost trivial to compile only the declarative parts of QML to C++/binary at compile time. This would have helped addressing concerns about performance, deployment, protecting IP, runtime sizes etc. That said, I of course also see the advantages of the current mix, and the quick prototyping that the current language allows is certainly one of the selling points of QML. Regards Kai > It will almost certainly be easier to address them with the new JS engine than > the old one. > > -- > Alan Alpert > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From Eike.Ziller at digia.com Wed Jun 26 10:39:21 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Wed, 26 Jun 2013 08:39:21 +0000 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <6530380E-8753-45CA-A439-65CCE038695B@digia.com> On 25.06.2013, at 20:49, Knoll Lars wrote: > On 6/25/13 3:33 PM, "Daniel Teske" wrote: > >>> Our goal should be to release 5.2 in November, so we have a bit of slack >>> before christmas. Unfortunately we'll also need some time to still do >>> feature development, so the proposal would be to aim for releasing the >>> alpha end of September. >> Shouldn't there be a discussion first on what went wrong with the 5.1 >> schedule? >> Because clearly we are way beyond the end of april target. > > Yes, quite a few things took longer then originally anticipated. The > feature freeze did already happen two weeks later then originally planned, > then it took quite some time to get the alpha and beta packages out. In > the end we had a week or two of delays on every stage of the release and > that added up. > >> If there's no discussion on why that happend and how we are going to >> improve >> the process, then this plan will be as unachievable as the last one. > > This is something we'll need to discuss. The 5.1 plan was clearly too > optimistic. So we need to go through the problems we had with 5.1 to make > sure we don't repeat them if we want to have a chance to get 5.2 done in > time. Qt 5.1 alpha was released on April 8th, so assuming that the final can be released end of next week or beginning of the week after that, this cycle has taken about 13 weeks. Qt 5.2 alpha end of september, final in november means about 8 weeks from alpha to final. Even if the discussions on what should have been done better with the Qt 5.1 release results in changes that reduce the amount of time needed by 3 weeks, reduction by 1/4, which I'd claim would be a really great success (and unrealistic), that's still 10 weeks. For Qt Creator we have a release cycle that has 8 weeks from BETA to final, with about two months feature development before that. (http://qt-project.org/wiki/Releases) This usually fits "just so", meaning that I would claim that it would be impossible for us to reduce that time, and that there is always the possibility for it taking a bit longer. And we also try to keep the "dev" version of Qt Creator working in a good state at all times (like the goal is for Qt). Qt has many more shareholders than Qt Creator, much more code, much more platforms to support (and Qt 5.2 is supposed to get two more out of "experimental" state). And it has a CI that tends to slow things down. To me it sounds very unrealistic to have a *shorter* schedule for Qt than for Qt Creator combining all these facts. (Shorter because we don't have alpha releases for Qt Creator, i.e. the 8 weeks are from beta to final.) Br, Eike -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From Gunnar.Sletta at digia.com Wed Jun 26 10:39:25 2013 From: Gunnar.Sletta at digia.com (Sletta Gunnar) Date: Wed, 26 Jun 2013 08:39:25 +0000 Subject: [Development] Qt 5.2 In-Reply-To: <51CA9601.3070709@sescoi.fr> References: <51CA9601.3070709@sescoi.fr> Message-ID: On Jun 26, 2013, at 9:19 AM, Yves Bailly wrote: > Hello, > > Le 25/06/2013 14:38, Knoll Lars a écrit : >> [...] >> Most of the functionality of Qt OpenGL is now being offered by Qt Gui and >> Qt Widgets. There's a small feature gap that we would still need to fill, >> but then we should be able to deprecate the module as well. > > Does "deprecating OpenGL module" mean "deprecating QGLWidget"? Personnaly > I just hope not, unless there's a replacement. I really need to embed a > QGLWidget (or more than one) in a GUI with "standard" widgets all around, > and QWindow seems more for top-level GL display. Moreover OpenGL/ES is way > too limited for my needs. Using QWindow and QOpenGLContext does not imply using OpenGL ES. Both desktop and ES is fully supported. > > Also I'm a bit worried when reading documentation like doc/qtgui/qtgui-index.html > or doc/qtgui/painting-3d.html, seeing they don't even mention QGLWidget... > But maybe there's a way to "embed" an OpenGL QWindow (or at least QSurface) > in a widget? > > Unrelated side note: when reading the documentation about a class, e.g. QWidget, > there's no link to "go up" or at least go back to the full class list. This is > for the "offline" doc, the online doc http://qt-project.org/doc/qt-5.0/qtwidgets/qwidget.html > has all the needed navigation links in a right-side pane. This pane would be > great to have also in the offline doc. > > Regards, > > -- > /- Yves Bailly - Software developer -\ > \- Sescoi R&D - http://www.sescoi.fr -/ > "The possible is done. The impossible is being done. For miracles, > thanks to allow a little delay." > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From joerg.bornemann at digia.com Wed Jun 26 10:46:31 2013 From: joerg.bornemann at digia.com (Joerg Bornemann) Date: Wed, 26 Jun 2013 10:46:31 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> Message-ID: <51CAAA67.6050100@digia.com> On 26/06/2013 10:19, Koehne Kai wrote: > - Designer: Any visual designer will only be able to cope with the declarative parts. JS snippets are opaque blobs. [...] JS snippets are not opaque blobs. The QML/JS parser provides everything we need to understand the structure of the code. A design tool can offer to edit property bindings with sufficiently simple code (e.g. JS literals) graphically. The tool can let the user edit more complex stuff in a text editor. I claim it doesn't help at all to have a QML where the rhs of properties is restricted to a "JS subset" or another DOM we might invent. The comlex code would be in external .js files and property bindings would be just glue. The design tool would be able to edit the properties that do not call JS functions and open a text editor for the others. How is this different from what we have now? Cheers, Joerg -- Joerg Bornemann Digia, Qt http://qt.digia.com/ From Jani.Heikkinen at digia.com Wed Jun 26 11:08:20 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Wed, 26 Jun 2013 09:08:20 +0000 Subject: [Development] New Qt5.1 snapshot available Message-ID: Hi all! New packages will be soon in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. Unfortunately windows android installer won't be there because of some build issues. Changes since last build: Qtsdk: · Remove system specific directories from qconfig.pri, QTBUG-31496 qtactiveqt: · QTBUG-29918 Fix licensing for static libraries Qtbase: · QTBUG-31862 Fix QDir::mkpath failing for drive paths on Windows · Mac: Ensure that C++11 is always used when linking against a static Qt build · QTBUG-29918 Use BSD licensing for QtOpenGLExtensions instead of LGPL · QTBUG-31333 Widgets: Set qt_button_down for each press. Qtdeclarative · QQmlPlatform: rename "mac" to "osx" · Add missing Q_REVISION Qtdoc · Doc:Updated information about tested platforms. Qtquickcontrols · Adapt to Qt.platform.os rename ("mac" -> "osx") · Doc: Small fix for SplitView This isn't the RC2 yet but the goal is to create it tomorrow. Things what we are still waiting: - Fix for Windows Android build issue (fix is already available) - Fixes/analysis if following 3 issues are really blocking our RC2 o QTBUG-31959: Crash when a tool-tip of a tool button is about to be displayed o QTBUG-31811: Sequential shortcuts don't work o QTBUG-31977: Regression: Key events while pressing ctrl have wrong key() Br, Jani From: Heikkinen Jani Sent: 25. kesäkuuta 2013 10:30 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Hi all, Quite many changes were missing from my previous mail, sorry about that. Here is list of missing changes: Qtbase: · CMake: Fix test for value starting with -L · Fix missing shortcuts for WindowContainers · QTBUG-31776 Fix missing focus events for mapped child windows · QTBUG-31806 Android: handle keyboard connect/disconnect · fix LD_LIBRARY_PATH manipulation in uic calls not being make-escaped · update QtNetwork changelog for 5.1.0 · QTBUG-30173 Tagged all those examples that work on an Android device · QTBUG-31476 QFactoryLoader: Release unused libraries. · QTBUG-31476 Remove unused member QFactoryLoaderPrivate::keyList. Qtdeclarative · QTBUG-31834 QColorDialogHelper: Force QWindow before setting flags · QTBUG-30173 Doc: Changed the title to avoid name conflicts and linking error Qtmultimedia · Add changes-5.1.0 file · QTBUG-31868 QTBUG-31476 Multimedia plugins now have a unique JSON metadata 'Keys' property. qtquick1 · Add changes-5.1.0 file qtquickcontrols · QTBUG-31796 Doc: Fix QCH filter attributes for Qt Quick Controls/Styles qtsensors · Fix loading of all sensorgesture plugins. Qttools · Add changes-5.1.0 file From: Heikkinen Jani Sent: 25. kesäkuuta 2013 8:55 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Good morning, There is again new snapshot(2013-06-25-65/) available in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It is already quite near of rc2 but some changes are still missing. Below is listed new changes since my previous mail: Qtsdk: · Fix warnings during installation, QTBUG-31955 · mkqt5bld: qtquickcontrols added to essentials list, QTBUG-31718 · Fix path for MaintenanceTool links * Make sure that createShortcuts() function is not global, QTIFW-294 * Add -no-c++11 to Mac configure options Qt5 · configure: Fix srcpath when you run configure in the top-level dir · rewrite top-level configures without perl, QTBUG-31786 qt-creator: · Fix broken list requests in CodePaster, QTCREATORBUG-9547 Br, Jani From: Heikkinen Jani Sent: 20. kesäkuuta 2013 12:58 To: development at qt-project.org; releasing at qt-project.org Subject: New Qt5.1 snapshot available Hi all, There is new snapshot available after RC1. Unfortunately there is problems in the Linux builds and that's why only Windows & Mac offline installers are available. Fixing is ongoing, let's hope we can have all installers available tomorrow! You can download newest installers from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Below is listed changes included since RC1: Qtsdk: · QTBUG-29802: Make database plug-ins/derivers avaliable by default · QTBUG-28963: cannot unmount DMG after installing Qt OSX package and starting creator · Update installer graphics · Do not mention SDK in user visible installer texts · Change "Qt" as a name of the field in online installer qt-creator · QTCREATORBUG-9558 · AndroidRunner: Fix CheckPidTimer to not fire forever qtbase: · Android Mute and FastForward keys mapped wrong · make Makefiles not depend on .qmake.super · QTBUG-31289 fix rcc & uic .depend_commands · always $-escape make commands · QTBUG-31289 fix command over-escaping in vcproj files · assemble the tool commands at use time, after all · QTBUG-31750 OSX: Disable window restoration for the Mac color panel · QTBUG-29161 Cocoa color dialog cannot be modal, but should show anyway · QTBUG-31566 OSX color dialog can be accepted repeatedly · QTBUG-31667 network requests: do not access 1st byte of empty byte array · QTBUG-31745 Doc: Remove Tweet Search demo from the list of highlighted examples · Adjust the cmake files to find the dlls in the bin dir. · qtdeclarative: · QTBUG-31699 photosurface demo: behavior depends on initialization order · stabilize tst_touchmouse. · QFileDialogHelper: Force QWindow before setting flags. qtdoc: · Doc: Added a link to Qt Quick Controls Overview · QTBUG-31737 Document the deprecation of WFlags Qtmultimedia: · Android: Fix for uncaught java exception. · Fix for url bug in the qmlvideo examples. Qtquickcontrols: · QTBUG-31778 Doc: Fix QCH documentation structure for Qt Quick Layouts · Revert "Add qml/js files in resource files" · Doc: Fixed Qt Quick Layouts listing in qch files. · QTBUG-31565 Add qml/js files in resource files qttools · QTBUG-31153 Find the cmake version template in the install location. Qttranslations · QTBUG-31727 fix qm output dir for non-prefix builds Qtwebkit · [Qt][Mac] Disable QTKit video on OS X. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From Thomas.Hartmann at digia.com Wed Jun 26 12:00:38 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Wed, 26 Jun 2013 12:00:38 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> Message-ID: <51CABBC6.1010802@digia.com> Hi, > Oh well, the issues have been discussed up every so often, right from the start of QML ... I guess the ship sailed long ago for a stricter separation between 'imperative' and 'declarative' parts but since you asked for it I can try to collect the main points it: > > - Designer: Any visual designer will only be able to cope with the declarative parts. JS snippets are opaque blobs. They are often written in a way that assume things about when they're evaluated, how often they're evaluated, expect a certain environment/backend that only the real application provides etc. The best a visual tool can do is warn about their use and ignore them (and hope that the declarative parts can stand on their own). Since we do rewrite this does not make much difference for the Visual Designer. Inline code is ignored as a call to a .js file is ignored. > - Editors: A lot of IDE's out there understand .js files. Writing a parser for only the declarative parts of QML is relatively easy. Writing a parser for .qml files that also understands all of JS, not so easy. We provide a QML parser that includes Java Script as open source. Anyone who wants to parse QML is most likely to use this one and even if not he has access to the complete grammar. So this is not really an issue. > - Performance: Moving from the QML land to the JS land and back has significant conversion costs. Given that some expressions are 'magically' faster (v4 optimized ones), and that it's often non-intuitive how often things are actually evaluated, this can be a source of hard-to-track performance issues. We came up with the QML Profiler also because of this. This is hopefully a thing of the past, soon. > - Architecture: We only give the people a blurry advice where to draw the line between QML code, JS code, and C++ code. I guess most would agree that you should keep JS code to small snippets for 'production' code, but actually our examples do not reflect that at all. One result of this is that we were trying hard to come up with a debugger in Qt Creator that supports all languages, including mixed debugging of JS and C++ at the same time. For prototyping writing inline code does help. We should provide tooling that helps/automates refactoring inline code into .js files. Kind Regards, Thomas Hartmann From Thomas.Hartmann at digia.com Wed Jun 26 12:00:45 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Wed, 26 Jun 2013 12:00:45 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CAAA67.6050100@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> Message-ID: <51CABBCD.6070602@digia.com> Hi, I have to agree. ATM in the Qt Quick Designer most bindings are opaque, but we do evaluate them for WYSIWYG if possible. Some bindings we do "create semantics" for. Something like id.property is quite easy to "understand" for the tool. Even pure JS bindings can get have quite complicated semantics, so we have to draw a line somewhere. Some examples of bindings: root.contentHeight > availableHeight ? root.contentHeight - availableHeight Math.max(Math.min(recentProjects.contentHeight + 120, recentProjects.height), sessions.height) While we have of course the AST and the code model this does not help much, if we would try to provide graphical tooling for these kind of expressions. We would need a full blown graphical expression editor. (Expressions would be a graphical tree with operations as nodes and values as leafs.) While this would be possible, I do not think of this as "cost efficient". But I do not see the problem with treating these kind of bindings as opaque blobs and just providing a text edit/jump to code for them, while evaluating them for a proper preview. What hurts us more is real imperative code. For example setting a state usually looks like this: onSomething { root.state = "someState"; } And it currently has to look like this. There is no real pure declarative way. While we can detect and understand simple patterns like the one above, we will fail for more complex code. This is the problem with all UI editors that (have to) touch imperative code. My idea is to (slowly) extend QML by Components/patterns that are purely declarative and that are used by the tooling. Something like a "StateChangerConnection": StateChangerConnection { target: root signal: "something" targetState: "someState" sourceState: "" } Then we can ignore any imperative code. Since we do have a working rewriter there is no difference for us, if we ignore code from a .js file or code written inline. We do rewrite anyway and therefore we preserve anything we ignore/do not understand on a semantic level. Kind Regards, Thomas Hartmann Am 26/06/2013 10:46, schrieb Joerg Bornemann: > On 26/06/2013 10:19, Koehne Kai wrote: > >> - Designer: Any visual designer will only be able to cope with the declarative parts. JS snippets are opaque blobs. [...] > > JS snippets are not opaque blobs. The QML/JS parser provides everything > we need to understand the structure of the code. A design tool can offer > to edit property bindings with sufficiently simple code (e.g. JS > literals) graphically. The tool can let the user edit more complex stuff > in a text editor. > > I claim it doesn't help at all to have a QML where the rhs of properties > is restricted to a "JS subset" or another DOM we might invent. The > comlex code would be in external .js files and property bindings would > be just glue. The design tool would be able to edit the properties that > do not call JS functions and open a text editor for the others. How is > this different from what we have now? > > > Cheers, > > Joerg > From nagymatef at freemail.hu Wed Jun 26 11:57:50 2013 From: nagymatef at freemail.hu (=?utf-8?B?TmFneS1FZ3JpIE3DoXTDqSBGZXJlbmM=?=) Date: Wed, 26 Jun 2013 09:57:50 +0000 Subject: [Development] =?utf-8?q?Qt_5=2E2=2C_Textures_and_FBO?= Message-ID: Hi! I see that QOpenGLTextures is on Gerrit and is under development (although the comments have remained the same for the past few weeks). I had a short discussion with ZapB here: http://qt-project.org/forums/viewthread/27640/ about Textures and FBO. Is there hope of these classes making it into Qt 5.2 mainline? -------------- next part -------------- An HTML attachment was scrubbed... URL: From Marco.Bubke at digia.com Wed Jun 26 12:34:22 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Wed, 26 Jun 2013 10:34:22 +0000 Subject: [Development] QML engine changes In-Reply-To: References: <1525942.bRdby09J1O@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> <1685807.9fTUVD1qkJ@rhea> <20130625205445.GB4979@klara.mpi.htwm.de>, Message-ID: Hi Alan Alpert: >> The staunch refusal to provide reasonable interfaces to the individual layers >> of the Qt Quick stack adds insult to injury, no matter how you put it. > Good thing we never did that. In fact, V4+V8->V4VM and > QtDeclarative->QtQml+QtQuick both promise to improve the interfaces > between individual aspects of the QtQuick stack. Do you really believe the C++ interface of Qml is well designed? E.g. the list interface is only providing clear, so if we change the one element in the list, we have to clear the list and build it new. But append has only the ability to add one element. So it is really slow because for every append so much happens in the scene graph etc.. This really slows the designer down. Next it the refresh of the bindings which has to happen for example, if we add a new id. This is really slow and happens at the item creation time. The whole Qml/Quick part was never design to be editable by a designer and we have to work around it. Other item in this context would be for example componentComplete, the QObject model is not fitting many Qml requirements and so instead of development a better object model there are now many layers on top of it with all the caching structures which are really complex. In my opinion clear C++ interface would be really help Qml, it would be no problem if the interface would be changed over time but poking around in private member classes and changing variables is not very maintainable. I could go on but I hope you get the the tooling picture. Your story is maybe saving you cost but in my opinion the over all costs are much higher. Also the code readability and so the maintainability would improved by clear interfaces and structures. I know this is not cool and boring but in the end a source text which is more readable is better understandable, so changes would be more easy. > Now maybe these don't solve your specific toolability concerns. But as > you haven't mentioned any specific concerns yet, I can only address > the problems I'm aware of. As I said, I'd like to hear your > toolability complaints about JS embedded in QML, in a separate thread. > It will almost certainly be easier to address them with the new JS > engine than the old one. My general concern is that Qml is designed from the text(vi) perspective, and not so much from the tool perspective. One example for it: you can write font.bold: true font.italic: true and font { bold: true italic: true } This is maybe cool from the text perspective but the tools have to support both cases and this is producing work. What about the Python approach where features are only added if they are really produce a advantage. Sorry for the rant, but I really believe we need a more global approach(development story) to Qml, a wider scope and if we are not sure we should ask the other guy what they think about the change. From Eike.Ziller at digia.com Wed Jun 26 12:55:38 2013 From: Eike.Ziller at digia.com (Ziller Eike) Date: Wed, 26 Jun 2013 10:55:38 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CAAA67.6050100@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> Message-ID: On 26.06.2013, at 10:46, Joerg Bornemann wrote: > On 26/06/2013 10:19, Koehne Kai wrote: > >> - Designer: Any visual designer will only be able to cope with the declarative parts. JS snippets are opaque blobs. [...] > > JS snippets are not opaque blobs. The QML/JS parser provides everything > we need to understand the structure of the code. A design tool can offer > to edit property bindings with sufficiently simple code (e.g. JS > literals) graphically. The tool can let the user edit more complex stuff > in a text editor. If the property with a "complex" rhs changes the graphical appearance of the item (or of another one), that will not be represented in the graphical designer. I suppose that is what Kai means with "The best a visual tool can do is warn about their use and ignore them (and hope that the declarative parts can stand on their own)", i.e. "ignore them for the graphical representation of the item(s)". > I claim it doesn't help at all to have a QML where the rhs of properties > is restricted to a "JS subset" or another DOM we might invent. The > comlex code would be in external .js files and property bindings would > be just glue. The design tool would be able to edit the properties that > do not call JS functions and open a text editor for the others. How is > this different from what we have now? The "declarative part" would need to be able to stand for itself and still resolve to a valid (initial) visual representation of the items. You wouldn't be allowed to do "width: myfancyjscode()". Basically all rhs of the declarative part would need to be "easily resolvable". The visual designer already just ignores things it deems to be too complex to handle. But that line that the visual designer draws between "easy" and "too complex" expressions is arbitrary and undocumented. (And similar, the line that the current QML implementation draws between "easy == v4" and "complex == v8" is another one that is most probably different to the one in designer.) Someone writing a component in code has no idea if the result is manageable by designer. This also breaks one original postulate of QML to be a language with which designers and programmers can more easily work together (the programmer easily breaks the designer's tooling). Having that fixed in the language instead of having a non-existing or incomplete, changing list of "things that do not work in the visual designer" would help IMO. -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B From daniel.teske at digia.com Wed Jun 26 12:59:22 2013 From: daniel.teske at digia.com (Daniel Teske) Date: Wed, 26 Jun 2013 12:59:22 +0200 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: References: Message-ID: <201306261259.22940.daniel.teske@digia.com> On Wednesday 26 Jun 2013 09:04:26 Knoll Lars wrote: > I can do that, but I can unfortunately not migrate the open bugs to the new > component (as I can't migrate across Jira projects). You'd have to create > a new report for each of the open bugs in the Jira Qt project. If you're > ok with that I'll remove the serial port component in the playground > project. Actually that's easy to do with jira so I just moved all 31 bug reports to the new component. daniel From Kai.Koehne at digia.com Wed Jun 26 13:00:18 2013 From: Kai.Koehne at digia.com (Koehne Kai) Date: Wed, 26 Jun 2013 11:00:18 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CAAA67.6050100@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> Message-ID: <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> > -----Original Message----- > From: development-bounces+kai.koehne=digia.com at qt-project.org > [mailto:development-bounces+kai.koehne=digia.com at qt-project.org] On > Behalf Of Joerg Bornemann > Sent: Wednesday, June 26, 2013 10:47 AM > To: development at qt-project.org > Subject: Re: [Development] Toolability of mixing QML and JS > > On 26/06/2013 10:19, Koehne Kai wrote: > > > - Designer: Any visual designer will only be able to cope with the > > declarative parts. JS snippets are opaque blobs. [...] > > JS snippets are not opaque blobs. The QML/JS parser provides everything we > need to understand the structure of the code. A design tool can offer to edit > property bindings with sufficiently simple code (e.g. JS > literals) graphically. The tool can let the user edit more complex stuff in a text > editor. Opaque blobs was a bit overstating. But it's clear that manipulating/executing them in a context outside of the application has its limits (as Thomas was also pointing out). > I claim it doesn't help at all to have a QML where the rhs of properties is > restricted to a "JS subset" or another DOM we might invent. The comlex code > would be in external .js files and property bindings would be just glue. The > design tool would be able to edit the properties that do not call JS functions > and open a text editor for the others. How is this different from what we have > now? For the Designer, the main difference would have been to set user expectations. It's obvious that you can't expect Quick Designer to reasonably edit a .qml file when you e.g. set up all the layout in the .js file. It would have also forced us to make sure most interesting parts can be done in a declarative way, with no script code needed. Anyway, this discussion is leading nowhere. We have QML as it is, and we have a Quick Designer that handles things reasonably well. We might still consider with a more restricted version of QML as an alternative for users that want it, but that doesn't buy us much from the tooling perspective, because we have to support the full set anyway. I just raised the points because Alan was asking why mixing JS and QML was making tooling harder. Regards Kai From Lars.Knoll at digia.com Wed Jun 26 13:05:01 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 11:05:01 +0000 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <201306261259.22940.daniel.teske@digia.com> Message-ID: On 26.06.13 12:59, "Daniel Teske" wrote: >On Wednesday 26 Jun 2013 09:04:26 Knoll Lars wrote: >> I can do that, but I can unfortunately not migrate the open bugs to the >>new >> component (as I can't migrate across Jira projects). You'd have to >>create >> a new report for each of the open bugs in the Jira Qt project. If you're >> ok with that I'll remove the serial port component in the playground >> project. >Actually that's easy to do with jira so I just moved all 31 bug reports >to the >new component. Didn't find that. You'll need to show me the trick at some point :) Anyway, I now deleted the old serial port component in playground. Cheers, Lars From lpapp at kde.org Wed Jun 26 13:18:34 2013 From: lpapp at kde.org (Laszlo Papp) Date: Wed, 26 Jun 2013 14:18:34 +0300 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: References: <201306261259.22940.daniel.teske@digia.com> Message-ID: Many thanks. :) On Wed, Jun 26, 2013 at 2:05 PM, Knoll Lars wrote: > On 26.06.13 12:59, "Daniel Teske" wrote: > > >On Wednesday 26 Jun 2013 09:04:26 Knoll Lars wrote: > >> I can do that, but I can unfortunately not migrate the open bugs to the > >>new > >> component (as I can't migrate across Jira projects). You'd have to > >>create > >> a new report for each of the open bugs in the Jira Qt project. If you're > >> ok with that I'll remove the serial port component in the playground > >> project. > >Actually that's easy to do with jira so I just moved all 31 bug reports > >to the > >new component. > > Didn't find that. You'll need to show me the trick at some point :) > > Anyway, I now deleted the old serial port component in playground. > > Cheers, > Lars > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From Liang.Qi at digia.com Wed Jun 26 13:22:20 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Wed, 26 Jun 2013 11:22:20 +0000 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: webp support in qtimageformats: https://codereview.qt-project.org/56026 https://bugreports.qt-project.org/browse/QTBUG-14205 Welcome to feedback on this. Regards, Liang From Marco.Bubke at digia.com Wed Jun 26 13:35:26 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Wed, 26 Jun 2013 11:35:26 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com>, <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> Message-ID: I think we mix WYSIWYG and direct manipulating. WYSIWYG is not the problem, we can simply send the expressions to the qml items. But direct manipulating is the other way around. It is from the graphics representation to the text representation. E.g. You could write: Item { x: parent.leftPadding + 30 } to describe a box model(like in HTML). But if we want to edit it's not so easy anymore. We could find out that we want only change 30, but because we know only the x value, we have to find out what the value of parent.leftPadding is. This complicates the already complicate transformation code. What about if you change the parent and this new parent has no leftPadding property? There are so many undefined cases that supporting some will lead to a "unexpected" behaviour. So we don't change x in this case at all. You have to do it on thw text level. If you use expressions in properties you are not anymore in the declarative world so we don't support this case anymore. Maybe it is possible for some cases but it would be increase the complexity of our code. This would increase the maintenance costs for a feature which could be much better described in many cases declarative with a clear interface in the items(in this case explicit is in my opinion much better because it is better understandable from the qml user perspective). Time which would be much more useful for other features. I think in our discussion we should not only see if it is possible but what are the costs, how useful it is, what is the outcome in the long run. Maybe we should learn what our decision have long time implications and if we have no clue about it we should stay away from them and add what we better understand. With the time they get most probably clearer. From joerg.bornemann at digia.com Wed Jun 26 14:03:53 2013 From: joerg.bornemann at digia.com (Joerg Bornemann) Date: Wed, 26 Jun 2013 14:03:53 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com>, <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> Message-ID: <51CAD8A9.6080902@digia.com> On 26/06/2013 13:35, Bubke Marco wrote: > Item { > x: parent.leftPadding + 30 > } > > to describe a box model(like in HTML). But if we want to edit it's not so easy anymore. We could find out that we want only change 30, but because we know only the x value, we have to find out what the value of parent.leftPadding is. You have the value of x and you know that 30 is a number literal. You could "assume" that + is the addition operation, because 30 is a number and x is of type int. Then the value of parent.leftPadding is (x - 30). No need to actually evaluate it. I don't see a general solution for things like this though. Handling those cases would be a huge bouquet of special cases. Cheers, Joerg -- Joerg Bornemann Digia, Qt http://qt.digia.com/ From Shawn.Rutledge at digia.com Wed Jun 26 14:14:59 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 12:14:59 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CABBCD.6070602@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> Message-ID: On 26 Jun 2013, at 12:00 PM, Thomas Hartmann wrote: > What hurts us more is real imperative code. For example setting a state > usually looks like this: > > onSomething { > root.state = "someState"; > } > > And it currently has to look like this. There is no real pure > declarative way. Isn't that what "when" is for? states: [ State { name: "someState" when: mousearea.pressed … but that's a property change whereas you are talking about connecting to a signal I suppose? But a property change is notified by means of a signal anyway. From dangelog at gmail.com Wed Jun 26 14:17:21 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Wed, 26 Jun 2013 14:17:21 +0200 Subject: [Development] Qt 5.2, Textures and FBO In-Reply-To: References: Message-ID: On 26 June 2013 11:57, Nagy-Egri Máté Ferenc wrote: > Hi! > > I see that QOpenGLTextures is on Gerrit and is under development (although > the comments have remained the same for the past few weeks). I had a short > discussion with ZapB here: > > http://qt-project.org/forums/viewthread/27640/ > > about Textures and FBO. Is there hope of these classes making it into Qt 5.2 > mainline? Sure, why not? If they get ready before 5.2 feature freeze comes (~September, according to the other thread) then they'll be in 5.2. May I suggest you to create a Gerrit account and keep an eye on related patches if you want to contribute to their development? :-) Cheers, -- Giuseppe D'Angelo From Shawn.Rutledge at digia.com Wed Jun 26 14:17:58 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 12:17:58 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com>, <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> Message-ID: On 26 Jun 2013, at 1:35 PM, Bubke Marco wrote: > I think we mix WYSIWYG and direct manipulating. WYSIWYG is not the problem, we can simply send the > expressions to the qml items. But direct manipulating is the other way around. It is from the graphics > representation to the text representation. E.g. > > You could write: > > Item { > x: parent.leftPadding + 30 > } > > to describe a box model(like in HTML). But if we want to edit it's not so easy anymore. We could find out that we want only change 30, but because we know only the x value, we have to find out what the value of parent.leftPadding is. This complicates the already complicate transformation code. What about if you change the parent and this new parent has no leftPadding property? There are so many undefined cases that supporting some will lead to a "unexpected" behaviour. So we don't change x in this case at all. You have to do it on thw text level. If you use expressions in properties you are not anymore in the declarative world so we don't support this case anymore. But you have the AST right? So why not modify that and then regenerate the code by pretty-printing the expression? From Shawn.Rutledge at digia.com Wed Jun 26 14:26:27 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 12:26:27 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CABBC6.1010802@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com> Message-ID: On 26 Jun 2013, at 12:00 PM, Thomas Hartmann wrote: >> - Editors: A lot of IDE's out there understand .js files. Writing a parser for only the declarative parts of QML is relatively easy. Writing a parser for .qml files that also understands all of JS, not so easy. > > We provide a QML parser that includes Java Script as open source. Anyone > who wants to parse QML is most likely to use this one and even if not he > has access to the complete grammar. So this is not really an issue. I see it as an issue if you had to write that parser. No wonder it's out of sync with the actual language parser. The one in declarative should have all the features that you need, with suitable (ideally even public) APIs to access those features, it should be in the declarative module, and there should be autotests to keep it consistent. So the workflow for tooling should be that you use the declarative parser to get the AST, the tooling has the opportunity to modify the AST whenever the user does something, then you can send it on to the engine for rendering a preview, and you can also regenerate the source code by pretty-printing the AST. That means the AST must be complete: it must include Javascript (even if they are only unmodifiable blobs) and comments, so that the pretty-printing will generate the same source code with only the changes the user wanted to make. But for optimization purposes there could be a parameter to the parser to ignore the comments, because tooling needs them whereas the interpreter does not. From Marco.Bubke at digia.com Wed Jun 26 14:31:30 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Wed, 26 Jun 2013 12:31:30 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com>, <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> , Message-ID: Rutledge Shawn: > But you have the AST right? So why not modify that and then regenerate the code by pretty-printing the expression? At this level we have no AST. The value of x could changed in a different place too, so we could be never sure that parent.leftPadding = x - 30. From Shawn.Rutledge at digia.com Wed Jun 26 14:40:56 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 12:40:56 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com>, <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> , Message-ID: <113FEC0B-7A22-42C1-A59A-1B8277CA782B@digia.com> On 26 Jun 2013, at 2:31 PM, Bubke Marco wrote: > Rutledge Shawn: >> But you have the AST right? So why not modify that and then regenerate the code by pretty-printing the expression? > > At this level we have no AST. So such a simple expression is already JS not QML, and therefore it's opaque to you? But I would think there should be a nested AST of a different kind then, or at least you could get the other AST by sending that expression to the JS parser. (Now that we own it, instead of the V8 black box) > The value of x could changed in a different place too, so we could be never sure that > parent.leftPadding = x - 30. But in C++ in the code editor you can find all usages of a variable, doesn't that require a similar level of code understanding? From Marco.Bubke at digia.com Wed Jun 26 15:00:23 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Wed, 26 Jun 2013 13:00:23 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com>, Message-ID: Sorry for the formatting but the web email client is improvable. Rutledge Shawn: I see it as an issue if you had to write that parser. No wonder it's out of sync with the actual language parser. The one in declarative should have all the features that you need, with suitable (ideally even public) APIs to access > those features, it should be in the declarative module, and there should be autotests to keep it consistent. So the workflow for tooling should be that you use the declarative parser to get the AST, the tooling has the opportunity to modify the AST whenever the user does something, then you can send it on to the engine for rendering a preview, and you can also regenerate the source code by pretty-printing the AST.? That means the AST must be complete: it must include Javascript (even if they are only unmodifiable blobs) and comments, so that the pretty-printing will generate the same source code with only the changes the user wanted to make. But for optimization purposes there could be a parameter to the parser to ignore the comments, because tooling needs them whereas the interpreter does not. I'm not sure that you know how is works now so I believe you are not in the context. Ok, here how the designer works: First we have a Rewriter which sits on top of the AST. It is the brigde between the our DOM like model and the AST. From the model there is a view which is generating a qml tree in a other process. This is not the preview because we need more control for example no animations etc.. So we generate the qml object tree not from text but directly(actual there is no good interface to do it). Than we read back the values and images and compose the scene in a graphicsview, fill the values in the property editor etc.. The approach with the different process has additional advantage that a crash is not that bad, we can link with different Qt versions and can restart the process because there was a problem which we call "componentComplete lazy programming". Hope now you get a better picture. ;-) _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From Thomas.Hartmann at digia.com Wed Jun 26 15:17:30 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Wed, 26 Jun 2013 15:17:30 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> Message-ID: <51CAE9EA.2050508@digia.com> Hi, > > Isn't that what "when" is for? > > states: [ > State { > name: "someState" > when: mousearea.pressed > … > > but that's a property change whereas you are talking about connecting to a signal I suppose? But a property change is notified by means of a signal anyway. > Yes we can use it, bit it has slightly different semantics (as you point out). It would be nice also be able to react to signals in a purely declarative way. Kind Regards, Thomas Hartmann From Thomas.Hartmann at digia.com Wed Jun 26 15:20:26 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Wed, 26 Jun 2013 15:20:26 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <113FEC0B-7A22-42C1-A59A-1B8277CA782B@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com>, <5B2736A3C8B75B4BB66BC58DC5E889B08C5AB2@IT-EXMB01-HKI.it.local> , <113FEC0B-7A22-42C1-A59A-1B8277CA782B@digia.com> Message-ID: <51CAEA9A.4020305@digia.com> Hi > > So such a simple expression is already JS not QML, and therefore it's opaque to you? But I would think there should be a nested AST of a different kind then, or at least you could get the other AST by sending that expression to the JS parser. (Now that we own it, instead of the V8 black box) > This is exactly what we do. We do evaluate the expression if we have a complete enough context. But what do you do if an expression contains several literals or if we cannot build the inverse function? There is no way we can allow editing of expressions by drag and drop in a predictable way. This is why we just lock the property and mark it as having an expression. You can still edit the expression as a string, but not in the form editor. Just think about something like this: width: Math.max(Math.min(recentProjects.contentHeight + 120, recentProjects.height), sessions.height) And this is a real life example. In practice bindings like this are not that often and people who use them can write the expression as code/string. You still get WYSIWYG so I do not think there is a problem. Kind Regards, Thomas Hartmann From Thomas.Hartmann at digia.com Wed Jun 26 15:27:45 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Wed, 26 Jun 2013 15:27:45 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com> Message-ID: <51CAEC51.4070000@digia.com> Hi, Am 26/06/2013 14:26, schrieb Rutledge Shawn: > > On 26 Jun 2013, at 12:00 PM, Thomas Hartmann wrote: > >>> - Editors: A lot of IDE's out there understand .js files. Writing a parser for only the declarative parts of QML is relatively easy. Writing a parser for .qml files that also understands all of JS, not so easy. >> >> We provide a QML parser that includes Java Script as open source. Anyone >> who wants to parse QML is most likely to use this one and even if not he >> has access to the complete grammar. So this is not really an issue. > > I see it as an issue if you had to write that parser. No wonder it's out of sync with the actual language parser. The one in declarative should have all the features that you need, with suitable (ideally even public) APIs to access those features, it should be in the declarative module, and there should be autotests to keep it consistent. So the workflow for tooling should be that you use the declarative parser to get the AST, the tooling has the opportunity to modify the AST whenever the user does something, then you can send it on to the engine for rendering a preview, and you can also regenerate the source code by pretty-printing the AST. That means the AST must be complete: it must include Javascript (even if they are only unmodifiable blobs) and comments, so that the pretty-printing will generate the same source code with only the changes the user wanted to make. But for optimization purposes there could be a parameter to the parser to ignore the comments, becaus e tooli ng needs them whereas the interpreter does not. > The problem with that approach is that an AST is read only by design. What you need for tooling that modifies QML is something like a DOM. In the early days there was a QmlDom class if I remember correctly, but it was not properly maintained and did not have the required features. In the Qt Quick Designer we have a DOM like structure that is slightly more abstract than an AST. We called it just "model" and it can modify QML code by using a rewriter and it can instantiate the corresponding objects using the qml(2)puppet. Kind Regards, Thomas Hartmann From Shawn.Rutledge at digia.com Wed Jun 26 15:27:57 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 13:27:57 +0000 Subject: [Development] API review for FolderListModel Message-ID: I just wrote up this task https://bugreports.qt-project.org/browse/QTBUG-32039 because while implementing the QML FileDialog I ran into some issues; those are the ones I can remember, at least. If anyone has noticed any further annoyances in the FolderListModel API, please feel free to add to that list. From Shawn.Rutledge at digia.com Wed Jun 26 15:47:44 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 13:47:44 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CAEC51.4070000@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com> <51CAEC51.4070000@digia.com> Message-ID: <46A02FA6-42F1-4295-A100-3D99E8B59CF3@digia.com> On 26 Jun 2013, at 3:27 PM, Thomas Hartmann wrote: > > The problem with that approach is that an AST is read only by design. Why does it have to be that way? From Shawn.Rutledge at digia.com Wed Jun 26 16:01:35 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Wed, 26 Jun 2013 14:01:35 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com>, Message-ID: <24358E4E-D775-491D-8968-8E346089D48C@digia.com> On 26 Jun 2013, at 3:00 PM, Bubke Marco wrote: > I'm not sure that you know how is works now so I believe you are not in the context. Ok, here how the designer works: > > First we have a Rewriter which sits on top of the AST. It is the brigde between the our DOM like model and the AST. From the model there is a view which is generating a qml tree in a other process. This is not the preview because we need more control for example no animations etc.. So we generate the qml object tree not from text but directly(actual there is no good interface to do it). This sounds like nice functionality to have in the QtQuick 2 engine. But I'm still wondering why an AST and a DOM have to be so different. IMO the AST should be complete enough that you could introspect it? since it's already enough for the engine to construct a scene, right? > Than we read back the values and images and compose the scene in a graphicsview, fill the values in the property editor etc.. OK, that's good to know. > The approach with the different process has additional advantage that a crash is not that bad, we can link with different Qt versions and can restart the process because there was a problem which we call "componentComplete lazy programming". Can you describe more of what goes wrong? I've run into problems with what componentComplete actually means several times too. From Marco.Bubke at digia.com Wed Jun 26 16:08:44 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Wed, 26 Jun 2013 14:08:44 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <24358E4E-D775-491D-8968-8E346089D48C@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com>, , <24358E4E-D775-491D-8968-8E346089D48C@digia.com> Message-ID: Rutledge Shawn: On 26 Jun 2013, at 3:00 PM, Bubke Marco wrote: > The approach with the different process has additional advantage that a crash is not that bad, we can link with different Qt versions and can restart the process because there was a problem which we call "componentComplete lazy programming". Can you describe more of what goes wrong? I've run into problems with what componentComplete actually means several times too. componentComplete is called only one time after the component creation. This is fine for the viewer because Qml is designed that its tree is only build one time. For the editor it's a big problem because we change this tree all the time. We had the idee, that the signal at component creation time will compressed and executed at the end of the component creation. So the performance use case for componentComplete would be gone. -------------- next part -------------- An HTML attachment was scrubbed... URL: From Thomas.Hartmann at digia.com Wed Jun 26 16:11:59 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Wed, 26 Jun 2013 16:11:59 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <46A02FA6-42F1-4295-A100-3D99E8B59CF3@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com> <51CAEC51.4070000@digia.com> <46A02FA6-42F1-4295-A100-3D99E8B59CF3@digia.com> Message-ID: <51CAF6AF.60906@digia.com> Hi, Am 26/06/2013 15:47, schrieb Rutledge Shawn: > > On 26 Jun 2013, at 3:27 PM, Thomas Hartmann wrote: >> >> The problem with that approach is that an AST is read only by design. > > Why does it have to be that way? By Design. ;) Abstract syntax trees are a data structure widely used in compilers, due to their property of representing the structure of program code. An AST is a purely syntactical representation of the source and tightly coupled with the grammar. The AST is the output of a parser and therefore a read-only structure. Any data structure that is modifiable and reflects the changes in the source code should be called DOM or similar. I just found out that they seem to mix up the terms DOM and AST in the Eclipse world. I think not making this distinction is confusing. In the case of QML we have a read-only AST and it is designed to be read-only. A DOM is a lot more complex then a pure AST and of course it has access to an AST on the lower levels. In our case the Model/DOM is also significantly more abstract then the AST and hides several syntactical details, that are of no interest on the level of a UI designer. Kind Regards, Thomas Hartmann From Tony.Sarajarvi at digia.com Wed Jun 26 16:23:33 2013 From: Tony.Sarajarvi at digia.com (=?iso-8859-1?Q?Saraj=E4rvi_Tony?=) Date: Wed, 26 Jun 2013 14:23:33 +0000 Subject: [Development] Qt CI improvements Message-ID: Hi all! Our IT has planned a few improvements to our CI. You might be glad to hear about these. These changes are addressing random failures in autotests we have experiencing. Please let us know if you have any concerns regarding these. These changes will come only after 5.1, so that we don't break anything that at least works somehow currently. 1. Qt-test-server.it.local & qt-test-server.CI.LOCAL re-location ( The network test server machines in autotests ) - These server will be also relocated to dedicated host, currently there are running on same hosts with build machines o when builds are running these servers are affected by performance problems - Another issues with these servers is they are constantly running low on disk space which causes instability to builds o these will be fixed adding more disk space when relocation is done 2. Qt CI infrastructure machines will be moved to a dedicated ESX host - This is due to a high capacity and resource demands - This way, machines get mode CPU time and function faster - Time table end of July 3. Creation of Secondary GIT mirror for CI clients - Due to a heavy load on current CI GIT it would be better to create another GIT server to balance the load - One GIT mirror would server windows CI clients and another GIT mirror linux clients - this would split the load and this should fix all performance problems which currently occurs - time table end of July 4. CI Build machines re-provisioning - CI build machines will re-provisioned when they are migrated to new SAN system - Timetable on end of July or after 5.1 release - On same time windows and linux machines ratio on ESX host will be changed o 4 linux and 1 windows CI machine per host 5. More monitoring to CI infra host - currently added all critical hosts and components to monitoring 6. Jenkins awareness of VMware esx resources via vpshere API - Jenkins enterprise product under investigation - Possible use of open source plugins to Jenkins - If we get Jenkins to understand what is happening on ESX server level we could optimize builds more and possible safe money on hardware costs Regards, -Tony -------------- next part -------------- An HTML attachment was scrubbed... URL: From Liang.Qi at digia.com Wed Jun 26 17:21:56 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Wed, 26 Jun 2013 15:21:56 +0000 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: Another situation we should avoid is the relations between stable and release after branch. 5.1.0 is still not out yet, after branch, many fixes for critical issues still went into stable branch, and there is no merge happened from stable into release. Then some cherry-pick happened from stable to release. Duplicate commits happened several times which I had seen by now. I suggest: After release branched from stable, the review of the commits in stable branch should be monitored by someone or team, they should decide whether the commits should go to release branch or not very carefully. Otherwise, we should do merge from stable to release before the final release happen, but will cause some extra work to release team and others. Regards, Liang From daniel.teske at digia.com Wed Jun 26 17:56:28 2013 From: daniel.teske at digia.com (Daniel Teske) Date: Wed, 26 Jun 2013 17:56:28 +0200 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: References: Message-ID: <201306261756.28523.daniel.teske@digia.com> On Wednesday 26 Jun 2013 13:05:01 Knoll Lars wrote: > On 26.06.13 12:59, "Daniel Teske" wrote: > >On Wednesday 26 Jun 2013 09:04:26 Knoll Lars wrote: > >> I can do that, but I can unfortunately not migrate the open bugs to the > >> > >>new > >> > >> component (as I can't migrate across Jira projects). You'd have to > >> > >>create > >> > >> a new report for each of the open bugs in the Jira Qt project. If you're > >> ok with that I'll remove the serial port component in the playground > >> project. > > > >Actually that's easy to do with jira so I just moved all 31 bug reports > >to the > >new component. > > Didn't find that. You'll need to show me the trick at some point :) There's a gear button in the top right corner of every filter or search result, (See attachment) which allows for "Bulk Changes". Those allow for moving all bug reports in one go. That used to be broken for changing more than ~3 issues at the same time but seems to work nicely now. Except that I'm now watching all the bugs that I moved. daniel -------------- next part -------------- A non-text attachment was scrubbed... Name: bulkchange.png Type: image/png Size: 22093 bytes Desc: not available URL: From thiago.macieira at intel.com Wed Jun 26 18:49:40 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 09:49:40 -0700 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <1881339.W2TpmBZjhn@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 15.21.56, Qi Liang wrote: > Another situation we should avoid is the relations between stable and > release after branch. > > 5.1.0 is still not out yet, after branch, many fixes for critical issues > still went into stable branch, and there is no merge happened from stable > into release. Then some cherry-pick happened from stable to release. > Duplicate commits happened several times which I had seen by now. >From stable to release is not supposed to happen. Things that go into stable are supposed to be 5.1.1 material and require a little more time of testing, like Ossi's updates to the configure script. If something ends up by accident in stable, or if we later find that it is really required in release, then we cherry-pick. > I suggest: > After release branched from stable, the review of the commits in stable > branch should be monitored by someone or team, they should decide whether > the commits should go to release branch or not very carefully. That's already supposed to happen. > Otherwise, we should do merge from stable to release before the final > release happen, but will cause some extra work to release team and others. That defeats the purpose of having a branch at all. If we're going to do the merge, then we could just as well not have the branch in the first place and save ourselves the hassle and the CPU time required to test the extra branch. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 18:50:54 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 09:50:54 -0700 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <201306261756.28523.daniel.teske@digia.com> References: <201306261756.28523.daniel.teske@digia.com> Message-ID: <2971795.xoUNeR6tMG@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 17.56.28, Daniel Teske wrote: > Except that I'm now watching > all the bugs that I moved. It's the auto-watch-the-bugs-you-changed feature we requested. It would be better if it were auto-watch-bugs-you-comment-on, but this is better than not watching. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From oswald.buddenhagen at digia.com Wed Jun 26 19:09:04 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Wed, 26 Jun 2013 19:09:04 +0200 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <2971795.xoUNeR6tMG@tjmaciei-mobl2> References: <201306261756.28523.daniel.teske@digia.com> <2971795.xoUNeR6tMG@tjmaciei-mobl2> Message-ID: <20130626170904.GB864@troll08.it.local> On Wed, Jun 26, 2013 at 09:50:54AM -0700, Thiago Macieira wrote: > On quarta-feira, 26 de junho de 2013 17.56.28, Daniel Teske wrote: > > Except that I'm now watching > > all the bugs that I moved. > > It's the auto-watch-the-bugs-you-changed feature we requested. > everyone can disable the feature for himself. however, what one'd really want is a way to uncheck a box in the bulk change dialog. From 416365416c at gmail.com Wed Jun 26 19:16:57 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 10:16:57 -0700 Subject: [Development] QML engine changes In-Reply-To: References: <1525942.bRdby09J1O@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> <1685807.9fTUVD1qkJ@rhea> <20130625205445.GB4979@klara.mpi.htwm.de> Message-ID: On Wed, Jun 26, 2013 at 3:34 AM, Bubke Marco wrote: > Hi > > Alan Alpert: >>> The staunch refusal to provide reasonable interfaces to the individual layers >>> of the Qt Quick stack adds insult to injury, no matter how you put it. > >> Good thing we never did that. In fact, V4+V8->V4VM and >> QtDeclarative->QtQml+QtQuick both promise to improve the interfaces >> between individual aspects of the QtQuick stack. > > Do you really believe the C++ interface of Qml is well designed? No, the C++ interface of QML is not ideal. My point is that it's getting better, and you can help with that process. >E.g. the list interface is only providing clear, > so if we change the one element in the list, we have to clear the list and build it new. But append has only the > [...] > >> Now maybe these don't solve your specific toolability concerns. But as >> you haven't mentioned any specific concerns yet, I can only address >> the problems I'm aware of. As I said, I'd like to hear your >> toolability complaints about JS embedded in QML, in a separate thread. >> It will almost certainly be easier to address them with the new JS >> engine than the old one. > > My general concern is that Qml is designed from the text(vi) perspective, and not so much from the tool perspective. That is correct. I would argue that this design choice is also correct, because text is the best common format for human editing. Everyone will already have a fully feature text editor that they are comfortable with, and then they can use all of the features immediately. In contrast, building a specific tool requires that tool to be built, then people to get it, learn it, and adapt to it. The specific tool is better in the long run (for most usage) but we can't wait for it to finish. Of course, that attitude does make it even harder to write the tool and so it takes even longer for it to finish. That is an issue we would like to mitigate where possible. > One example for it: > [...] > Sorry for the rant, but I really believe we need a more global approach(development story) to Qml, a wider scope > and if we are not sure we should ask the other guy what they think about the change. Better yet, join the discussion if you're interested. As an open project we do need to get better about having the design discussions in the open, and joining those discussions from the tooling side is encouraged. Then you aren't relying on other developers to be 'unsure' about something. -- Alan Alpert From 416365416c at gmail.com Wed Jun 26 19:38:11 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 10:38:11 -0700 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CAE9EA.2050508@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> Message-ID: On Wed, Jun 26, 2013 at 6:17 AM, Thomas Hartmann wrote: > Hi, > >> >> Isn't that what "when" is for? >> >> states: [ >> State { >> name: "someState" >> when: mousearea.pressed >> … >> >> but that's a property change whereas you are talking about connecting to a signal I suppose? But a property change is notified by means of a signal anyway. >> > > Yes we can use it, bit it has slightly different semantics (as you point > out). It would be nice also be able to react to signals in a purely > declarative way. I agree. There should be a purely declarative approach for all the "pure UI" parts, and a "triggers" property on State or a StateChangeConnections element would be an improvement. Making the UI design more declarative is not just a benefit for tooling. It's also a benefit for implementation (we can usually optimize it better) and architecture. The architecture is supposed to be 1) Declarative QML for the UI look and feel 2) JS for the hooks into the main program functionality 3) C++ for the main program functionality, or JS if the functionality is really simple or you're prototyping. The thing is that when we're missing something in the Declarative QML APIs then you can fall back to JS or C++ to implement it. This is great in that users of QML don't hit unassailable walls all the time, but it does allow them to break the intended architecture a lot. What we want is to extend the declarative QML APIs so that they can naturally follow this pattern. Then we have a clear architecture, better design tooling and implementation, and still the unrestricted power of QML. With the above architecture, it should be fine for the designer to treat complex bindings as opaque blocks. If you have declarative elements for the entire UI look and feel, then the opaque blocks are hooks into program functionality which would not be expected to be active inside the design tool (it still makes sense to launch the application to see it filled with data). Obviously a complete declarative API is a work in progress. But as a first step we should consider a "trigger" property on State which you can set to a signal (e.g. mousearea.clicked) so as to handle that case declaratively. Do we have a qtquick mailing list yet to use for QML API reviews? -- Alan Alpert From 416365416c at gmail.com Wed Jun 26 19:41:19 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 10:41:19 -0700 Subject: [Development] API review for FolderListModel In-Reply-To: References: Message-ID: On Wed, Jun 26, 2013 at 6:27 AM, Rutledge Shawn wrote: > I just wrote up this task > > https://bugreports.qt-project.org/browse/QTBUG-32039 > > because while implementing the QML FileDialog I ran into some issues; those are the ones I can remember, at least. If anyone has noticed any further annoyances in the FolderListModel API, please feel free to add to that list. The API review should happen on the ML, not in a JIRA task. Or are you wanting to collect issues and opinions for a review "later"? Because otherwise we could just start it right here, right now... PS: Should this be on the proposed new QtQuick mailing list? I kind of like the idea of having the API reviews on a shared user/developer ML to get some direct user input. -- Alan Alpert From Marco.Bubke at digia.com Wed Jun 26 19:41:02 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Wed, 26 Jun 2013 17:41:02 +0000 Subject: [Development] QML engine changes In-Reply-To: References: <1525942.bRdby09J1O@rhea> <2019549.gHZdPA8bjg@rhea> <20130624215817.GA8402@klara.mpi.htwm.de> <1685807.9fTUVD1qkJ@rhea> <20130625205445.GB4979@klara.mpi.htwm.de> , Message-ID: Alan Alpert: That is correct. I would argue that this design choice is also correct, because text is the best common format for human editing. Everyone will already have a fully feature text editor that they are comfortable with, and then they can use all of the features immediately. In contrast, building a specific tool requires that tool to be built, then people to get it, learn it, and adapt to it. The specific tool is better in the long run (for most usage) but we can't wait for it to finish. Like a said in a other mail Qml is not that much declarative anymore. Actually I think it burned to many man years here in the tooling team that it was not worth it. If you want help the designer than make Qml more declarative again. Better yet, join the discussion if you're interested. As an open project we do need to get better about having the design discussions in the open, and joining those discussions from the tooling side is encouraged. Then you aren't relying on other developers to be 'unsure' about something. Good to hear. So what is the plan for the "PropertyCache"? What about a new better list interface(we have prototype here? Maybe add signal compression instead of componentComplete. Always think about that you need a reverse transformation for direct manipulation(visual to text). Refactor the item code base. Why do we have parent and parentItem? Why do we mix the setParent and child list pattern? This a short list of a much longer. ;-) I know many things are historical grown but if we not clean it up we end in my opinion in a mess. -------------- next part -------------- An HTML attachment was scrubbed... URL: From 416365416c at gmail.com Wed Jun 26 19:46:22 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 10:46:22 -0700 Subject: [Development] Qt 5.2 In-Reply-To: <1881339.W2TpmBZjhn@tjmaciei-mobl2> References: <1881339.W2TpmBZjhn@tjmaciei-mobl2> Message-ID: On Wed, Jun 26, 2013 at 9:49 AM, Thiago Macieira wrote: > On quarta-feira, 26 de junho de 2013 15.21.56, Qi Liang wrote: >> Another situation we should avoid is the relations between stable and >> release after branch. >> >> 5.1.0 is still not out yet, after branch, many fixes for critical issues >> still went into stable branch, and there is no merge happened from stable >> into release. Then some cherry-pick happened from stable to release. >> Duplicate commits happened several times which I had seen by now. > > From stable to release is not supposed to happen. Things that go into stable > are supposed to be 5.1.1 material and require a little more time of testing, > like Ossi's updates to the configure script. > > If something ends up by accident in stable, or if we later find that it is > really required in release, then we cherry-pick. Thiago is correct. We're still a little new at this branching structure but the process is always supposed to be that critical issues, targeting the patch release we're working on releasing now, should go to release branch. Non-critical fixes or ones that need more time go to stable and will be in the next patch release. And cherry-picking is a manual fall-back for when we make a mistake. -- Alan Alpert From shawn.t.rutledge at gmail.com Wed Jun 26 19:52:22 2013 From: shawn.t.rutledge at gmail.com (Shawn Rutledge) Date: Wed, 26 Jun 2013 19:52:22 +0200 Subject: [Development] API review for FolderListModel In-Reply-To: References: Message-ID: Whatever works, the task is just to avoid forgetting about it. On 26 June 2013 19:41, Alan Alpert <416365416c at gmail.com> wrote: > On Wed, Jun 26, 2013 at 6:27 AM, Rutledge Shawn > wrote: > > I just wrote up this task > > > > https://bugreports.qt-project.org/browse/QTBUG-32039 > > > > because while implementing the QML FileDialog I ran into some issues; > those are the ones I can remember, at least. If anyone has noticed any > further annoyances in the FolderListModel API, please feel free to add to > that list. > > The API review should happen on the ML, not in a JIRA task. Or are you > wanting to collect issues and opinions for a review "later"? Because > otherwise we could just start it right here, right now... > > PS: Should this be on the proposed new QtQuick mailing list? I kind of > like the idea of having the API reviews on a shared user/developer ML > to get some direct user input. > > -- > Alan Alpert > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From shawn.t.rutledge at gmail.com Wed Jun 26 19:56:17 2013 From: shawn.t.rutledge at gmail.com (Shawn Rutledge) Date: Wed, 26 Jun 2013 19:56:17 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> Message-ID: On 26 June 2013 19:38, Alan Alpert <416365416c at gmail.com> wrote: > Obviously a complete declarative API is a work in progress. But as a > first step we should consider a "trigger" property on State which you > can set to a signal (e.g. mousearea.clicked) so as to handle that case > declaratively. Do we have a qtquick mailing list yet to use for QML > API reviews? Maybe it would be less confusing to extend "when" to connect to any signal, not just a property change signal? One less keyword to remember. -------------- next part -------------- An HTML attachment was scrubbed... URL: From renatox at gmail.com Wed Jun 26 20:02:13 2013 From: renatox at gmail.com (Renato Araujo) Date: Wed, 26 Jun 2013 15:02:13 -0300 Subject: [Development] [QtPim] Pending Merge Requests Message-ID: Hi list, I would like to know if there is any official maintainer for the QtPim module? or who I can ping on IRC to talk about the QtPim and some features that I would like to implement? Another point I is that I have 3 pending MR for QtPim and I would like receive some feedback about it. Two[1][2] MR are bug fix and I would be happy to have this merged as soon as possible, and the other[3] is some optimizations on the current QContactModel. Thanks Renato Araujo Oliveira Filho [1]https://codereview.qt-project.org/59156 [2]https://codereview.qt-project.org/59473 [3]https://codereview.qt-project.org/59931 -------------- next part -------------- An HTML attachment was scrubbed... URL: From 416365416c at gmail.com Wed Jun 26 20:04:21 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 11:04:21 -0700 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) Message-ID: On Wed, Jun 26, 2013 at 10:41 AM, Bubke Marco wrote: > >[...] > > Better yet, join the discussion if you're interested. As an open > project we do need to get better about having the design discussions > in the open, and joining those discussions from the tooling side is > encouraged. Then you aren't relying on other developers to be 'unsure' > about something. > > > Good to hear. So what is the plan for the "PropertyCache"? Simon knows better than I, but I think the plan is for it to go away. > What about a new better list interface(we have prototype here? Sounds good! Where's the prototype so I can have a look? > Maybe add signal compression instead of componentComplete. It should remain as a fall-back, but once we have signal compression we should consider rewriting all elements to avoid it (so that it's just an imperative fall-back method and designer can ignore it). > Always think about that you need a reverse transformation for direct > manipulation(visual to text). > Refactor the item code base. > Why do we have parent and parentItem? Because we're layering another parent/child hierarchy onto QObject. Now that we no longer have the QGraphicsItem implementation detail we theoretically could unify them, but we still need to be able to traverse the QQuickItem tree efficiently (and provide backwards compatibility) and enforce a kind of 'tree-level type safety' where QQuickItems are connected to the scene root through QQuickItems. I haven't really thought about the possibility of unifying the trees before, I'll have to give it some more thought. > Why do we mix the setParent and child list pattern? In the declarative QML you should be using the child list in virtually all cases. setParent is more there for imperative code, such as creating an object in script (which ideally you'd be doing declaratively through the Loader element. -- Alan Alpert From 416365416c at gmail.com Wed Jun 26 20:09:27 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 11:09:27 -0700 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> Message-ID: On Wed, Jun 26, 2013 at 10:56 AM, Shawn Rutledge wrote: > On 26 June 2013 19:38, Alan Alpert <416365416c at gmail.com> wrote: >> >> Obviously a complete declarative API is a work in progress. But as a >> first step we should consider a "trigger" property on State which you >> can set to a signal (e.g. mousearea.clicked) so as to handle that case >> declaratively. Do we have a qtquick mailing list yet to use for QML >> API reviews? > > > Maybe it would be less confusing to extend "when" to connect to any signal, > not just a property change signal? One less keyword to remember. The difference is that 'when' is a binding evaluated as a boolean, not a property change signal. You can do "when: alpha.ready && beta.ready && maybeOtherStuff()". You cannot conceptually do "when: alpha.readyChanged && beta.readyChanged" because signal && signal does not compute. We could assign an arbitrary meaning to it, but I think that's getting more confusing by that point... -- Alan Alpert From Liang.Qi at digia.com Wed Jun 26 20:14:24 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Wed, 26 Jun 2013 18:14:24 +0000 Subject: [Development] [QtPim] Pending Merge Requests In-Reply-To: References: Message-ID: Hi, Renato, I had added Alex and Lorn as reviewers of your changes. And there is a #qt-mobility channel, you can find them there. Regards, Liang ________________________________ From: Renato Araujo Sent: Wednesday, June 26, 2013 8:02 PM To: development at qt-project.org Subject: [Development] [QtPim] Pending Merge Requests Hi list, I would like to know if there is any official maintainer for the QtPim module? or who I can ping on IRC to talk about the QtPim and some features that I would like to implement? Another point I is that I have 3 pending MR for QtPim and I would like receive some feedback about it. Two[1][2] MR are bug fix and I would be happy to have this merged as soon as possible, and the other[3] is some optimizations on the current QContactModel. Thanks Renato Araujo Oliveira Filho [1]https://codereview.qt-project.org/59156 [2]https://codereview.qt-project.org/59473 [3]https://codereview.qt-project.org/59931 -------------- next part -------------- An HTML attachment was scrubbed... URL: From Lars.Knoll at digia.com Wed Jun 26 20:50:50 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 18:50:50 +0000 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: Message-ID: On 6/26/13 8:04 PM, "Alan Alpert" <416365416c at gmail.com> wrote: >On Wed, Jun 26, 2013 at 10:41 AM, Bubke Marco >wrote: >> >>[...] >> >> Better yet, join the discussion if you're interested. As an open >> project we do need to get better about having the design discussions >> in the open, and joining those discussions from the tooling side is >> encouraged. Then you aren't relying on other developers to be 'unsure' >> about something. >> >> >> Good to hear. So what is the plan for the "PropertyCache"? >Simon knows better than I, but I think the plan is for it to go away. Yes, as much as possible, but I'm not sure how fast we can make it happen. I'm actually looking into related things right now. But first I need to clean up the QStringHash and related classes. >> What about a new better list interface(we have prototype here? >Sounds good! Where's the prototype so I can have a look? > >> Maybe add signal compression instead of componentComplete. >It should remain as a fall-back, but once we have signal compression >we should consider rewriting all elements to avoid it (so that it's >just an imperative fall-back method and designer can ignore it). Yes, I'd agree to this as well. > >> Always think about that you need a reverse transformation for direct >> manipulation(visual to text). >> Refactor the item code base. >> Why do we have parent and parentItem? >Because we're layering another parent/child hierarchy onto QObject. >Now that we no longer have the QGraphicsItem implementation detail we >theoretically could unify them, but we still need to be able to >traverse the QQuickItem tree efficiently (and provide backwards >compatibility) and enforce a kind of 'tree-level type safety' where >QQuickItems are connected to the scene root through QQuickItems. I >haven't really thought about the possibility of unifying the trees >before, I'll have to give it some more thought. I hope that's going to be possible, but I don't think anybody tried yet ;-) >> Why do we mix the setParent and child list pattern? >In the declarative QML you should be using the child list in virtually >all cases. setParent is more there for imperative code, such as >creating an object in script (which ideally you'd be doing >declaratively through the Loader element. It might also be required for some performance optimisations where I'd like to create a subtree in a secondary thread and then hook it into the main QML tree once it's created. But that's certainly 5.3 material :) Cheers, Lars From Alexander.Blasche at digia.com Wed Jun 26 20:57:38 2013 From: Alexander.Blasche at digia.com (Blasche Alexander) Date: Wed, 26 Jun 2013 18:57:38 +0000 Subject: [Development] [request] Creation a new QtSerialPort component into a Qt bug tracker In-Reply-To: <2971795.xoUNeR6tMG@tjmaciei-mobl2> References: <201306261756.28523.daniel.teske@digia.com>, <2971795.xoUNeR6tMG@tjmaciei-mobl2> Message-ID: ________________________________________ From: development-bounces+alexander.blasche=digia.com at qt-project.org [development-bounces+alexander.blasche=digia.com at qt-project.org] on behalf of Thiago Macieira [thiago.macieira at intel.com] Sent: Wednesday, June 26, 2013 18:50 On quarta-feira, 26 de junho de 2013 17.56.28, Daniel Teske wrote: >> Except that I'm now watching >> all the bugs that I moved. >It's the auto-watch-the-bugs-you-changed feature we requested. It would be >better if it were auto-watch-bugs-you-comment-on, but this is better than not >watching. And it can be turned off via the Autowatch option on the user preference dialog (last option on the dialog). Well, the Bulk Change option seems to be locked down as I don't get the option either (used to have it). This is a global permission only a selected number of people has been granted: https://confluence.atlassian.com/display/JIRA/Managing+Global+Permissions -- Alex From 416365416c at gmail.com Wed Jun 26 21:12:17 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 12:12:17 -0700 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: References: Message-ID: On Wed, Jun 26, 2013 at 11:50 AM, Knoll Lars wrote: > On 6/26/13 8:04 PM, "Alan Alpert" <416365416c at gmail.com> wrote: > >>On Wed, Jun 26, 2013 at 10:41 AM, Bubke Marco >>wrote: >>> >>>[...] >>> >>> Better yet, join the discussion if you're interested. As an open >>> project we do need to get better about having the design discussions >>> in the open, and joining those discussions from the tooling side is >>> encouraged. Then you aren't relying on other developers to be 'unsure' >>> about something. >>> >>> >>> Good to hear. So what is the plan for the "PropertyCache"? >>Simon knows better than I, but I think the plan is for it to go away. > > Yes, as much as possible, but I'm not sure how fast we can make it happen. > I'm actually looking into related things right now. But first I need to > clean up the QStringHash and related classes. > >>> What about a new better list interface(we have prototype here? >>Sounds good! Where's the prototype so I can have a look? >> >>> Maybe add signal compression instead of componentComplete. >>It should remain as a fall-back, but once we have signal compression >>we should consider rewriting all elements to avoid it (so that it's >>just an imperative fall-back method and designer can ignore it). > > Yes, I'd agree to this as well. >> >>> Always think about that you need a reverse transformation for direct >>> manipulation(visual to text). >>> Refactor the item code base. >>> Why do we have parent and parentItem? >>Because we're layering another parent/child hierarchy onto QObject. >>Now that we no longer have the QGraphicsItem implementation detail we >>theoretically could unify them, but we still need to be able to >>traverse the QQuickItem tree efficiently (and provide backwards >>compatibility) and enforce a kind of 'tree-level type safety' where >>QQuickItems are connected to the scene root through QQuickItems. I >>haven't really thought about the possibility of unifying the trees >>before, I'll have to give it some more thought. > > I hope that's going to be possible, but I don't think anybody tried yet ;-) > > >>> Why do we mix the setParent and child list pattern? >>In the declarative QML you should be using the child list in virtually >>all cases. setParent is more there for imperative code, such as >>creating an object in script (which ideally you'd be doing >>declaratively through the Loader element. > > It might also be required for some performance optimisations where I'd > like to create a subtree in a secondary thread and then hook it into the > main QML tree once it's created. But that's certainly 5.3 material :) That's not a prerequisite. Any trees in QML are either going to be using the child list or will be imperatively loaded later as a separate subtree (which could also be easily moved to another thread). Even if you do Item { id: root Item { id: theParent } Item { id: theChild parent: theParent } } (which I have never seen, and might not work) you assigned it to a child list and then re-assigned it, so it was already objectively bad QML. Otherwise you're imperatively loading it. -- Alan Alpert From thiago.macieira at intel.com Wed Jun 26 22:49:35 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:35 -0700 Subject: [Development] Header diff for QtConcurrent In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <6c3329$andd15@orsmga002.jf.intel.com> diff --git a/src/concurrent/qtconcurrent_global.h b/src/concurrent/qtconcurrent_global.h index 464aa88..965d33f 100644 --- a/src/concurrent/qtconcurrent_global.h +++ b/src/concurrent/qtconcurrent_global.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // include guard diff --git a/src/concurrent/qtconcurrentcompilertest.h b/src/concurrent/qtconcurrentcompilertest.h index 0b0edf5..7652a69 100644 --- a/src/concurrent/qtconcurrentcompilertest.h +++ b/src/concurrent/qtconcurrentcompilertest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,7 +46,6 @@ #ifndef QT_NO_CONCURRENT -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE namespace QtPrivate { @@ -64,7 +63,6 @@ public: } QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentexception.h b/src/concurrent/qtconcurrentexception.h index 373d42e..21fdb25 100644 --- a/src/concurrent/qtconcurrentexception.h +++ b/src/concurrent/qtconcurrentexception.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,7 +48,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -65,7 +64,6 @@ typedef Q_DECL_DEPRECATED QUnhandledException UnhandledException; } // namespace QtConcurrent QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_QFUTURE diff --git a/src/concurrent/qtconcurrentfilter.h b/src/concurrent/qtconcurrentfilter.h index ca0ab4d..4c6f2ed 100644 --- a/src/concurrent/qtconcurrentfilter.h +++ b/src/concurrent/qtconcurrentfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,11 +49,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef qdoc +#ifdef Q_QDOC namespace QtConcurrent { @@ -258,10 +257,9 @@ OutputSequence blockingFiltered(Iterator begin, Iterator end, KeepFunctor keep) } // namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentfilterkernel.h b/src/concurrent/qtconcurrentfilterkernel.h index c980fcc..63e77ab 100644 --- a/src/concurrent/qtconcurrentfilterkernel.h +++ b/src/concurrent/qtconcurrentfilterkernel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,11 +50,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -340,10 +339,9 @@ inline ThreadEngineStarter startFilteredReduced(Iterator begin, Iter } // namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h b/src/concurrent/qtconcurrentfunctionwrappers.h index 59a29d4..abd316b 100644 --- a/src/concurrent/qtconcurrentfunctionwrappers.h +++ b/src/concurrent/qtconcurrentfunctionwrappers.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -43,14 +43,14 @@ #define QTCONCURRENT_FUNCTIONWRAPPERS_H #include +#include #ifndef QT_NO_CONCURRENT -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -293,10 +293,9 @@ struct MapResultType } // namespace QtPrivate. -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentiteratekernel.h b/src/concurrent/qtconcurrentiteratekernel.h index 5d899b5..70a7f16 100644 --- a/src/concurrent/qtconcurrentiteratekernel.h +++ b/src/concurrent/qtconcurrentiteratekernel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -52,11 +52,10 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -300,10 +299,9 @@ public: } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentmap.h b/src/concurrent/qtconcurrentmap.h index 3c2f0df..bc1c363 100644 --- a/src/concurrent/qtconcurrentmap.h +++ b/src/concurrent/qtconcurrentmap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -51,11 +51,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef qdoc +#ifdef Q_QDOC namespace QtConcurrent { @@ -309,10 +308,9 @@ typename QtPrivate::MapResultType::ResultType blockingMapp } // namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentmapkernel.h b/src/concurrent/qtconcurrentmapkernel.h index e6d7493..6817cd3 100644 --- a/src/concurrent/qtconcurrentmapkernel.h +++ b/src/concurrent/qtconcurrentmapkernel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,11 +49,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { // map kernel, works with both parallel-for and parallel-while @@ -81,7 +80,7 @@ public: runIteration(it, i, 0); advance(it, 1); } - + return false; } }; @@ -262,10 +261,9 @@ inline ThreadEngineStarter startMappedReduced(Iterator begin, Iterat } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentmedian.h b/src/concurrent/qtconcurrentmedian.h index 92bcae8..7d3b50a 100644 --- a/src/concurrent/qtconcurrentmedian.h +++ b/src/concurrent/qtconcurrentmedian.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,11 +49,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -119,10 +118,9 @@ private: } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentreducekernel.h b/src/concurrent/qtconcurrentreducekernel.h index 9bcc9005..dcf4b92 100644 --- a/src/concurrent/qtconcurrentreducekernel.h +++ b/src/concurrent/qtconcurrentreducekernel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,13 +54,12 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE namespace QtConcurrent { -#ifndef qdoc +#ifndef Q_QDOC /* The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants @@ -85,7 +84,7 @@ public: QVector vector; }; -#endif // qdoc +#endif // Q_QDOC enum ReduceOption { UnorderedReduce = 0x1, @@ -96,7 +95,7 @@ enum ReduceOption { Q_DECLARE_FLAGS(ReduceOptions, ReduceOption) Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions) -#ifndef qdoc +#ifndef Q_QDOC // supports both ordered and out-of-order reduction template @@ -140,7 +139,7 @@ class ReduceKernel public: ReduceKernel(ReduceOptions _reduceOptions) - : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), + : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), threadCount(QThreadPool::globalInstance()->maxThreadCount()) { } @@ -242,12 +241,11 @@ struct SequenceHolder2 : public Base } }; -#endif //qdoc +#endif //Q_QDOC } // namespace QtConcurrent QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentrun.h b/src/concurrent/qtconcurrentrun.h index 452c869..0bfe4bf 100644 --- a/src/concurrent/qtconcurrentrun.h +++ b/src/concurrent/qtconcurrentrun.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,11 +50,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifdef qdoc +#ifdef Q_QDOC namespace QtConcurrent { @@ -98,7 +97,7 @@ QFuture run(T (*functionPointer)(Param1, Param2, Param3, Param4, Param5), con return (new StoredFunctorCall5(functionPointer, arg1, arg2, arg3, arg4, arg5))->start(); } -#ifdef Q_COMPILER_DECLTYPE +#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION) template auto run(Functor functor) -> typename QtPrivate::QEnableIf::Value, QFuture >::Type @@ -337,10 +336,9 @@ QFuture run(const Class *object, T (Class::*fn)(Param1, Param2, Param3, Param } //namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentrunbase.h b/src/concurrent/qtconcurrentrunbase.h index 6c67338..bd24c42 100644 --- a/src/concurrent/qtconcurrentrunbase.h +++ b/src/concurrent/qtconcurrentrunbase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,11 +50,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -144,10 +143,9 @@ public: } //namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h b/src/concurrent/qtconcurrentstoredfunctioncall.h index ffddb30..8d49ab3 100644 --- a/src/concurrent/qtconcurrentstoredfunctioncall.h +++ b/src/concurrent/qtconcurrentstoredfunctioncall.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,11 +48,10 @@ #ifndef QT_NO_CONCURRENT #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { template @@ -1302,10 +1301,9 @@ private: } //namespace QtConcurrent -#endif // qdoc +#endif // Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index ee3f7e6..a3ee8ca 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,11 +54,10 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE -#ifndef qdoc +#ifndef Q_QDOC namespace QtConcurrent { @@ -270,10 +269,9 @@ inline ThreadEngineStarter startThreadEngine( } // namespace QtConcurrent -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_CONCURRENT From thiago.macieira at intel.com Wed Jun 26 22:49:38 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:38 -0700 Subject: [Development] Header diff for QtDBus In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <84c8a8$a0e9u7@orsmga001.jf.intel.com> diff --git a/src/dbus/qdbusabstractadaptor.h b/src/dbus/qdbusabstractadaptor.h index 6897339..2a32344 100644 --- a/src/dbus/qdbusabstractadaptor.h +++ b/src/dbus/qdbusabstractadaptor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,8 +70,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index e757013..8f014ce 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -53,8 +53,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -161,7 +159,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusargument.h b/src/dbus/qdbusargument.h index 9687f21..a3a6f99 100644 --- a/src/dbus/qdbusargument.h +++ b/src/dbus/qdbusargument.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -55,8 +55,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -397,10 +395,25 @@ inline QDBusArgument &operator<<(QDBusArgument &arg, const QVariantHash &map) return arg; } +template +inline QDBusArgument &operator<<(QDBusArgument &arg, const QPair &pair) +{ + arg.beginStructure(); + arg << pair.first << pair.second; + arg.endStructure(); + return arg; +} -QT_END_NAMESPACE +template +inline const QDBusArgument &operator>>(const QDBusArgument &arg, QPair &pair) +{ + arg.beginStructure(); + arg >> pair.first >> pair.second; + arg.endStructure(); + return arg; +} -QT_END_HEADER +QT_END_NAMESPACE #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnection.h b/src/dbus/qdbusconnection.h index b580006..20a579f 100644 --- a/src/dbus/qdbusconnection.h +++ b/src/dbus/qdbusconnection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -208,7 +206,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusConnection::VirtualObjectRegisterOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index a174c7e..b900d2a 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -49,8 +49,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,7 +123,5 @@ QT_END_NAMESPACE Q_DECLARE_BUILTIN_METATYPE(UInt, QMetaType::UInt, QDBusConnectionInterface::RegisterServiceReply) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuscontext.h b/src/dbus/qdbuscontext.h index 3ff1bbe..82dc778 100644 --- a/src/dbus/qdbuscontext.h +++ b/src/dbus/qdbuscontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuserror.h b/src/dbus/qdbuserror.h index 1bed785..2c4ec6c 100644 --- a/src/dbus/qdbuserror.h +++ b/src/dbus/qdbuserror.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - struct DBusError; QT_BEGIN_NAMESPACE @@ -129,7 +127,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusError) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusextratypes.h b/src/dbus/qdbusextratypes.h index 60ac5a6..ba99d45 100644 --- a/src/dbus/qdbusextratypes.h +++ b/src/dbus/qdbusextratypes.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -51,8 +51,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -177,7 +175,5 @@ Q_DECLARE_METATYPE(QDBusVariant) Q_DECLARE_METATYPE(QDBusObjectPath) Q_DECLARE_METATYPE(QDBusSignature) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index a252641..d2bb1da 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -75,7 +73,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmacros.h b/src/dbus/qdbusmacros.h index 9a947bd..5a95f53 100644 --- a/src/dbus/qdbusmacros.h +++ b/src/dbus/qdbusmacros.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -57,7 +57,6 @@ #include #endif -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_NO_DBUS @@ -75,6 +74,5 @@ QT_BEGIN_NAMESPACE #endif // QT_NO_DBUS QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/dbus/qdbusmessage.h b/src/dbus/qdbusmessage.h index 386078d..8f8954c 100644 --- a/src/dbus/qdbusmessage.h +++ b/src/dbus/qdbusmessage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -49,7 +49,9 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER +#if defined(Q_OS_WIN) && defined(interface) +# undef interface +#endif QT_BEGIN_NAMESPACE @@ -126,8 +128,6 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusMessage) -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusmetatype.h b/src/dbus/qdbusmetatype.h index 6db4ff2..bc556a0 100644 --- a/src/dbus/qdbusmetatype.h +++ b/src/dbus/qdbusmetatype.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,7 +74,7 @@ void qDBusDemarshallHelper(const QDBusArgument &arg, T *t) template int qDBusRegisterMetaType( -#ifndef qdoc +#ifndef Q_QDOC T * /* dummy */ = 0 #endif ) @@ -93,7 +91,5 @@ int qDBusRegisterMetaType( QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuspendingcall.h b/src/dbus/qdbuspendingcall.h index 4ef0931..19bc34c 100644 --- a/src/dbus/qdbuspendingcall.h +++ b/src/dbus/qdbuspendingcall.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -51,8 +51,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,7 +120,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbuspendingreply.h b/src/dbus/qdbuspendingreply.h index 47a8236..b7e459f 100644 --- a/src/dbus/qdbuspendingreply.h +++ b/src/dbus/qdbuspendingreply.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -49,8 +49,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -107,6 +105,10 @@ namespace QDBusPendingReplyTypes { static inline void fillMetaTypes(int *) { } }; + + struct TypeIsVoid {}; + template struct NotVoid { typedef T Type; }; + template <> struct NotVoid { typedef TypeIsVoid Type; }; } // namespace QDBusPendingReplyTypes template inline const typename Select::Type argumentAt() const { - // static assert? - Q_ASSERT_X(Index < count() && Index >= 0, "QDBusPendingReply::argumentAt", - "Index out of bounds"); + Q_STATIC_ASSERT_X(Index >= 0 && Index < Count, "Index out of bounds"); typedef typename Select::Type ResultType; return qdbus_cast(argumentAt(Index), 0); } @@ -180,7 +180,7 @@ public: return argumentAt<0>(); } - inline operator typename Select<0>::Type() const + inline operator typename QDBusPendingReplyTypes::NotVoid::Type() const { return argumentAt<0>(); } @@ -210,7 +210,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusreply.h b/src/dbus/qdbusreply.h index 1d06540..4567c80 100644 --- a/src/dbus/qdbusreply.h +++ b/src/dbus/qdbusreply.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -53,8 +53,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -71,7 +69,7 @@ public: } inline QDBusReply& operator=(const QDBusMessage &reply) { - QVariant data(qMetaTypeId(&m_data), reinterpret_cast(0)); + QVariant data(qMetaTypeId(), reinterpret_cast(0)); qDBusReplyFill(reply, m_error, data); m_data = qvariant_cast(data); return *this; @@ -113,6 +111,7 @@ public: inline bool isValid() const { return !m_error.isValid(); } inline const QDBusError& error() { return m_error; } + inline const QDBusError& error() const { return m_error; } inline Type value() const { @@ -184,6 +183,7 @@ public: inline bool isValid() const { return !m_error.isValid(); } inline const QDBusError& error() { return m_error; } + inline const QDBusError& error() const { return m_error; } private: QDBusError m_error; @@ -192,7 +192,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusserver.h b/src/dbus/qdbusserver.h index b444923..d455f8e 100644 --- a/src/dbus/qdbusserver.h +++ b/src/dbus/qdbusserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -78,7 +76,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif diff --git a/src/dbus/qdbusservicewatcher.h b/src/dbus/qdbusservicewatcher.h index 0e77f55..0988d82 100644 --- a/src/dbus/qdbusservicewatcher.h +++ b/src/dbus/qdbusservicewatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,7 +97,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDBusServiceWatcher::WatchMode) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif // QDBUSSERVICEWATCHER_H diff --git a/src/dbus/qdbusunixfiledescriptor.h b/src/dbus/qdbusunixfiledescriptor.h index 15d3414..e8746fe 100644 --- a/src/dbus/qdbusunixfiledescriptor.h +++ b/src/dbus/qdbusunixfiledescriptor.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of the QtDBus module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -52,8 +52,6 @@ # include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDBusUnixFileDescriptor) -QT_END_HEADER - #endif // QT_NO_DBUS #endif // QDBUSUNIXFILEDESCRIPTOR_H diff --git a/src/dbus/qdbusvirtualobject.h b/src/dbus/qdbusvirtualobject.h index 4c0bf7f..da63082 100644 --- a/src/dbus/qdbusvirtualobject.h +++ b/src/dbus/qdbusvirtualobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDBus module of the Qt Toolkit. @@ -48,8 +48,6 @@ #ifndef QT_NO_DBUS -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -74,7 +72,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DBUS #endif From thiago.macieira at intel.com Wed Jun 26 22:49:39 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:39 -0700 Subject: [Development] Header diff for QtDeclarative In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ogn22@AZSMGA002.ch.intel.com> diff --git a/src/declarative/debugger/qdeclarativedebug.h b/src/declarative/debugger/qdeclarativedebug.h index e5cf524..b425060 100644 --- a/src/declarative/debugger/qdeclarativedebug.h +++ b/src/declarative/debugger/qdeclarativedebug.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -62,6 +60,4 @@ static QDeclarativeDebuggingEnabler qmlEnableDebuggingHelper; QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEDEBUG_H diff --git a/src/declarative/graphicsitems/qdeclarativeitem.h b/src/declarative/graphicsitems/qdeclarativeitem.h index 447f8a3..47647d0 100644 --- a/src/declarative/graphicsitems/qdeclarativeitem.h +++ b/src/declarative/graphicsitems/qdeclarativeitem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -231,6 +229,4 @@ QML_DECLARE_TYPE(QGraphicsWidget) QML_DECLARE_TYPE(QAction) #endif -QT_END_HEADER - #endif // QDECLARATIVEITEM_H diff --git a/src/declarative/qml/qdeclarative.h b/src/declarative/qml/qdeclarative.h index 4f7dcb2..95cef93 100644 --- a/src/declarative/qml/qdeclarative.h +++ b/src/declarative/qml/qdeclarative.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -49,10 +49,9 @@ #include #include +#include #include -QT_BEGIN_HEADER - #define QML_DECLARE_TYPE(TYPE) \ Q_DECLARE_METATYPE(TYPE *) \ Q_DECLARE_METATYPE(QDeclarativeListProperty) @@ -390,13 +389,33 @@ int qmlRegisterCustomType(const char *uri, int versionMajor, int versionMinor, return QDeclarativePrivate::qmlregister(QDeclarativePrivate::TypeRegistration, &type); } +inline int qmlRegisterType(const QUrl &url, const char *uri, int versionMajor, int versionMinor, const char *qmlName) +{ + QDeclarativePrivate::RegisterComponent type = { + url, + uri, + qmlName, + versionMajor, + versionMinor + }; + + return QDeclarativePrivate::qmlregister(QDeclarativePrivate::ComponentRegistration, &type); +} + class QDeclarativeContext; class QDeclarativeEngine; -Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); -Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); -Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); -Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); -Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); + +namespace QtDeclarative { + // declared in namespace to avoid symbol conflicts with QtQml + Q_DECLARATIVE_EXPORT void qmlExecuteDeferred(QObject *); + Q_DECLARATIVE_EXPORT QDeclarativeContext *qmlContext(const QObject *); + Q_DECLARATIVE_EXPORT QDeclarativeEngine *qmlEngine(const QObject *); + Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, + bool create = true); + Q_DECLARATIVE_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, + const QMetaObject *, bool create); +} +using namespace QtDeclarative; template QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) @@ -410,6 +429,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) Q_DECLARE_METATYPE(QVariant) -QT_END_HEADER - #endif // QDECLARATIVE_H diff --git a/src/declarative/qml/qdeclarativecomponent.h b/src/declarative/qml/qdeclarativecomponent.h index fd0071d..b75da2a 100644 --- a/src/declarative/qml/qdeclarativecomponent.h +++ b/src/declarative/qml/qdeclarativecomponent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -127,6 +125,4 @@ Q_DECLARE_METATYPE(QDeclarativeComponent::Status) QML_DECLARE_TYPE(QDeclarativeComponent) QML_DECLARE_TYPEINFO(QDeclarativeComponent, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QDECLARATIVECOMPONENT_H diff --git a/src/declarative/qml/qdeclarativecontext.h b/src/declarative/qml/qdeclarativecontext.h index 8b553ad..9ed7145 100644 --- a/src/declarative/qml/qdeclarativecontext.h +++ b/src/declarative/qml/qdeclarativecontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -110,6 +108,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QList) -QT_END_HEADER - #endif // QDECLARATIVECONTEXT_H diff --git a/src/declarative/qml/qdeclarativeengine.h b/src/declarative/qml/qdeclarativeengine.h index 7e9770d..e0ec33e 100644 --- a/src/declarative/qml/qdeclarativeengine.h +++ b/src/declarative/qml/qdeclarativeengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -125,6 +123,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEENGINE_H diff --git a/src/declarative/qml/qdeclarativeerror.h b/src/declarative/qml/qdeclarativeerror.h index 7e86dfb..3967f50 100644 --- a/src/declarative/qml/qdeclarativeerror.h +++ b/src/declarative/qml/qdeclarativeerror.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -82,6 +80,4 @@ QDebug Q_DECLARATIVE_EXPORT operator<<(QDebug debug, const QDeclarativeError &er QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEERROR_H diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index 9ac770e..728a4ac 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -113,7 +111,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEEXPRESSION_H diff --git a/src/declarative/qml/qdeclarativeextensioninterface.h b/src/declarative/qml/qdeclarativeextensioninterface.h index 7eb2246..8e7f3f0 100644 --- a/src/declarative/qml/qdeclarativeextensioninterface.h +++ b/src/declarative/qml/qdeclarativeextensioninterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ Q_DECLARE_INTERFACE(QDeclarativeExtensionInterface, QDeclarativeExtensionInterfa QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEEXTENSIONINTERFACE_H diff --git a/src/declarative/qml/qdeclarativeextensionplugin.h b/src/declarative/qml/qdeclarativeextensionplugin.h index c1dbc4d..7ff9c78 100644 --- a/src/declarative/qml/qdeclarativeextensionplugin.h +++ b/src/declarative/qml/qdeclarativeextensionplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -71,6 +69,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEEXTENSIONPLUGIN_H diff --git a/src/declarative/qml/qdeclarativeimageprovider.h b/src/declarative/qml/qdeclarativeimageprovider.h index 263bad9..1b6cc33 100644 --- a/src/declarative/qml/qdeclarativeimageprovider.h +++ b/src/declarative/qml/qdeclarativeimageprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -76,6 +74,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEIMAGEPROVIDER diff --git a/src/declarative/qml/qdeclarativeinfo.h b/src/declarative/qml/qdeclarativeinfo.h index a6d2e96..2db5d96 100644 --- a/src/declarative/qml/qdeclarativeinfo.h +++ b/src/declarative/qml/qdeclarativeinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -46,12 +46,22 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QDeclarativeInfo; + +namespace QtDeclarative { + // declared in namespace to avoid symbol conflicts with QtQml + Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); + Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, + const QDeclarativeError &error); + Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, + const QList &errors); +} +using namespace QtDeclarative; + class QDeclarativeInfoPrivate; class Q_DECLARATIVE_EXPORT QDeclarativeInfo : public QDebug { @@ -85,20 +95,15 @@ public: #endif private: - friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); - friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); - friend Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList &errors); - + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me, + const QDeclarativeError &error); + friend Q_DECLARATIVE_EXPORT QDeclarativeInfo QtDeclarative::qmlInfo(const QObject *me, + const QList &errors); QDeclarativeInfo(QDeclarativeInfoPrivate *); QDeclarativeInfoPrivate *d; }; -Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me); -Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QDeclarativeError &error); -Q_DECLARATIVE_EXPORT QDeclarativeInfo qmlInfo(const QObject *me, const QList &errors); - QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEINFO_H diff --git a/src/declarative/qml/qdeclarativelist.h b/src/declarative/qml/qdeclarativelist.h index 3b1f9de..9b367dd 100644 --- a/src/declarative/qml/qdeclarativelist.h +++ b/src/declarative/qml/qdeclarativelist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -147,6 +145,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeListReference) -QT_END_HEADER - #endif // QDECLARATIVELIST_H diff --git a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h index 2caaa14..e791825 100644 --- a/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h +++ b/src/declarative/qml/qdeclarativenetworkaccessmanagerfactory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -62,6 +60,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVENETWORKACCESSMANAGERFACTORY_H diff --git a/src/declarative/qml/qdeclarativeparserstatus.h b/src/declarative/qml/qdeclarativeparserstatus.h index 03a2f4c..68a526f 100644 --- a/src/declarative/qml/qdeclarativeparserstatus.h +++ b/src/declarative/qml/qdeclarativeparserstatus.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -74,6 +72,4 @@ Q_DECLARE_INTERFACE(QDeclarativeParserStatus, QDeclarativeParserStatus_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPARSERSTATUS_H diff --git a/src/declarative/qml/qdeclarativeprivate.h b/src/declarative/qml/qdeclarativeprivate.h index db2b066..05a457c 100644 --- a/src/declarative/qml/qdeclarativeprivate.h +++ b/src/declarative/qml/qdeclarativeprivate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -56,8 +56,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -233,10 +231,19 @@ namespace QDeclarativePrivate AutoParentFunction function; }; + struct RegisterComponent { + const QUrl &url; + const char *uri; + const char *typeName; + int majorVersion; + int minorVersion; + }; + enum RegistrationType { TypeRegistration = 0, InterfaceRegistration = 1, - AutoParentRegistration = 2 + AutoParentRegistration = 2, + ComponentRegistration = 3 }; int Q_DECLARATIVE_EXPORT qmlregister(RegistrationType, void *); @@ -244,6 +251,4 @@ namespace QDeclarativePrivate QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPRIVATE_H diff --git a/src/declarative/qml/qdeclarativeproperty.h b/src/declarative/qml/qdeclarativeproperty.h index f22db18..a6ae48d 100644 --- a/src/declarative/qml/qdeclarativeproperty.h +++ b/src/declarative/qml/qdeclarativeproperty.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -139,6 +137,4 @@ inline uint qHash (const QDeclarativeProperty &key) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROPERTY_H diff --git a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h index 32674b4..f0a0a71 100644 --- a/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h +++ b/src/declarative/qml/qdeclarativepropertyvalueinterceptor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -67,6 +65,4 @@ Q_DECLARE_INTERFACE(QDeclarativePropertyValueInterceptor, QDeclarativePropertyVa QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROPERTYVALUEINTERCEPTOR_H diff --git a/src/declarative/qml/qdeclarativepropertyvaluesource.h b/src/declarative/qml/qdeclarativepropertyvaluesource.h index e4fa7d8..e072fbd 100644 --- a/src/declarative/qml/qdeclarativepropertyvaluesource.h +++ b/src/declarative/qml/qdeclarativepropertyvaluesource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -66,6 +64,4 @@ Q_DECLARE_INTERFACE(QDeclarativePropertyValueSource, QDeclarativePropertyValueSo QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEPROPERTYVALUESOURCE_H diff --git a/src/declarative/qml/qdeclarativescriptstring.h b/src/declarative/qml/qdeclarativescriptstring.h index f56d369..0bb5809 100644 --- a/src/declarative/qml/qdeclarativescriptstring.h +++ b/src/declarative/qml/qdeclarativescriptstring.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -82,7 +80,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QDeclarativeScriptString) -QT_END_HEADER - #endif // QDECLARATIVESCRIPTSTRING_H diff --git a/src/declarative/qtdeclarativeglobal.h b/src/declarative/qtdeclarativeglobal.h index 2bbcaff..e3237ba 100644 --- a/src/declarative/qtdeclarativeglobal.h +++ b/src/declarative/qtdeclarativeglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // This definition is in the process of being removed from qtbase - once it @@ -66,6 +64,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QTDECLARATIVEGLOBAL_H diff --git a/src/declarative/util/qdeclarativepropertymap.h b/src/declarative/util/qdeclarativepropertymap.h index fd5e3b1..aaf3829 100644 --- a/src/declarative/util/qdeclarativepropertymap.h +++ b/src/declarative/util/qdeclarativepropertymap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/declarative/util/qdeclarativeview.h b/src/declarative/util/qdeclarativeview.h index 33de22a..fd72b85 100644 --- a/src/declarative/util/qdeclarativeview.h +++ b/src/declarative/util/qdeclarativeview.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtDeclarative module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_MODULE(Declarative) @@ -114,6 +112,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDECLARATIVEVIEW_H From thiago.macieira at intel.com Wed Jun 26 22:49:47 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:47 -0700 Subject: [Development] Header diff for QtOpenGL In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <6c3329$andd3p@orsmga002.jf.intel.com> diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 1d21b42..72fe7b8 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -44,6 +44,7 @@ #ifndef QT_NO_OPENGL +#include #include #include #include @@ -52,34 +53,6 @@ #include -QT_BEGIN_HEADER - -#if defined(Q_OS_WIN) -# include -#endif - -#if defined(Q_OS_MAC) -# if !defined(Q_OS_IOS) -# include -# else -# if defined(QT_OPENGL_ES_2) -# include -# endif -# endif -#elif defined(QT_OPENGL_ES_2) -# include -# else -# include -# endif - -#if defined(QT_OPENGL_ES_2) -# ifndef GL_DOUBLE -# define GL_DOUBLE GL_FLOAT -# endif -# ifndef GLdouble -typedef GLfloat GLdouble; -# endif -#endif QT_BEGIN_NAMESPACE @@ -370,7 +343,6 @@ private: friend struct QGLGlyphTexture; friend class QGLContextGroup; friend class QGLPixmapBlurFilter; - friend class QGLExtensions; friend class QGLTexture; friend QGLFormat::OpenGLVersionFlags QGLFormat::openGLVersionFlags(); friend class QGLFramebufferObject; @@ -551,7 +523,5 @@ inline bool QGLFormat::sampleBuffers() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QGL_H diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h index b0294d0..2c26c7a 100644 --- a/src/opengl/qglbuffer.h +++ b/src/opengl/qglbuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,6 +124,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h index b4c04dc..ecca5aa 100644 --- a/src/opengl/qglcolormap.h +++ b/src/opengl/qglcolormap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,6 +98,4 @@ inline void QGLColormap::detach() QT_END_NAMESPACE -QT_END_HEADER - #endif // QGLCOLORMAP_H diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index 0fffd3c..9312a23 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -156,5 +154,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER #endif // QGLFRAMEBUFFEROBJECT_H diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 3d49b3e..fd867d7 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -2298,6 +2296,4 @@ inline void QGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLenum QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index f597a48..1a2297d 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -105,6 +103,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGLPIXELBUFFER_H diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 51c9139..93f11e18 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtOpenGL module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -304,6 +302,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/opengl/qtopenglglobal.h b/src/opengl/qtopenglglobal.h index 4657e19..bce3294 100644 --- a/src/opengl/qtopenglglobal.h +++ b/src/opengl/qtopenglglobal.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -60,6 +58,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOPENGLGLOBAL_H From thiago.macieira at intel.com Wed Jun 26 22:49:44 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:44 -0700 Subject: [Development] Header diff for QtMultimediaWidgets In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <453bf0$9k2eah@azsmga001.ch.intel.com> diff --git a/src/multimediawidgets/qcameraviewfinder.h b/src/multimediawidgets/qcameraviewfinder.h index 134ec41..4b3f7d08 100644 --- a/src/multimediawidgets/qcameraviewfinder.h +++ b/src/multimediawidgets/qcameraviewfinder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -53,8 +53,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERA_H diff --git a/src/multimediawidgets/qgraphicsvideoitem.h b/src/multimediawidgets/qgraphicsvideoitem.h index 6137846..6db81a5 100644 --- a/src/multimediawidgets/qgraphicsvideoitem.h +++ b/src/multimediawidgets/qgraphicsvideoitem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVideoSurfaceFormat; @@ -107,7 +105,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h b/src/multimediawidgets/qtmultimediawidgetdefs.h index b5da320..73b8b50 100644 --- a/src/multimediawidgets/qtmultimediawidgetdefs.h +++ b/src/multimediawidgets/qtmultimediawidgetdefs.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -55,7 +55,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -69,7 +68,6 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // QMULTIMEDIAWIDGETS_P_H diff --git a/src/multimediawidgets/qvideowidget.h b/src/multimediawidgets/qvideowidget.h index 8ffaffb..ec71bb6 100644 --- a/src/multimediawidgets/qvideowidget.h +++ b/src/multimediawidgets/qvideowidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -131,7 +129,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimediawidgets/qvideowidgetcontrol.h b/src/multimediawidgets/qvideowidgetcontrol.h index 8726210..b5c1306 100644 --- a/src/multimediawidgets/qvideowidgetcontrol.h +++ b/src/multimediawidgets/qvideowidgetcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, QVideoWidgetControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:49:42 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:42 -0700 Subject: [Development] Header diff for QtMultimedia In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ogn2b@AZSMGA002.ch.intel.com> diff --git a/src/multimedia/audio/qaudio.h b/src/multimedia/audio/qaudio.h index 1af692f..ae23ea5 100644 --- a/src/multimedia/audio/qaudio.h +++ b/src/multimedia/audio/qaudio.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE //QTM_SYNC_HEADER_EXPORT QAudio @@ -75,6 +73,4 @@ Q_DECLARE_METATYPE(QAudio::Error) Q_DECLARE_METATYPE(QAudio::State) Q_DECLARE_METATYPE(QAudio::Mode) -QT_END_HEADER - #endif // QAUDIO_H diff --git a/src/multimedia/audio/qaudiobuffer.h b/src/multimedia/audio/qaudiobuffer.h index 42fe7c6..5f61da4 100644 --- a/src/multimedia/audio/qaudiobuffer.h +++ b/src/multimedia/audio/qaudiobuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAbstractAudioBuffer; @@ -152,6 +150,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QAudioBuffer) -QT_END_HEADER - #endif // QAUDIOBUFFER_H diff --git a/src/multimedia/audio/qaudiodecoder.h b/src/multimedia/audio/qaudiodecoder.h index 099c895..4becf70 100644 --- a/src/multimedia/audio/qaudiodecoder.h +++ b/src/multimedia/audio/qaudiodecoder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAudioDecoderPrivate; @@ -142,6 +140,4 @@ Q_DECLARE_METATYPE(QAudioDecoder::Error) Q_MEDIA_ENUM_DEBUG(QAudioDecoder, State) Q_MEDIA_ENUM_DEBUG(QAudioDecoder, Error) -QT_END_HEADER - #endif // QAUDIODECODER_H diff --git a/src/multimedia/audio/qaudiodeviceinfo.h b/src/multimedia/audio/qaudiodeviceinfo.h index 41b37e8..6b80f1c 100644 --- a/src/multimedia/audio/qaudiodeviceinfo.h +++ b/src/multimedia/audio/qaudiodeviceinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -55,8 +55,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,6 +108,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QAudioDeviceInfo) -QT_END_HEADER - #endif // QAUDIODEVICEINFO_H diff --git a/src/multimedia/audio/qaudioformat.h b/src/multimedia/audio/qaudioformat.h index 90f8a1f..555c5f9 100644 --- a/src/multimedia/audio/qaudioformat.h +++ b/src/multimedia/audio/qaudioformat.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAudioFormatPrivate; @@ -117,6 +115,4 @@ Q_DECLARE_METATYPE(QAudioFormat) Q_DECLARE_METATYPE(QAudioFormat::SampleType) Q_DECLARE_METATYPE(QAudioFormat::Endian) -QT_END_HEADER - #endif // QAUDIOFORMAT_H diff --git a/src/multimedia/audio/qaudioinput.h b/src/multimedia/audio/qaudioinput.h index eab7979..7234edc 100644 --- a/src/multimedia/audio/qaudioinput.h +++ b/src/multimedia/audio/qaudioinput.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -53,8 +53,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,6 +108,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOINPUT_H diff --git a/src/multimedia/audio/qaudiooutput.h b/src/multimedia/audio/qaudiooutput.h index b4296e5..010192f 100644 --- a/src/multimedia/audio/qaudiooutput.h +++ b/src/multimedia/audio/qaudiooutput.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -53,8 +53,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,6 +111,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOOUTPUT_H diff --git a/src/multimedia/audio/qaudioprobe.h b/src/multimedia/audio/qaudioprobe.h index 7489449..fc181e9 100644 --- a/src/multimedia/audio/qaudioprobe.h +++ b/src/multimedia/audio/qaudioprobe.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMediaObject; @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOPROBE_H diff --git a/src/multimedia/audio/qaudiosystem.h b/src/multimedia/audio/qaudiosystem.h index 2cefeeb..e4636ad 100644 --- a/src/multimedia/audio/qaudiosystem.h +++ b/src/multimedia/audio/qaudiosystem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -140,6 +138,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOSYSTEM_H diff --git a/src/multimedia/audio/qaudiosystemplugin.h b/src/multimedia/audio/qaudiosystemplugin.h index 7a8a460..e01d168 100644 --- a/src/multimedia/audio/qaudiosystemplugin.h +++ b/src/multimedia/audio/qaudiosystemplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -53,8 +53,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -66,6 +64,7 @@ struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface virtual QAbstractAudioInput* createInput(const QByteArray& device) = 0; virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = 0; virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& device, QAudio::Mode mode) = 0; + virtual ~QAudioSystemFactoryInterface(); }; #define QAudioSystemFactoryInterface_iid \ @@ -92,6 +91,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOSYSTEMPLUGIN_H diff --git a/src/multimedia/audio/qsound.h b/src/multimedia/audio/qsound.h index cf799e5..e23c0ae 100644 --- a/src/multimedia/audio/qsound.h +++ b/src/multimedia/audio/qsound.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSoundEffect; @@ -57,7 +55,7 @@ class Q_MULTIMEDIA_EXPORT QSound : public QObject public: enum Loop { - Infinite = -1, + Infinite = -1 }; static void play(const QString& filename); @@ -85,7 +83,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSOUND_H diff --git a/src/multimedia/audio/qsoundeffect.h b/src/multimedia/audio/qsoundeffect.h index 7192d03..a6ac8b4 100644 --- a/src/multimedia/audio/qsoundeffect.h +++ b/src/multimedia/audio/qsoundeffect.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -132,7 +130,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSOUNDEFFECT_H diff --git a/src/multimedia/camera/qcamera.h b/src/multimedia/camera/qcamera.h index 7a6cf2e..6a29b2c 100644 --- a/src/multimedia/camera/qcamera.h +++ b/src/multimedia/camera/qcamera.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -58,8 +58,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -234,6 +232,4 @@ Q_MEDIA_ENUM_DEBUG(QCamera, LockType) Q_MEDIA_ENUM_DEBUG(QCamera, LockStatus) Q_MEDIA_ENUM_DEBUG(QCamera, LockChangeReason) -QT_END_HEADER - #endif // QCAMERA_H diff --git a/src/multimedia/camera/qcameraexposure.h b/src/multimedia/camera/qcameraexposure.h index 31be787..ba8e25c 100644 --- a/src/multimedia/camera/qcameraexposure.h +++ b/src/multimedia/camera/qcameraexposure.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -183,6 +181,4 @@ Q_MEDIA_ENUM_DEBUG(QCameraExposure, ExposureMode) Q_MEDIA_ENUM_DEBUG(QCameraExposure, FlashMode) Q_MEDIA_ENUM_DEBUG(QCameraExposure, MeteringMode) -QT_END_HEADER - #endif // QCAMERAEXPOSURE_H diff --git a/src/multimedia/camera/qcamerafocus.h b/src/multimedia/camera/qcamerafocus.h index 7f50170..675ae2e 100644 --- a/src/multimedia/camera/qcamerafocus.h +++ b/src/multimedia/camera/qcamerafocus.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -176,6 +174,4 @@ Q_DECLARE_METATYPE(QCameraFocus::FocusPointMode) Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusMode) Q_MEDIA_ENUM_DEBUG(QCameraFocus, FocusPointMode) -QT_END_HEADER - #endif // QCAMERAFOCUS_H diff --git a/src/multimedia/camera/qcameraimagecapture.h b/src/multimedia/camera/qcameraimagecapture.h index fafffcb..1ebcfec 100644 --- a/src/multimedia/camera/qcameraimagecapture.h +++ b/src/multimedia/camera/qcameraimagecapture.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSize; @@ -161,7 +159,5 @@ Q_DECLARE_METATYPE(QCameraImageCapture::CaptureDestinations) Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, Error) Q_MEDIA_ENUM_DEBUG(QCameraImageCapture, CaptureDestination) -QT_END_HEADER - #endif diff --git a/src/multimedia/camera/qcameraimageprocessing.h b/src/multimedia/camera/qcameraimageprocessing.h index ee3975d..ffb088f 100644 --- a/src/multimedia/camera/qcameraimageprocessing.h +++ b/src/multimedia/camera/qcameraimageprocessing.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -53,8 +53,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -116,6 +114,4 @@ Q_DECLARE_METATYPE(QCameraImageProcessing::WhiteBalanceMode) Q_MEDIA_ENUM_DEBUG(QCameraImageProcessing, WhiteBalanceMode) -QT_END_HEADER - #endif // QCAMERAIMAGEPROCESSING_H diff --git a/src/multimedia/controls/qaudiodecodercontrol.h b/src/multimedia/controls/qaudiodecodercontrol.h index 5b5a814..44154ca 100644 --- a/src/multimedia/controls/qaudiodecodercontrol.h +++ b/src/multimedia/controls/qaudiodecodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QIODevice; @@ -104,6 +102,4 @@ Q_MEDIA_DECLARE_CONTROL(QAudioDecoderControl, QAudioDecoderControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIODECODERCONTROL_H diff --git a/src/multimedia/controls/qaudioencodersettingscontrol.h b/src/multimedia/controls/qaudioencodersettingscontrol.h index 99e6e95..ba913f5 100644 --- a/src/multimedia/controls/qaudioencodersettingscontrol.h +++ b/src/multimedia/controls/qaudioencodersettingscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QStringList; @@ -85,7 +83,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioEncoderSettingsControl, QAudioEncoderSettingsContr QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOENCODERSETTINGSCONTROL_H diff --git a/src/multimedia/controls/qaudioinputselectorcontrol.h b/src/multimedia/controls/qaudioinputselectorcontrol.h index a147d2a..d75e723 100644 --- a/src/multimedia/controls/qaudioinputselectorcontrol.h +++ b/src/multimedia/controls/qaudioinputselectorcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioInputSelectorControl, QAudioInputSelectorControl_i QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOINPUTSELECTORCONTROL_H diff --git a/src/multimedia/controls/qaudiooutputselectorcontrol.h b/src/multimedia/controls/qaudiooutputselectorcontrol.h index 7462d9e..38e2d61 100644 --- a/src/multimedia/controls/qaudiooutputselectorcontrol.h +++ b/src/multimedia/controls/qaudiooutputselectorcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,5 @@ Q_MEDIA_DECLARE_CONTROL(QAudioOutputSelectorControl, QAudioOutputSelectorControl QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIOOUTPUTSELECTORCONTROL_H diff --git a/src/multimedia/controls/qcameracapturebufferformatcontrol.h b/src/multimedia/controls/qcameracapturebufferformatcontrol.h index 2cc3d03..3b0d1f2 100644 --- a/src/multimedia/controls/qcameracapturebufferformatcontrol.h +++ b/src/multimedia/controls/qcameracapturebufferformatcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -74,8 +72,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureBufferFormatControl, QCameraCaptureBufferF QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qcameracapturedestinationcontrol.h b/src/multimedia/controls/qcameracapturedestinationcontrol.h index a1bfbba..8f5d683 100644 --- a/src/multimedia/controls/qcameracapturedestinationcontrol.h +++ b/src/multimedia/controls/qcameracapturedestinationcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -74,8 +72,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraCaptureDestinationControl, QCameraCaptureDestinat QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qcameracontrol.h b/src/multimedia/controls/qcameracontrol.h index 41d44bb..3bd96fc 100644 --- a/src/multimedia/controls/qcameracontrol.h +++ b/src/multimedia/controls/qcameracontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -94,8 +92,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraControl, QCameraControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERACONTROL_H diff --git a/src/multimedia/controls/qcameraexposurecontrol.h b/src/multimedia/controls/qcameraexposurecontrol.h index 70b1946..2b6d226 100644 --- a/src/multimedia/controls/qcameraexposurecontrol.h +++ b/src/multimedia/controls/qcameraexposurecontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -103,8 +101,6 @@ Q_DECLARE_METATYPE(QCameraExposureControl::ExposureParameter) Q_MEDIA_ENUM_DEBUG(QCameraExposureControl, ExposureParameter) -QT_END_HEADER - #endif // QCAMERAEXPOSURECONTROL_H diff --git a/src/multimedia/controls/qcamerafeedbackcontrol.h b/src/multimedia/controls/qcamerafeedbackcontrol.h index c355c4c..2860a30 100644 --- a/src/multimedia/controls/qcamerafeedbackcontrol.h +++ b/src/multimedia/controls/qcamerafeedbackcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -96,7 +94,5 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFeedbackControl, QCameraFeedbackControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERAFEEDBACKCONTROL_H diff --git a/src/multimedia/controls/qcameraflashcontrol.h b/src/multimedia/controls/qcameraflashcontrol.h index 5fd19bc..c09c434 100644 --- a/src/multimedia/controls/qcameraflashcontrol.h +++ b/src/multimedia/controls/qcameraflashcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -80,8 +78,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFlashControl, QCameraFlashControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERAFLASHCONTROL_H diff --git a/src/multimedia/controls/qcamerafocuscontrol.h b/src/multimedia/controls/qcamerafocuscontrol.h index 362f75b..d06643e 100644 --- a/src/multimedia/controls/qcamerafocuscontrol.h +++ b/src/multimedia/controls/qcamerafocuscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -89,8 +87,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraFocusControl, QCameraFocusControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERAFOCUSCONTROL_H diff --git a/src/multimedia/controls/qcameraimagecapturecontrol.h b/src/multimedia/controls/qcameraimagecapturecontrol.h index c738c0a..f13bd2b 100644 --- a/src/multimedia/controls/qcameraimagecapturecontrol.h +++ b/src/multimedia/controls/qcameraimagecapturecontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QImage; @@ -92,8 +90,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraImageCaptureControl, QCameraImageCaptureControl_i QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERAIMAGECAPTURECONTROL_H diff --git a/src/multimedia/controls/qcameraimageprocessingcontrol.h b/src/multimedia/controls/qcameraimageprocessingcontrol.h index 9b5456a..befe7dc 100644 --- a/src/multimedia/controls/qcameraimageprocessingcontrol.h +++ b/src/multimedia/controls/qcameraimageprocessingcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -97,7 +95,5 @@ Q_DECLARE_METATYPE(QCameraImageProcessingControl::ProcessingParameter) Q_MEDIA_ENUM_DEBUG(QCameraImageProcessingControl, ProcessingParameter) -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qcameralockscontrol.h b/src/multimedia/controls/qcameralockscontrol.h index 89a72b9..33edeb0 100644 --- a/src/multimedia/controls/qcameralockscontrol.h +++ b/src/multimedia/controls/qcameralockscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -79,8 +77,6 @@ Q_MEDIA_DECLARE_CONTROL(QCameraLocksControl, QCameraLocksControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERALOCKSCONTROL_H diff --git a/src/multimedia/controls/qcameraviewfindersettingscontrol.h b/src/multimedia/controls/qcameraviewfindersettingscontrol.h index 31aa81b..8654d40 100644 --- a/src/multimedia/controls/qcameraviewfindersettingscontrol.h +++ b/src/multimedia/controls/qcameraviewfindersettingscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -81,6 +79,4 @@ Q_MEDIA_DECLARE_CONTROL(QCameraViewfinderSettingsControl, QCameraViewfinderSetti QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERAVIEWFINDERSETTINGSCONTROL_H diff --git a/src/multimedia/controls/qcamerazoomcontrol.h b/src/multimedia/controls/qcamerazoomcontrol.h index d143abc..56f7d39 100644 --- a/src/multimedia/controls/qcamerazoomcontrol.h +++ b/src/multimedia/controls/qcamerazoomcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -87,6 +85,4 @@ Q_MEDIA_DECLARE_CONTROL(QCameraZoomControl, QCameraZoomControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCAMERAZOOMCONTROL_H diff --git a/src/multimedia/controls/qimageencodercontrol.h b/src/multimedia/controls/qimageencodercontrol.h index b870499..1ed76fb 100644 --- a/src/multimedia/controls/qimageencodercontrol.h +++ b/src/multimedia/controls/qimageencodercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QByteArray; @@ -86,7 +84,5 @@ Q_MEDIA_DECLARE_CONTROL(QImageEncoderControl, QImageEncoderControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qmediaaudioprobecontrol.h b/src/multimedia/controls/qmediaaudioprobecontrol.h index de13af8..247c976 100644 --- a/src/multimedia/controls/qmediaaudioprobecontrol.h +++ b/src/multimedia/controls/qmediaaudioprobecontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAudioBuffer; @@ -68,7 +66,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaAudioProbeControl, QMediaAudioProbeControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAAUDIOPROBECONTROL_H diff --git a/src/multimedia/controls/qmediaavailabilitycontrol.h b/src/multimedia/controls/qmediaavailabilitycontrol.h index 781d173..a396de6 100644 --- a/src/multimedia/controls/qmediaavailabilitycontrol.h +++ b/src/multimedia/controls/qmediaavailabilitycontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -74,6 +72,4 @@ Q_MEDIA_DECLARE_CONTROL(QMediaAvailabilityControl, QMediaAvailabilityControl_iid QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAAVAILABILITYCONTROL_H diff --git a/src/multimedia/controls/qmediacontainercontrol.h b/src/multimedia/controls/qmediacontainercontrol.h index 7600811..4708cc1 100644 --- a/src/multimedia/controls/qmediacontainercontrol.h +++ b/src/multimedia/controls/qmediacontainercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -74,7 +72,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaContainerControl, QMediaContainerControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIACONTAINERCONTROL_H diff --git a/src/multimedia/controls/qmediagaplessplaybackcontrol.h b/src/multimedia/controls/qmediagaplessplaybackcontrol.h index 050edf9..577286d 100644 --- a/src/multimedia/controls/qmediagaplessplaybackcontrol.h +++ b/src/multimedia/controls/qmediagaplessplaybackcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -44,8 +44,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -78,6 +76,4 @@ Q_MEDIA_DECLARE_CONTROL(QMediaGaplessPlaybackControl, QMediaGaplessPlaybackContr QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAGAPLESSPLAYBACKCONTROL_H diff --git a/src/multimedia/controls/qmedianetworkaccesscontrol.h b/src/multimedia/controls/qmedianetworkaccesscontrol.h index fb5847d..23a28f1 100644 --- a/src/multimedia/controls/qmedianetworkaccesscontrol.h +++ b/src/multimedia/controls/qmedianetworkaccesscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -77,7 +75,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaNetworkAccessControl, QMediaNetworkAccessControl_i QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qmediaplayercontrol.h b/src/multimedia/controls/qmediaplayercontrol.h index 9c54ff2..aed5183 100644 --- a/src/multimedia/controls/qmediaplayercontrol.h +++ b/src/multimedia/controls/qmediaplayercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,8 +120,6 @@ Q_MEDIA_DECLARE_CONTROL(QMediaPlayerControl, QMediaPlayerControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAPLAYERCONTROL_H diff --git a/src/multimedia/controls/qmediarecordercontrol.h b/src/multimedia/controls/qmediarecordercontrol.h index e254390..3ed1617 100644 --- a/src/multimedia/controls/qmediarecordercontrol.h +++ b/src/multimedia/controls/qmediarecordercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUrl; @@ -100,7 +98,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaRecorderControl, QMediaRecorderControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qmediastreamscontrol.h b/src/multimedia/controls/qmediastreamscontrol.h index f7a92fe..4316d1a 100644 --- a/src/multimedia/controls/qmediastreamscontrol.h +++ b/src/multimedia/controls/qmediastreamscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -89,7 +87,5 @@ Q_DECLARE_METATYPE(QMediaStreamsControl::StreamType) Q_MEDIA_ENUM_DEBUG(QMediaStreamsControl, StreamType) -QT_END_HEADER - #endif // QMEDIASTREAMSCONTROL_H diff --git a/src/multimedia/controls/qmediavideoprobecontrol.h b/src/multimedia/controls/qmediavideoprobecontrol.h index 7764cc1..1435cdb 100644 --- a/src/multimedia/controls/qmediavideoprobecontrol.h +++ b/src/multimedia/controls/qmediavideoprobecontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVideoFrame; @@ -70,7 +68,5 @@ Q_MEDIA_DECLARE_CONTROL(QMediaVideoProbeControl, QMediaVideoProbeControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAVIDEOPROBECONTROL_H diff --git a/src/multimedia/controls/qmetadatareadercontrol.h b/src/multimedia/controls/qmetadatareadercontrol.h index 9399618..6e34b2d 100644 --- a/src/multimedia/controls/qmetadatareadercontrol.h +++ b/src/multimedia/controls/qmetadatareadercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -83,7 +81,5 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataReaderControl, QMetaDataReaderControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMETADATAPROVIDER_H diff --git a/src/multimedia/controls/qmetadatawritercontrol.h b/src/multimedia/controls/qmetadatawritercontrol.h index dcd62f2..1c25d89 100644 --- a/src/multimedia/controls/qmetadatawritercontrol.h +++ b/src/multimedia/controls/qmetadatawritercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -86,7 +84,5 @@ Q_MEDIA_DECLARE_CONTROL(QMetaDataWriterControl, QMetaDataWriterControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qradiodatacontrol.h b/src/multimedia/controls/qradiodatacontrol.h index 7d485a3..f28254b 100644 --- a/src/multimedia/controls/qradiodatacontrol.h +++ b/src/multimedia/controls/qradiodatacontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -88,7 +86,5 @@ Q_MEDIA_DECLARE_CONTROL(QRadioDataControl, QRadioDataControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QRADIODATACONTROL_H diff --git a/src/multimedia/controls/qradiotunercontrol.h b/src/multimedia/controls/qradiotunercontrol.h index 1bc24fc..1ec6061 100644 --- a/src/multimedia/controls/qradiotunercontrol.h +++ b/src/multimedia/controls/qradiotunercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -119,7 +117,5 @@ Q_MEDIA_DECLARE_CONTROL(QRadioTunerControl, QRadioTunerControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QRADIOTUNERCONTROL_H diff --git a/src/multimedia/controls/qvideodeviceselectorcontrol.h b/src/multimedia/controls/qvideodeviceselectorcontrol.h index c7ee9b5..2447cde 100644 --- a/src/multimedia/controls/qvideodeviceselectorcontrol.h +++ b/src/multimedia/controls/qvideodeviceselectorcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -83,6 +81,4 @@ Q_MEDIA_DECLARE_CONTROL(QVideoDeviceSelectorControl, QVideoDeviceSelectorControl QT_END_NAMESPACE -QT_END_HEADER - #endif // QVIDEODEVICESELECTORCONTROL_H diff --git a/src/multimedia/controls/qvideoencodersettingscontrol.h b/src/multimedia/controls/qvideoencodersettingscontrol.h index a7a6aa8..ea1ff12 100644 --- a/src/multimedia/controls/qvideoencodersettingscontrol.h +++ b/src/multimedia/controls/qvideoencodersettingscontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QByteArray; @@ -89,7 +87,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoEncoderSettingsControl, QVideoEncoderSettingsContr QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/controls/qvideorenderercontrol.h b/src/multimedia/controls/qvideorenderercontrol.h index 0d1a186..8f7ea33 100644 --- a/src/multimedia/controls/qvideorenderercontrol.h +++ b/src/multimedia/controls/qvideorenderercontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAbstractVideoSurface; @@ -68,7 +66,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoRendererControl, QVideoRendererControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QVIDEORENDERERCONTROL_H diff --git a/src/multimedia/controls/qvideowindowcontrol.h b/src/multimedia/controls/qvideowindowcontrol.h index 443417a..2a867e7 100644 --- a/src/multimedia/controls/qvideowindowcontrol.h +++ b/src/multimedia/controls/qvideowindowcontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -106,7 +104,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWindowControl, QVideoWindowControl_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/multimedia/playback/qmediacontent.h b/src/multimedia/playback/qmediacontent.h index 2e7a941..2c66264 100644 --- a/src/multimedia/playback/qmediacontent.h +++ b/src/multimedia/playback/qmediacontent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMediaPlaylist; @@ -90,6 +88,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QMediaContent) -QT_END_HEADER - #endif // QMEDIACONTENT_H diff --git a/src/multimedia/playback/qmediaplayer.h b/src/multimedia/playback/qmediaplayer.h index df75d61..3195ae0 100644 --- a/src/multimedia/playback/qmediaplayer.h +++ b/src/multimedia/playback/qmediaplayer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -226,6 +224,4 @@ Q_MEDIA_ENUM_DEBUG(QMediaPlayer, State) Q_MEDIA_ENUM_DEBUG(QMediaPlayer, MediaStatus) Q_MEDIA_ENUM_DEBUG(QMediaPlayer, Error) -QT_END_HEADER - #endif // QMEDIAPLAYER_H diff --git a/src/multimedia/playback/qmediaplaylist.h b/src/multimedia/playback/qmediaplaylist.h index 78bde5c..3cea6eb 100644 --- a/src/multimedia/playback/qmediaplaylist.h +++ b/src/multimedia/playback/qmediaplaylist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -148,6 +146,4 @@ Q_DECLARE_METATYPE(QMediaPlaylist::Error) Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, PlaybackMode) Q_MEDIA_ENUM_DEBUG(QMediaPlaylist, Error) -QT_END_HEADER - #endif // QMEDIAPLAYLIST_H diff --git a/src/multimedia/playback/qmediaresource.h b/src/multimedia/playback/qmediaresource.h index ff29d49..d271b91 100644 --- a/src/multimedia/playback/qmediaresource.h +++ b/src/multimedia/playback/qmediaresource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug @@ -128,6 +126,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QMediaResource) Q_DECLARE_METATYPE(QMediaResourceList) -QT_END_HEADER - #endif diff --git a/src/multimedia/qmediabindableinterface.h b/src/multimedia/qmediabindableinterface.h index d8c8566..4e4316e 100644 --- a/src/multimedia/qmediabindableinterface.h +++ b/src/multimedia/qmediabindableinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -69,7 +67,5 @@ Q_DECLARE_INTERFACE(QMediaBindableInterface, QMediaBindableInterface_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIABINDABLEINTERFACE_H diff --git a/src/multimedia/qmediacontrol.h b/src/multimedia/qmediacontrol.h index b014a14..a4b3c7d 100644 --- a/src/multimedia/qmediacontrol.h +++ b/src/multimedia/qmediacontrol.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,7 +77,5 @@ template const char *qmediacontrol_iid() { return 0; } QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTMEDIACONTROL_H diff --git a/src/multimedia/qmediaenumdebug.h b/src/multimedia/qmediaenumdebug.h index 9acf612..ee1c87f 100644 --- a/src/multimedia/qmediaenumdebug.h +++ b/src/multimedia/qmediaenumdebug.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -55,7 +55,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_NO_DEBUG_STREAM @@ -75,7 +74,6 @@ inline QDebug operator<<(QDebug dbg, Class::Enum value) \ #endif //QT_NO_DEBUG_STREAM QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/multimedia/qmediametadata.h b/src/multimedia/qmediametadata.h index 9939874..b1d7213 100644 --- a/src/multimedia/qmediametadata.h +++ b/src/multimedia/qmediametadata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Class forward declaration required for QDoc bug @@ -289,6 +287,4 @@ namespace QMediaMetaData { QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIAMETADATA_H diff --git a/src/multimedia/qmediaobject.h b/src/multimedia/qmediaobject.h index 3726af5..34189a2 100644 --- a/src/multimedia/qmediaobject.h +++ b/src/multimedia/qmediaobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,7 +108,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTMEDIAOBJECT_H diff --git a/src/multimedia/qmediaservice.h b/src/multimedia/qmediaservice.h index 91b8fcf..8230f49 100644 --- a/src/multimedia/qmediaservice.h +++ b/src/multimedia/qmediaservice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -88,8 +86,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTMEDIASERVICE_H diff --git a/src/multimedia/qmediaserviceproviderplugin.h b/src/multimedia/qmediaserviceproviderplugin.h index 870ee59..fa3b882 100644 --- a/src/multimedia/qmediaserviceproviderplugin.h +++ b/src/multimedia/qmediaserviceproviderplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -51,8 +51,6 @@ # pragma Q_MOC_EXPAND_MACROS #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE // Required for QDoc workaround @@ -112,6 +110,7 @@ struct Q_MULTIMEDIA_EXPORT QMediaServiceProviderFactoryInterface { virtual QMediaService* create(QString const& key) = 0; virtual void release(QMediaService *service) = 0; + virtual ~QMediaServiceProviderFactoryInterface(); }; #define QMediaServiceProviderFactoryInterface_iid \ @@ -226,6 +225,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIASERVICEPROVIDERPLUGIN_H diff --git a/src/multimedia/qmediatimerange.h b/src/multimedia/qmediatimerange.h index c0a6993..24b653d 100644 --- a/src/multimedia/qmediatimerange.h +++ b/src/multimedia/qmediatimerange.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -132,7 +130,5 @@ Q_MULTIMEDIA_EXPORT QDebug operator<<(QDebug, const QMediaTimeRange &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QMEDIATIMERANGE_H diff --git a/src/multimedia/qmultimedia.h b/src/multimedia/qmultimedia.h index c0dafe7..be4737a 100644 --- a/src/multimedia/qmultimedia.h +++ b/src/multimedia/qmultimedia.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -47,9 +47,6 @@ #include #include -#include - -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -97,7 +94,5 @@ Q_DECLARE_METATYPE(QMultimedia::SupportEstimate) Q_DECLARE_METATYPE(QMultimedia::EncodingMode) Q_DECLARE_METATYPE(QMultimedia::EncodingQuality) -QT_END_HEADER - #endif diff --git a/src/multimedia/qtmultimediadefs.h b/src/multimedia/qtmultimediadefs.h index 03d4c38..a82777c 100644 --- a/src/multimedia/qtmultimediadefs.h +++ b/src/multimedia/qtmultimediadefs.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -55,7 +55,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -69,8 +68,6 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER - #endif // QMULTIMEDIA_P_H diff --git a/src/multimedia/radio/qradiodata.h b/src/multimedia/radio/qradiodata.h index 92d08b9..1324ee0 100644 --- a/src/multimedia/radio/qradiodata.h +++ b/src/multimedia/radio/qradiodata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -135,6 +133,4 @@ Q_DECLARE_METATYPE(QRadioData::ProgramType) Q_MEDIA_ENUM_DEBUG(QRadioData, Error) Q_MEDIA_ENUM_DEBUG(QRadioData, ProgramType) -QT_END_HEADER - #endif // QRADIOPLAYER_H diff --git a/src/multimedia/radio/qradiotuner.h b/src/multimedia/radio/qradiotuner.h index de92e95..a2f6e9a 100644 --- a/src/multimedia/radio/qradiotuner.h +++ b/src/multimedia/radio/qradiotuner.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QRadioData; @@ -163,6 +161,4 @@ Q_MEDIA_ENUM_DEBUG(QRadioTuner, Error) Q_MEDIA_ENUM_DEBUG(QRadioTuner, StereoMode) Q_MEDIA_ENUM_DEBUG(QRadioTuner, SearchMode) -QT_END_HEADER - #endif // QRADIOPLAYER_H diff --git a/src/multimedia/recording/qaudiorecorder.h b/src/multimedia/recording/qaudiorecorder.h index cb1d0a7..d5ab75d 100644 --- a/src/multimedia/recording/qaudiorecorder.h +++ b/src/multimedia/recording/qaudiorecorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QString; @@ -89,6 +87,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAUDIORECORDER_H diff --git a/src/multimedia/recording/qmediaencodersettings.h b/src/multimedia/recording/qmediaencodersettings.h index 06ee921..f76c445 100644 --- a/src/multimedia/recording/qmediaencodersettings.h +++ b/src/multimedia/recording/qmediaencodersettings.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -180,7 +178,5 @@ Q_DECLARE_METATYPE(QAudioEncoderSettings) Q_DECLARE_METATYPE(QVideoEncoderSettings) Q_DECLARE_METATYPE(QImageEncoderSettings) -QT_END_HEADER - #endif diff --git a/src/multimedia/recording/qmediarecorder.h b/src/multimedia/recording/qmediarecorder.h index 7c019d7..9c7ef70 100644 --- a/src/multimedia/recording/qmediarecorder.h +++ b/src/multimedia/recording/qmediarecorder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUrl; @@ -224,6 +222,4 @@ Q_MEDIA_ENUM_DEBUG(QMediaRecorder, State) Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Status) Q_MEDIA_ENUM_DEBUG(QMediaRecorder, Error) -QT_END_HEADER - #endif // QMEDIARECORDER_H diff --git a/src/multimedia/video/qabstractvideobuffer.h b/src/multimedia/video/qabstractvideobuffer.h index b3b0644..1be90ff 100644 --- a/src/multimedia/video/qabstractvideobuffer.h +++ b/src/multimedia/video/qabstractvideobuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -112,6 +110,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QAbstractVideoBuffer::HandleType) Q_DECLARE_METATYPE(QAbstractVideoBuffer::MapMode) -QT_END_HEADER - #endif diff --git a/src/multimedia/video/qabstractvideosurface.h b/src/multimedia/video/qabstractvideosurface.h index bd634f6..be4520d 100644 --- a/src/multimedia/video/qabstractvideosurface.h +++ b/src/multimedia/video/qabstractvideosurface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QRectF; @@ -113,6 +111,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QAbstractVideoSurface*) Q_DECLARE_METATYPE(QAbstractVideoSurface::Error) -QT_END_HEADER - #endif diff --git a/src/multimedia/video/qvideoframe.h b/src/multimedia/video/qvideoframe.h index 84a048e..504a0d5 100644 --- a/src/multimedia/video/qvideoframe.h +++ b/src/multimedia/video/qvideoframe.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSize; @@ -177,7 +175,5 @@ Q_DECLARE_METATYPE(QVideoFrame) Q_DECLARE_METATYPE(QVideoFrame::FieldType) Q_DECLARE_METATYPE(QVideoFrame::PixelFormat) -QT_END_HEADER - #endif diff --git a/src/multimedia/video/qvideoprobe.h b/src/multimedia/video/qvideoprobe.h index e7718c6..8220a1f 100644 --- a/src/multimedia/video/qvideoprobe.h +++ b/src/multimedia/video/qvideoprobe.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMediaObject; @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QVIDEOPROBE_H diff --git a/src/multimedia/video/qvideosurfaceformat.h b/src/multimedia/video/qvideosurfaceformat.h index 617ecca..fe7b6d9 100644 --- a/src/multimedia/video/qvideosurfaceformat.h +++ b/src/multimedia/video/qvideosurfaceformat.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -143,7 +141,5 @@ Q_DECLARE_METATYPE(QVideoSurfaceFormat) Q_DECLARE_METATYPE(QVideoSurfaceFormat::Direction) Q_DECLARE_METATYPE(QVideoSurfaceFormat::YCbCrColorSpace) -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:49:45 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:45 -0700 Subject: [Development] Header diff for QtNetwork In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ogn2s@AZSMGA002.ch.intel.com> diff --git a/src/network/access/qabstractnetworkcache.h b/src/network/access/qabstractnetworkcache.h index 3851d1d..b9a086f 100644 --- a/src/network/access/qabstractnetworkcache.h +++ b/src/network/access/qabstractnetworkcache.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -141,6 +139,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/access/qhttpmultipart.h b/src/network/access/qhttpmultipart.h index 4d63942..71075ad 100644 --- a/src/network/access/qhttpmultipart.h +++ b/src/network/access/qhttpmultipart.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -119,6 +117,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QHTTPMULTIPART_H diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h index e544723..826c8e4 100644 --- a/src/network/access/qnetworkaccessmanager.h +++ b/src/network/access/qnetworkaccessmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -141,6 +139,7 @@ Q_SIGNALS: void authenticationRequired(QNetworkReply *reply, QAuthenticator *authenticator); void finished(QNetworkReply *reply); #ifndef QT_NO_SSL + void encrypted(QNetworkReply *reply); void sslErrors(QNetworkReply *reply, const QList &errors); #endif @@ -161,6 +160,7 @@ private: Q_DECLARE_PRIVATE(QNetworkAccessManager) Q_PRIVATE_SLOT(d_func(), void _q_replyFinished()) + Q_PRIVATE_SLOT(d_func(), void _q_replyEncrypted()) Q_PRIVATE_SLOT(d_func(), void _q_replySslErrors(QList)) #ifndef QT_NO_BEARERMANAGEMENT Q_PRIVATE_SLOT(d_func(), void _q_networkSessionClosed()) @@ -170,6 +170,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/access/qnetworkcookie.h b/src/network/access/qnetworkcookie.h index 50ff7f3..2a4e686 100644 --- a/src/network/access/qnetworkcookie.h +++ b/src/network/access/qnetworkcookie.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -121,6 +119,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkCookie) -QT_END_HEADER - #endif diff --git a/src/network/access/qnetworkcookiejar.h b/src/network/access/qnetworkcookiejar.h index b45adef..3c787c5 100644 --- a/src/network/access/qnetworkcookiejar.h +++ b/src/network/access/qnetworkcookiejar.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index 3fd919e..20a412c 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -91,6 +89,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QNETWORKDISKCACHE_H diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index 990fe62..a7db2d1 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -150,6 +148,7 @@ Q_SIGNALS: void finished(); void error(QNetworkReply::NetworkError); #ifndef QT_NO_SSL + void encrypted(); void sslErrors(const QList &errors); #endif @@ -182,6 +181,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkReply::NetworkError) -QT_END_HEADER - #endif diff --git a/src/network/access/qnetworkrequest.h b/src/network/access/qnetworkrequest.h index 78214c1..1512c6d 100644 --- a/src/network/access/qnetworkrequest.h +++ b/src/network/access/qnetworkrequest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -159,6 +157,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkRequest) -QT_END_HEADER - #endif diff --git a/src/network/bearer/qnetworkconfigmanager.h b/src/network/bearer/qnetworkconfigmanager.h index 350c119..62b93b1 100644 --- a/src/network/bearer/qnetworkconfigmanager.h +++ b/src/network/bearer/qnetworkconfigmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_BEARERMANAGEMENT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QNetworkConfigurationManagerPrivate; @@ -98,8 +96,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QNetworkConfigurationManager::Capabilities) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_BEARERMANAGEMENT #endif // QNETWORKCONFIGMANAGER_H diff --git a/src/network/bearer/qnetworkconfiguration.h b/src/network/bearer/qnetworkconfiguration.h index 19068ae..25dafcb 100644 --- a/src/network/bearer/qnetworkconfiguration.h +++ b/src/network/bearer/qnetworkconfiguration.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QNetworkConfigurationPrivate; @@ -130,6 +128,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkConfiguration) -QT_END_HEADER - #endif // QNETWORKCONFIGURATION_H diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index 2e30a50..1a76b23 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -54,8 +54,6 @@ #undef interface #endif -QT_BEGIN_HEADER - #include QT_BEGIN_NAMESPACE @@ -148,8 +146,6 @@ Q_DECLARE_METATYPE(QNetworkSession::State) Q_DECLARE_METATYPE(QNetworkSession::SessionError) Q_DECLARE_METATYPE(QNetworkSession::UsagePolicies) -QT_END_HEADER - #endif // QT_NO_BEARERMANAGEMENT #endif // QNETWORKSESSION_H diff --git a/src/network/kernel/qauthenticator.h b/src/network/kernel/qauthenticator.h index c7828c7..4d96104 100644 --- a/src/network/kernel/qauthenticator.h +++ b/src/network/kernel/qauthenticator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -64,7 +62,7 @@ public: bool operator==(const QAuthenticator &other) const; inline bool operator!=(const QAuthenticator &other) const { return !operator==(other); } - + QString user() const; void setUser(const QString &user); @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/kernel/qdnslookup.h b/src/network/kernel/qdnslookup.h index 5218c26..1df21d8 100644 --- a/src/network/kernel/qdnslookup.h +++ b/src/network/kernel/qdnslookup.h @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QHostAddress; @@ -248,6 +246,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDNSLOOKUP_H diff --git a/src/network/kernel/qhostaddress.h b/src/network/kernel/qhostaddress.h index d2472bb..77a2ec4 100644 --- a/src/network/kernel/qhostaddress.h +++ b/src/network/kernel/qhostaddress.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -49,8 +49,6 @@ struct sockaddr; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -142,5 +140,4 @@ Q_NETWORK_EXPORT QDataStream &operator>>(QDataStream &, QHostAddress &); QT_END_NAMESPACE -QT_END_HEADER #endif // QHOSTADDRESS_H diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index eb50557..38d55de 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QHostInfo) -QT_END_HEADER - #endif // QHOSTINFO_H diff --git a/src/network/kernel/qnetworkfunctions_wince.h b/src/network/kernel/qnetworkfunctions_wince.h index 09caab0..ccf1ed9 100644 --- a/src/network/kernel/qnetworkfunctions_wince.h +++ b/src/network/kernel/qnetworkfunctions_wince.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE DECLARE_HANDLE(SC_HANDLE); @@ -96,7 +94,5 @@ typedef LPENUM_SERVICE_STATUS_PROCESSA LPENUM_SERVICE_STATUS_PROCESS; QT_END_NAMESPACE -QT_END_HEADER - #endif // Q_OS_WINCE #endif // QNETWORKFUNCTIONS_WINCE_H diff --git a/src/network/kernel/qnetworkinterface.h b/src/network/kernel/qnetworkinterface.h index eaeb708..53d5d6e 100644 --- a/src/network/kernel/qnetworkinterface.h +++ b/src/network/kernel/qnetworkinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -48,8 +48,6 @@ #ifndef QT_NO_NETWORKINTERFACE -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,7 +98,7 @@ public: CanMulticast = 0x20 }; Q_DECLARE_FLAGS(InterfaceFlags, InterfaceFlag) - + QNetworkInterface(); QNetworkInterface(const QNetworkInterface &other); QNetworkInterface &operator=(const QNetworkInterface &other); @@ -137,8 +135,6 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QNetworkInterface &networ QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_NETWORKINTERFACE #endif diff --git a/src/network/kernel/qnetworkproxy.h b/src/network/kernel/qnetworkproxy.h index db0b5e3..153c840 100644 --- a/src/network/kernel/qnetworkproxy.h +++ b/src/network/kernel/qnetworkproxy.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -48,8 +48,6 @@ #ifndef QT_NO_NETWORKPROXY -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -220,8 +218,6 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QNetworkProxy) -QT_END_HEADER - #endif // QT_NO_NETWORKPROXY #endif // QHOSTINFO_H diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 9e1e4f8..46114ab 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -242,6 +240,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QAbstractSocket::SocketState) Q_DECLARE_METATYPE(QAbstractSocket::SocketError) -QT_END_HEADER - #endif // QABSTRACTSOCKET_H diff --git a/src/network/socket/qlocalserver.h b/src/network/socket/qlocalserver.h index 346d13c..b5791db 100644 --- a/src/network/socket/qlocalserver.h +++ b/src/network/socket/qlocalserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -109,7 +107,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLocalServer::SocketOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QLOCALSERVER_H diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index d59dc51..427dab1 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,9 +84,11 @@ public: QLocalSocket(QObject *parent = 0); ~QLocalSocket(); + void connectToServer(OpenMode openMode = ReadWrite); void connectToServer(const QString &name, OpenMode openMode = ReadWrite); void disconnectFromServer(); + void setServerName(const QString &name); QString serverName() const; QString fullServerName() const; @@ -97,6 +97,7 @@ public: virtual qint64 bytesAvailable() const; virtual qint64 bytesToWrite() const; virtual bool canReadLine() const; + virtual bool open(OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE; virtual void close(); LocalSocketError error() const; bool flush(); @@ -152,6 +153,4 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug, QLocalSocket::LocalSocketState); QT_END_NAMESPACE -QT_END_HEADER - #endif // QLOCALSOCKET_H diff --git a/src/network/socket/qtcpserver.h b/src/network/socket/qtcpserver.h index f83df73..8e25aa5 100644 --- a/src/network/socket/qtcpserver.h +++ b/src/network/socket/qtcpserver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -108,6 +106,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTCPSERVER_H diff --git a/src/network/socket/qtcpsocket.h b/src/network/socket/qtcpsocket.h index d11d98e..ed5ce4a 100644 --- a/src/network/socket/qtcpsocket.h +++ b/src/network/socket/qtcpsocket.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -69,6 +67,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTCPSOCKET_H diff --git a/src/network/socket/qudpsocket.h b/src/network/socket/qudpsocket.h index c35a9e7..da6306a 100644 --- a/src/network/socket/qudpsocket.h +++ b/src/network/socket/qudpsocket.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -90,6 +88,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QUDPSOCKET_H diff --git a/src/network/ssl/qssl.h b/src/network/ssl/qssl.h index 0aaedb9..06d8096 100644 --- a/src/network/ssl/qssl.h +++ b/src/network/ssl/qssl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSsl::SslOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSSL_H diff --git a/src/network/ssl/qsslcertificate.h b/src/network/ssl/qsslcertificate.h index 6863fb9..988071e 100644 --- a/src/network/ssl/qsslcertificate.h +++ b/src/network/ssl/qsslcertificate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -43,6 +43,10 @@ #ifndef QSSLCERTIFICATE_H #define QSSLCERTIFICATE_H +#ifdef verify +#undef verify +#endif + #include #include #include @@ -52,8 +56,6 @@ #include #include -QT_BEGIN_HEADER - #ifndef QT_NO_SSL QT_BEGIN_NAMESPACE @@ -160,6 +162,4 @@ Q_DECLARE_METATYPE(QSslCertificate) #endif // QT_NO_SSL -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslcertificateextension.h b/src/network/ssl/qsslcertificateextension.h index ce7ff54..080b1cc 100644 --- a/src/network/ssl/qsslcertificateextension.h +++ b/src/network/ssl/qsslcertificateextension.h @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -85,8 +83,6 @@ Q_DECLARE_SHARED(QSslCertificateExtension) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSSLCERTIFICATEEXTENSION_H diff --git a/src/network/ssl/qsslcipher.h b/src/network/ssl/qsslcipher.h index 50f019d..e351d79 100644 --- a/src/network/ssl/qsslcipher.h +++ b/src/network/ssl/qsslcipher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,5 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslCipher &cipher); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslconfiguration.h b/src/network/ssl/qsslconfiguration.h index b685ed9..0000382 100644 --- a/src/network/ssl/qsslconfiguration.h +++ b/src/network/ssl/qsslconfiguration.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -41,10 +41,10 @@ /**************************************************************************** ** -** In addition, as a special exception, Nokia gives permission to link -** the code of its release of Qt with the OpenSSL project's "OpenSSL" library -** (or modified versions of the "OpenSSL" library that use the same license -** as the original version), and distribute the linked executables. +** In addition, as a special exception, the copyright holders listed above give +** permission to link the code of its release of Qt with the OpenSSL project's +** "OpenSSL" library (or modified versions of the "OpenSSL" library that use the +** same license as the original version), and distribute the linked executables. ** ** You must comply with the GNU General Public License version 2 in all ** respects for all of the code used other than the "OpenSSL" code. If you @@ -61,8 +61,6 @@ #include #include -QT_BEGIN_HEADER - #ifndef QT_NO_SSL QT_BEGIN_NAMESPACE @@ -101,6 +99,9 @@ public: void setPeerVerifyDepth(int depth); // Certificate & cipher configuration + QList localCertificateChain() const; + void setLocalCertificateChain(const QList &localChain); + QSslCertificate localCertificate() const; void setLocalCertificate(const QSslCertificate &certificate); @@ -129,6 +130,8 @@ public: private: friend class QSslSocket; friend class QSslConfigurationPrivate; + friend class QSslSocketBackendPrivate; + friend class QSslContext; QSslConfiguration(QSslConfigurationPrivate *dd); QSharedDataPointer d; }; @@ -141,6 +144,4 @@ Q_DECLARE_METATYPE(QSslConfiguration) #endif // QT_NO_SSL -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslerror.h b/src/network/ssl/qsslerror.h index a222e2c..73549ce 100644 --- a/src/network/ssl/qsslerror.h +++ b/src/network/ssl/qsslerror.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,7 +104,7 @@ public: SslError error() const; QString errorString() const; QSslCertificate certificate() const; - + private: QScopedPointer d; }; @@ -122,6 +120,8 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslError::SslError &erro QT_END_NAMESPACE -QT_END_HEADER +#ifndef QT_NO_SSL +Q_DECLARE_METATYPE(QList) +#endif #endif diff --git a/src/network/ssl/qsslkey.h b/src/network/ssl/qsslkey.h index 983a03d..145d4a2 100644 --- a/src/network/ssl/qsslkey.h +++ b/src/network/ssl/qsslkey.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,6 +108,4 @@ Q_NETWORK_EXPORT QDebug operator<<(QDebug debug, const QSslKey &key); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 306fb63..d89933e 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtNetwork module of the Qt Toolkit. @@ -50,8 +50,6 @@ # include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -133,6 +131,9 @@ public: void setSslConfiguration(const QSslConfiguration &config); // Certificate & cipher accessors. + void setLocalCertificateChain(const QList &localChain); + QList localCertificateChain() const; + void setLocalCertificate(const QSslCertificate &certificate); void setLocalCertificate(const QString &fileName, QSsl::EncodingFormat format = QSsl::Pem); QSslCertificate localCertificate() const; @@ -223,10 +224,4 @@ private: QT_END_NAMESPACE -#ifndef QT_NO_SSL -Q_DECLARE_METATYPE(QList) -#endif - -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:50:07 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:07 -0700 Subject: [Development] Header diff for QtQuick In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ogn9r@AZSMGA002.ch.intel.com> diff --git a/src/quick/designer/designersupport.h b/src/quick/designer/designersupport.h index b0dbe18..5139a65 100644 --- a/src/quick/designer/designersupport.h +++ b/src/quick/designer/designersupport.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -59,8 +59,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -127,6 +125,7 @@ public: static QQuickItem *anchorCenterInTargetItem(QQuickItem *item); static QPair anchorLineTarget(QQuickItem *item, const QString &name, QQmlContext *context); static void resetAnchor(QQuickItem *item, const QString &name); + static void emitComponentCompleteSignalForAttachedProperty(QQuickItem *item); static QList statesForItem(QQuickItem *item); @@ -147,6 +146,9 @@ public: static void activateDesignerWindowManager(); static void activateDesignerMode(); + static void disableComponentComplete(); + static void enableComponentComplete(); + static void createOpenGLContext(QQuickWindow *window); static void polishItems(QQuickWindow *window); @@ -157,6 +159,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // DESIGNERSUPPORT_H diff --git a/src/quick/items/qquickitem.h b/src/quick/items/qquickitem.h index bba26be..d7256f3 100644 --- a/src/quick/items/qquickitem.h +++ b/src/quick/items/qquickitem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -134,6 +132,7 @@ class Q_QUICK_EXPORT QQuickItem : public QObject, public QQmlParserStatus Q_PROPERTY(bool focus READ hasFocus WRITE setFocus NOTIFY focusChanged FINAL) Q_PROPERTY(bool activeFocus READ hasActiveFocus NOTIFY activeFocusChanged FINAL) + Q_PROPERTY(bool activeFocusOnTab READ activeFocusOnTab WRITE setActiveFocusOnTab NOTIFY activeFocusOnTabChanged FINAL REVISION 1) Q_PROPERTY(qreal rotation READ rotation WRITE setRotation NOTIFY rotationChanged) Q_PROPERTY(qreal scale READ scale WRITE setScale NOTIFY scaleChanged) @@ -263,6 +262,9 @@ public: bool smooth() const; void setSmooth(bool); + bool activeFocusOnTab() const; + void setActiveFocusOnTab(bool); + bool antialiasing() const; void setAntialiasing(bool); @@ -276,6 +278,7 @@ public: bool hasActiveFocus() const; bool hasFocus() const; void setFocus(bool); + void setFocus(bool focus, Qt::FocusReason reason); bool isFocusScope() const; QQuickItem *scopedFocusItem() const; @@ -320,6 +323,8 @@ public: Q_INVOKABLE void mapFromItem(QQmlV8Function*) const; Q_INVOKABLE void mapToItem(QQmlV8Function*) const; Q_INVOKABLE void forceActiveFocus(); + Q_INVOKABLE void forceActiveFocus(Qt::FocusReason reason); + Q_REVISION(1) Q_INVOKABLE QQuickItem *nextItemInFocusChain(bool forward = true); Q_INVOKABLE QQuickItem *childAt(qreal x, qreal y) const; #ifndef QT_NO_IM @@ -345,11 +350,13 @@ Q_SIGNALS: void stateChanged(const QString &); void focusChanged(bool); void activeFocusChanged(bool); + Q_REVISION(1) void activeFocusOnTabChanged(bool); void parentChanged(QQuickItem *); void transformOriginChanged(TransformOrigin); void smoothChanged(bool); void antialiasingChanged(bool); void clipChanged(bool); + Q_REVISION(1) void windowChanged(QQuickWindow* window); // XXX todo void childrenChanged(); @@ -398,7 +405,9 @@ protected: virtual void mouseDoubleClickEvent(QMouseEvent *event); virtual void mouseUngrabEvent(); // XXX todo - params? virtual void touchUngrabEvent(); +#ifndef QT_NO_WHEELEVENT virtual void wheelEvent(QWheelEvent *event); +#endif virtual void touchEvent(QTouchEvent *event); virtual void hoverEnterEvent(QHoverEvent *event); virtual void hoverMoveEvent(QHoverEvent *event); @@ -423,6 +432,8 @@ protected: QQuickItem(QQuickItemPrivate &dd, QQuickItem *parent = 0); private: + Q_PRIVATE_SLOT(d_func(), void _q_resourceObjectDeleted(QObject *)) + friend class QQuickWindow; friend class QQuickWindowPrivate; friend class QSGRenderer; @@ -444,6 +455,4 @@ QT_END_NAMESPACE QML_DECLARE_TYPE(QQuickItem) QML_DECLARE_TYPE(QQuickTransform) -QT_END_HEADER - #endif // QQUICKITEM_H diff --git a/src/quick/items/qquickpainteditem.h b/src/quick/items/qquickpainteditem.h index 625ef6d..8892400 100644 --- a/src/quick/items/qquickpainteditem.h +++ b/src/quick/items/qquickpainteditem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickPaintedItemPrivate; @@ -125,6 +123,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QQuickPaintedItem::PerformanceHints) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKPAINTEDITEM_P_H diff --git a/src/quick/items/qquickview.h b/src/quick/items/qquickview.h index 4a885bc..3e8883d 100644 --- a/src/quick/items/qquickview.h +++ b/src/quick/items/qquickview.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQmlEngine; @@ -115,6 +113,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKVIEW_H diff --git a/src/quick/items/qquickwindow.h b/src/quick/items/qquickwindow.h index 7f9af82..a0bc832 100644 --- a/src/quick/items/qquickwindow.h +++ b/src/quick/items/qquickwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QQuickItem; @@ -59,6 +57,7 @@ class QQuickWindowPrivate; class QOpenGLFramebufferObject; class QQmlIncubationController; class QInputMethodEvent; +class QQuickCloseEvent; class Q_QUICK_EXPORT QQuickWindow : public QWindow { @@ -66,6 +65,7 @@ class Q_QUICK_EXPORT QQuickWindow : public QWindow Q_PRIVATE_PROPERTY(QQuickWindow::d_func(), QQmlListProperty data READ data DESIGNABLE false) Q_PROPERTY(QColor color READ color WRITE setColor NOTIFY colorChanged) Q_PROPERTY(QQuickItem* contentItem READ contentItem CONSTANT FINAL) + Q_PROPERTY(QQuickItem* activeFocusItem READ activeFocusItem NOTIFY activeFocusItemChanged REVISION 1) Q_CLASSINFO("DefaultProperty", "data") Q_DECLARE_PRIVATE(QQuickWindow) public: @@ -115,6 +115,9 @@ public: void setColor(const QColor &color); QColor color() const; + static bool hasDefaultAlphaBuffer(); + static void setDefaultAlphaBuffer(bool useAlpha); + void setPersistentOpenGLContext(bool persistent); bool isPersistentOpenGLContext() const; @@ -130,7 +133,9 @@ Q_SIGNALS: void beforeSynchronizing(); void beforeRendering(); void afterRendering(); + Q_REVISION(1) void closing(QQuickCloseEvent *close); void colorChanged(const QColor &); + Q_REVISION(1) void activeFocusItemChanged(); public Q_SLOTS: void update(); @@ -144,6 +149,7 @@ protected: virtual void showEvent(QShowEvent *); virtual void hideEvent(QHideEvent *); + // TODO Qt 6: reimplement QWindow::closeEvent to emit closing virtual void focusInEvent(QFocusEvent *); virtual void focusOutEvent(QFocusEvent *); @@ -162,6 +168,7 @@ protected: private Q_SLOTS: void maybeUpdate(); void cleanupSceneGraph(); + void setTransientParent_helper(QQuickWindow *window); private: friend class QQuickItem; @@ -173,7 +180,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQuickWindow *) -QT_END_HEADER - #endif // QQUICKWINDOW_H diff --git a/src/quick/qtquickglobal.h b/src/quick/qtquickglobal.h index bd482a8..4cbeb4a 100644 --- a/src/quick/qtquickglobal.h +++ b/src/quick/qtquickglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif // QTQUICKGLOBAL_H diff --git a/src/quick/scenegraph/coreapi/qsggeometry.h b/src/quick/scenegraph/coreapi/qsggeometry.h index 523b323..78ad03e 100644 --- a/src/quick/scenegraph/coreapi/qsggeometry.h +++ b/src/quick/scenegraph/coreapi/qsggeometry.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the Qt scene graph research project. @@ -44,9 +44,7 @@ #include #include -#include - -QT_BEGIN_HEADER +#include QT_BEGIN_NAMESPACE @@ -295,6 +293,4 @@ int QSGGeometry::sizeOfIndex() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGGEOMETRY_H diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index 97ac2cc..20ab21a 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -39,13 +39,11 @@ ** ****************************************************************************/ -#ifndef MATERIAL_H -#define MATERIAL_H +#ifndef QSGMATERIAL_H +#define QSGMATERIAL_H #include -#include - -QT_BEGIN_HEADER +#include QT_BEGIN_NAMESPACE @@ -71,9 +69,11 @@ public: float opacity() const; QMatrix4x4 combinedMatrix() const; QMatrix4x4 modelViewMatrix() const; + QMatrix4x4 projectionMatrix() const; QRect viewportRect() const; QRect deviceRect() const; float determinant() const; + float devicePixelRatio() const; QOpenGLContext *context() const; @@ -133,6 +133,7 @@ public: void setFlag(Flags flags, bool on = true); private: + friend class QSGContext; Flags m_flags; void *m_reserved; Q_DISABLE_COPY(QSGMaterial) @@ -143,6 +144,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGMaterialShader::RenderState::DirtyStates) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/coreapi/qsgnode.h b/src/quick/scenegraph/coreapi/qsgnode.h index 6d57dc9..3fa2f7f 100644 --- a/src/quick/scenegraph/coreapi/qsgnode.h +++ b/src/quick/scenegraph/coreapi/qsgnode.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -39,16 +39,14 @@ ** ****************************************************************************/ -#ifndef NODE_H -#define NODE_H +#ifndef QSGNODE_H +#define QSGNODE_H #include #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE //#define QML_RUNTIME_TESTING @@ -335,6 +333,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSGNode::Flags) QT_END_NAMESPACE -QT_END_HEADER - -#endif // NODE_H +#endif // QSGNODE_H diff --git a/src/quick/scenegraph/util/qsgflatcolormaterial.h b/src/quick/scenegraph/util/qsgflatcolormaterial.h index b02bb63..12a37f2 100644 --- a/src/quick/scenegraph/util/qsgflatcolormaterial.h +++ b/src/quick/scenegraph/util/qsgflatcolormaterial.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -39,13 +39,11 @@ ** ****************************************************************************/ -#ifndef FLATCOLORMATERIAL_H -#define FLATCOLORMATERIAL_H +#ifndef QSGFLATCOLORMATERIAL_H +#define QSGFLATCOLORMATERIAL_H #include -#include - -QT_BEGIN_HEADER +#include QT_BEGIN_NAMESPACE @@ -67,6 +65,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // FLATCOLORMATERIAL_H diff --git a/src/quick/scenegraph/util/qsgsimplematerial.h b/src/quick/scenegraph/util/qsgsimplematerial.h index e8390de..a1e5aa2 100644 --- a/src/quick/scenegraph/util/qsgsimplematerial.h +++ b/src/quick/scenegraph/util/qsgsimplematerial.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE template @@ -142,8 +140,8 @@ class QSGSimpleMaterial : public QSGMaterial { public: #ifndef qdoc - QSGSimpleMaterial(const State &state, PtrShaderCreateFunc func) - : m_state(state) + QSGSimpleMaterial(const State &aState, PtrShaderCreateFunc func) + : m_state(aState) , m_func(func) { } @@ -215,7 +213,5 @@ Q_INLINE_TEMPLATE void QSGSimpleMaterialShader::updateState(const RenderS QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgsimplerectnode.h b/src/quick/scenegraph/util/qsgsimplerectnode.h index 38eb6a8..bed2d98 100644 --- a/src/quick/scenegraph/util/qsgsimplerectnode.h +++ b/src/quick/scenegraph/util/qsgsimplerectnode.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -39,14 +39,12 @@ ** ****************************************************************************/ -#ifndef SOLIDRECTNODE_H -#define SOLIDRECTNODE_H +#ifndef QSGSIMPLERECTNODE_H +#define QSGSIMPLERECTNODE_H #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGSimpleRectNode : public QSGGeometryNode @@ -70,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // SOLIDRECTNODE_H diff --git a/src/quick/scenegraph/util/qsgsimpletexturenode.h b/src/quick/scenegraph/util/qsgsimpletexturenode.h index cf5744b..ffd1021 100644 --- a/src/quick/scenegraph/util/qsgsimpletexturenode.h +++ b/src/quick/scenegraph/util/qsgsimpletexturenode.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGSimpleTextureNode : public QSGGeometryNode @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSGSIMPLETEXTURENODE_H diff --git a/src/quick/scenegraph/util/qsgtexture.h b/src/quick/scenegraph/util/qsgtexture.h index 01fde8a..299ffc2 100644 --- a/src/quick/scenegraph/util/qsgtexture.h +++ b/src/quick/scenegraph/util/qsgtexture.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -43,10 +43,8 @@ #define QSGTEXTURE_H #include -#include -#include - -QT_BEGIN_HEADER +#include +#include QT_BEGIN_NAMESPACE @@ -127,6 +125,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgtexturematerial.h b/src/quick/scenegraph/util/qsgtexturematerial.h index 451fbd2..b842779 100644 --- a/src/quick/scenegraph/util/qsgtexturematerial.h +++ b/src/quick/scenegraph/util/qsgtexturematerial.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -39,14 +39,12 @@ ** ****************************************************************************/ -#ifndef TEXTUREMATERIAL_H -#define TEXTUREMATERIAL_H +#ifndef QSGTEXTUREMATERIAL_H +#define QSGTEXTUREMATERIAL_H #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGOpaqueTextureMaterial : public QSGMaterial @@ -61,10 +59,10 @@ public: void setTexture(QSGTexture *texture); QSGTexture *texture() const { return m_texture; } - void setMipmapFiltering(QSGTexture::Filtering filtering) { m_mipmap_filtering = filtering; } + void setMipmapFiltering(QSGTexture::Filtering filteringType) { m_mipmap_filtering = filteringType; } QSGTexture::Filtering mipmapFiltering() const { return (QSGTexture::Filtering) m_mipmap_filtering; } - void setFiltering(QSGTexture::Filtering filtering) { m_filtering = filtering; } + void setFiltering(QSGTexture::Filtering filteringType) { m_filtering = filteringType; } QSGTexture::Filtering filtering() const { return (QSGTexture::Filtering) m_filtering; } void setHorizontalWrapMode(QSGTexture::WrapMode mode) { m_horizontal_wrap = mode; } @@ -94,6 +92,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - -#endif // TEXTUREMATERIAL_H +#endif diff --git a/src/quick/scenegraph/util/qsgtextureprovider.h b/src/quick/scenegraph/util/qsgtextureprovider.h index b2c6305..608b3c6 100644 --- a/src/quick/scenegraph/util/qsgtextureprovider.h +++ b/src/quick/scenegraph/util/qsgtextureprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGTextureProvider : public QObject @@ -61,6 +59,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/quick/scenegraph/util/qsgvertexcolormaterial.h b/src/quick/scenegraph/util/qsgvertexcolormaterial.h index f40ed1f..81da065 100644 --- a/src/quick/scenegraph/util/qsgvertexcolormaterial.h +++ b/src/quick/scenegraph/util/qsgvertexcolormaterial.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -39,13 +39,11 @@ ** ****************************************************************************/ -#ifndef VERTEXCOLORMATERIAL_H -#define VERTEXCOLORMATERIAL_H +#ifndef QSGVERTEXCOLORMATERIAL_H +#define QSGVERTEXCOLORMATERIAL_H #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_QUICK_EXPORT QSGVertexColorMaterial : public QSGMaterial @@ -62,6 +60,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // VERTEXCOLORMATERIAL_H diff --git a/src/quick/util/qquickimageprovider.h b/src/quick/util/qquickimageprovider.h index 28888ec..2735c9a 100644 --- a/src/quick/util/qquickimageprovider.h +++ b/src/quick/util/qquickimageprovider.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUICKIMAGEPROVIDER_H From thiago.macieira at intel.com Wed Jun 26 22:50:08 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:08 -0700 Subject: [Development] Header diff for QtQuickTest In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <453bf0$9k2ef3@azsmga001.ch.intel.com> diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h index a71a7f7..d6ffcf8 100644 --- a/src/qmltest/quicktest.h +++ b/src/qmltest/quicktest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, const char *sourceDir); @@ -82,6 +80,4 @@ Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char *name, QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h index 9943156..32461fd 100644 --- a/src/qmltest/quicktestglobal.h +++ b/src/qmltest/quicktestglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER #endif From thiago.macieira at intel.com Wed Jun 26 22:50:12 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:12 -0700 Subject: [Development] Header diff for QtSql In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ognbq@AZSMGA002.ch.intel.com> diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h index 782733f..9b9381f 100644 --- a/src/sql/kernel/qsql.h +++ b/src/sql/kernel/qsql.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -97,6 +95,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QSql::ParamType) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQL_H diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 85457fb..7249e22 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -146,6 +144,4 @@ Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlDatabase &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLDATABASE_H diff --git a/src/sql/kernel/qsqldriver.h b/src/sql/kernel/qsqldriver.h index f017670..017ffd4 100644 --- a/src/sql/kernel/qsqldriver.h +++ b/src/sql/kernel/qsqldriver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -128,6 +126,7 @@ Q_SIGNALS: void notification(const QString &name, QSqlDriver::NotificationSource source, const QVariant &payload); protected: + QSqlDriver(QSqlDriverPrivate &dd, QObject *parent = 0); virtual void setOpen(bool o); virtual void setOpenError(bool e); virtual void setLastError(const QSqlError& e); @@ -139,6 +138,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLDRIVER_H diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h index 7c06edb..ca2e0f2 100644 --- a/src/sql/kernel/qsqldriverplugin.h +++ b/src/sql/kernel/qsqldriverplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -68,6 +66,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLDRIVERPLUGIN_H diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 1ee4d9b..39c4cda 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -71,16 +69,19 @@ public: ~QSqlError(); QString driverText() const; - void setDriverText(const QString& driverText); QString databaseText() const; - void setDatabaseText(const QString& databaseText); ErrorType type() const; - void setType(ErrorType type); int number() const; - void setNumber(int number); QString text() const; bool isValid() const; +#if QT_DEPRECATED_SINCE(5, 1) + QT_DEPRECATED void setDriverText(const QString &driverText); + QT_DEPRECATED void setDatabaseText(const QString &databaseText); + QT_DEPRECATED void setType(ErrorType type); + QT_DEPRECATED void setNumber(int number); +#endif + private: QString driverError; QString databaseError; @@ -94,6 +95,4 @@ Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlError &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLERROR_H diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h index 1bef673..a642721 100644 --- a/src/sql/kernel/qsqlfield.h +++ b/src/sql/kernel/qsqlfield.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,6 +108,4 @@ Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlField &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLFIELD_H diff --git a/src/sql/kernel/qsqlindex.h b/src/sql/kernel/qsqlindex.h index 588a6c6..96c2f61 100644 --- a/src/sql/kernel/qsqlindex.h +++ b/src/sql/kernel/qsqlindex.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -78,6 +76,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLINDEX_H diff --git a/src/sql/kernel/qsqlquery.h b/src/sql/kernel/qsqlquery.h index 9d660e0..3719643 100644 --- a/src/sql/kernel/qsqlquery.h +++ b/src/sql/kernel/qsqlquery.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,6 +120,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLQUERY_H diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h index b9226c5..7799b96 100644 --- a/src/sql/kernel/qsqlrecord.h +++ b/src/sql/kernel/qsqlrecord.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,6 +95,7 @@ public: void clear(); void clearValues(); int count() const; + QSqlRecord keyValues(const QSqlRecord &keyFields) const; private: void detach(); @@ -109,6 +108,4 @@ Q_SQL_EXPORT QDebug operator<<(QDebug, const QSqlRecord &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLRECORD_H diff --git a/src/sql/kernel/qsqlresult.h b/src/sql/kernel/qsqlresult.h index 5037ce1..05f3d7f 100644 --- a/src/sql/kernel/qsqlresult.h +++ b/src/sql/kernel/qsqlresult.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,9 +59,9 @@ class QSqlResultPrivate; class Q_SQL_EXPORT QSqlResult { + Q_DECLARE_PRIVATE(QSqlResult) friend class QSqlQuery; friend class QSqlTableModelPrivate; - friend class QSqlResultPrivate; public: virtual ~QSqlResult(); @@ -76,6 +74,7 @@ protected: }; explicit QSqlResult(const QSqlDriver * db); + QSqlResult(QSqlResultPrivate &dd, const QSqlDriver *db); int at() const; QString lastQuery() const; QSqlError lastError() const; @@ -134,8 +133,7 @@ protected: virtual bool nextResult(); void resetBindCount(); // HACK -private: - QSqlResultPrivate* d; + QSqlResultPrivate *d_ptr; private: Q_DISABLE_COPY(QSqlResult) @@ -143,6 +141,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLRESULT_H diff --git a/src/sql/models/qsqlquerymodel.h b/src/sql/models/qsqlquerymodel.h index 84d51d5..c00d905 100644 --- a/src/sql/models/qsqlquerymodel.h +++ b/src/sql/models/qsqlquerymodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,6 +111,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLQUERYMODEL_H diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index 52a19db..b878280 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,8 +108,6 @@ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_WIDGETS_LIB #endif // QSQLRELATIONALDELEGATE_H diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index f82fbce..0ccfecd 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -112,6 +110,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLRELATIONALTABLEMODEL_H diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index df1946f..1a4ce9b 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSql module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -136,10 +134,9 @@ protected: void setPrimaryKey(const QSqlIndex &key); void setQuery(const QSqlQuery &query); QModelIndex indexInQuery(const QModelIndex &item) const; + QSqlRecord primaryValues(int row) const; }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QSQLTABLEMODEL_H From thiago.macieira at intel.com Wed Jun 26 22:49:36 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:36 -0700 Subject: [Development] Header diff for QtCore In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ogn1q@AZSMGA002.ch.intel.com> diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 3ae7485..f1aa6c0 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -177,6 +175,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTANIMATION_H diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h index e370fdf..cf32f84 100644 --- a/src/corelib/animation/qanimationgroup.h +++ b/src/corelib/animation/qanimationgroup.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -82,6 +80,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif //QANIMATIONGROUP_H diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h index 95521da..31810cf 100644 --- a/src/corelib/animation/qparallelanimationgroup.h +++ b/src/corelib/animation/qparallelanimationgroup.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,6 +78,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPARALLELANIMATIONGROUP diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h index d37388f..5c77001 100644 --- a/src/corelib/animation/qpauseanimation.h +++ b/src/corelib/animation/qpauseanimation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -78,6 +76,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAUSEANIMATION_H diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index 3ced349c..f6b92cb 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -83,6 +81,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPROPERTYANIMATION_H diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index f2f1268..51b4227 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -90,6 +88,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif //QSEQUENTIALANIMATIONGROUP_H diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index 7df8859..83018c3 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -124,6 +122,4 @@ void qRegisterAnimationInterpolator(QVariant (*func)(const T &from, const T &to, QT_END_NAMESPACE -QT_END_HEADER - #endif //QVARIANTANIMATION_H diff --git a/src/corelib/arch/qatomic_alpha.h b/src/corelib/arch/qatomic_alpha.h index a2857d1..71cb112 100644 --- a/src/corelib/arch/qatomic_alpha.h +++ b/src/corelib/arch/qatomic_alpha.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,10 +44,17 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() @@ -517,6 +524,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_ALPHA_H diff --git a/src/corelib/arch/qatomic_armv5.h b/src/corelib/arch/qatomic_armv5.h index b5ec00d..e0a50b3 100644 --- a/src/corelib/arch/qatomic_armv5.h +++ b/src/corelib/arch/qatomic_armv5.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2011 Thiago Macieira ** Contact: http://www.qt-project.org/legal ** @@ -45,15 +45,12 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -167,12 +164,20 @@ __asm T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL template<> template inline T QBasicAtomicOps<4>::fetchAndStoreRelaxed(T &_q_value, T newValue) Q_DECL_NOTHROW { +#if defined(__thumb__) + register T originalValue; + do { + originalValue = _q_value; + } while (_q_cmpxchg(originalValue, newValue, &_q_value) != 0); + return originalValue; +#else T originalValue; asm volatile("swp %0,%2,[%3]" : "=&r"(originalValue), "=m" (_q_value) : "r"(newValue), "r"(&_q_value) : "cc", "memory"); return originalValue; +#endif } #endif // Q_CC_RVCT @@ -190,6 +195,4 @@ T QBasicAtomicOps<4>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveTy QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_ARMV5_H diff --git a/src/corelib/arch/qatomic_armv6.h b/src/corelib/arch/qatomic_armv6.h index 7c96600..7f5939e 100644 --- a/src/corelib/arch/qatomic_armv6.h +++ b/src/corelib/arch/qatomic_armv6.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2011 Thiago Macieira ** Contact: http://www.qt-project.org/legal ** @@ -45,15 +45,12 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -729,6 +726,4 @@ void QBasicAtomicOps::orderedMemoryFence(const T &) Q_DECL_NOTHROW QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_ARMV6_H diff --git a/src/corelib/arch/qatomic_armv7.h b/src/corelib/arch/qatomic_armv7.h index e28a1fc..1929ae0 100644 --- a/src/corelib/arch/qatomic_armv7.h +++ b/src/corelib/arch/qatomic_armv7.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,11 +54,12 @@ #if 0 // silence syncqt warnings -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing #endif #endif // QATOMIC_ARMV7_H diff --git a/src/corelib/arch/qatomic_bfin.h b/src/corelib/arch/qatomic_bfin.h index e09528c..7951930 100644 --- a/src/corelib/arch/qatomic_bfin.h +++ b/src/corelib/arch/qatomic_bfin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,10 +44,17 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() @@ -340,6 +347,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddRelease(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_BFIN_H diff --git a/src/corelib/arch/qatomic_bootstrap.h b/src/corelib/arch/qatomic_bootstrap.h index 3a6b6a9..160e0ab 100644 --- a/src/corelib/arch/qatomic_bootstrap.h +++ b/src/corelib/arch/qatomic_bootstrap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2011 Thiago Macieira ** Contact: http://www.qt-project.org/legal ** @@ -45,15 +45,12 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -98,6 +95,4 @@ template struct QAtomicOps: QGenericAtomicOps > QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_BOOTSTRAP_H diff --git a/src/corelib/arch/qatomic_cxx11.h b/src/corelib/arch/qatomic_cxx11.h index f7a7ba4..3119eda 100644 --- a/src/corelib/arch/qatomic_cxx11.h +++ b/src/corelib/arch/qatomic_cxx11.h @@ -45,14 +45,12 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -247,6 +245,5 @@ template struct QAtomicOps #endif QT_END_NAMESPACE -QT_END_HEADER #endif // QATOMIC_CXX0X_H diff --git a/src/corelib/arch/qatomic_gcc.h b/src/corelib/arch/qatomic_gcc.h index 0940ed0..bd29605 100644 --- a/src/corelib/arch/qatomic_gcc.h +++ b/src/corelib/arch/qatomic_gcc.h @@ -44,14 +44,12 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -132,6 +130,4 @@ template struct QAtomicOps: QGenericAtomicOps > }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_GCC_H diff --git a/src/corelib/arch/qatomic_ia64.h b/src/corelib/arch/qatomic_ia64.h index e06588a..ed72036 100644 --- a/src/corelib/arch/qatomic_ia64.h +++ b/src/corelib/arch/qatomic_ia64.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2011 Thiago Macieira ** Contact: http://www.qt-project.org/legal ** @@ -45,15 +45,12 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -222,28 +219,28 @@ inline int QBasicAtomicInt::fetchAndStoreAcquire(int newValue) inline bool QBasicAtomicInt::testAndSetRelaxed(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast(_InterlockedCompareExchange(&_q_value, - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast(_InterlockedCompareExchange(&_q_value, + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetAcquire(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast(_InterlockedCompareExchange_acq(reinterpret_cast(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast(_InterlockedCompareExchange_acq(reinterpret_cast(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline bool QBasicAtomicInt::testAndSetRelease(int expectedValue, int newValue) { register int expectedValueCopy = expectedValue; - return (static_cast(_InterlockedCompareExchange_rel(reinterpret_cast(&_q_value), - newValue, - expectedValueCopy)) - == expectedValue); + return (static_cast(_InterlockedCompareExchange_rel(reinterpret_cast(&_q_value), + newValue, + expectedValueCopy)) + == expectedValue); } inline int QBasicAtomicInt::fetchAndAddAcquire(int valueToAdd) @@ -289,10 +286,10 @@ template Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetRelaxed(T *expectedValue, T *newValue) { register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchangePointer(reinterpret_cast(&_q_value), - newValue, - expectedValueCopy) - == expectedValue); + return (_InterlockedCompareExchangePointer(reinterpret_cast(&_q_value), + newValue, + expectedValueCopy) + == expectedValue); } template @@ -304,7 +301,7 @@ Q_INLINE_TEMPLATE bool QBasicAtomicPointer::testAndSetAcquire(T *expectedValu }; x = &_q_value; register T *expectedValueCopy = expectedValue; - return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) + return (_InterlockedCompareExchange64_acq(p, quintptr(newValue), quintptr(expectedValueCopy)) == quintptr(expectedValue)); } @@ -1089,6 +1086,4 @@ T QBasicAtomicOps::fetchAndAddOrdered(T &_q_value, typename QAtomicAdditiv QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_IA64_H diff --git a/src/corelib/arch/qatomic_integrity.h b/src/corelib/arch/qatomic_integrity.h index d041f44..f8cfc8c 100644 --- a/src/corelib/arch/qatomic_integrity.h +++ b/src/corelib/arch/qatomic_integrity.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,10 +45,17 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define qt_i2addr(a) reinterpret_cast
(const_cast(a)) #define qt_p2addr(a) reinterpret_cast
(const_cast(a)) #define qt_addr(a) reinterpret_cast
(a) @@ -284,7 +291,5 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddRelease(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_INTEGRITY_H diff --git a/src/corelib/arch/qatomic_mips.h b/src/corelib/arch/qatomic_mips.h index 2e65334..7716750 100644 --- a/src/corelib/arch/qatomic_mips.h +++ b/src/corelib/arch/qatomic_mips.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2011 Thiago Macieira ** Contact: http://www.qt-project.org/legal ** @@ -45,15 +45,12 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -362,6 +359,4 @@ T QBasicAtomicOps<8>::fetchAndAddRelaxed(T &_q_value, typename QAtomicAdditiveTy QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_MIPS_H diff --git a/src/corelib/arch/qatomic_msvc.h b/src/corelib/arch/qatomic_msvc.h index bd653fc..4f91e3d 100644 --- a/src/corelib/arch/qatomic_msvc.h +++ b/src/corelib/arch/qatomic_msvc.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -214,14 +214,12 @@ extern "C" { //////////////////////////////////////////////////////////////////////////////////////////////////// -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -383,6 +381,4 @@ inline T *QAtomicOps::fetchAndAddRelaxed(T *&_q_value, qptrdiff valueToAdd) #undef QT_INTERLOCKED_EXCHANGE_ADD_POINTER QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_MSVC_H diff --git a/src/corelib/arch/qatomic_power.h b/src/corelib/arch/qatomic_power.h index 67291c7..ad1c619 100644 --- a/src/corelib/arch/qatomic_power.h +++ b/src/corelib/arch/qatomic_power.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,10 +44,17 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() @@ -511,6 +518,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddOrdered(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_POWER_H diff --git a/src/corelib/arch/qatomic_s390.h b/src/corelib/arch/qatomic_s390.h index 4f4570c..0469f44 100644 --- a/src/corelib/arch/qatomic_s390.h +++ b/src/corelib/arch/qatomic_s390.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,10 +44,17 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() @@ -423,6 +430,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddRelease(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_S390_H diff --git a/src/corelib/arch/qatomic_sh4a.h b/src/corelib/arch/qatomic_sh4a.h index 127cd1d..08f75e4 100644 --- a/src/corelib/arch/qatomic_sh4a.h +++ b/src/corelib/arch/qatomic_sh4a.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,14 +44,15 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE diff --git a/src/corelib/arch/qatomic_sparc.h b/src/corelib/arch/qatomic_sparc.h index dca8122..8aea33c 100644 --- a/src/corelib/arch/qatomic_sparc.h +++ b/src/corelib/arch/qatomic_sparc.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,10 +44,17 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #if defined(_LP64) #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_ALWAYS_NATIVE @@ -522,6 +529,4 @@ Q_INLINE_TEMPLATE T *QBasicAtomicPointer::fetchAndAddRelease(qptrdiff valueTo QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_SPARC_H diff --git a/src/corelib/arch/qatomic_unix.h b/src/corelib/arch/qatomic_unix.h index 2f9cc18..03c7d2e 100644 --- a/src/corelib/arch/qatomic_unix.h +++ b/src/corelib/arch/qatomic_unix.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,14 +44,12 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -112,6 +110,4 @@ struct QAtomicOps : QGenericAtomicOps > }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_UNIX_H diff --git a/src/corelib/arch/qatomic_vxworks.h b/src/corelib/arch/qatomic_vxworks.h index 22e4731..57e3b6a 100644 --- a/src/corelib/arch/qatomic_vxworks.h +++ b/src/corelib/arch/qatomic_vxworks.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the qmake spec of the Qt Toolkit. @@ -42,8 +42,6 @@ #ifndef QATOMIC_VXWORKS_H #define QATOMIC_VXWORKS_H -QT_BEGIN_HEADER - #if defined(__ppc) # include #else // generic implementation with taskLock() @@ -56,14 +54,28 @@ QT_BEGIN_HEADER # include # include #else +#if defined(_WRS_KERNEL) extern "C" int taskLock(); extern "C" int taskUnlock(); +#else +inline int taskLock() { return 0; } +inline int taskUnlock() { return 0; } +#endif #endif QT_BEGIN_NAMESPACE +#if 0 +// silence syncqt warnings +QT_END_NAMESPACE +QT_END_HEADER + +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NOT_NATIVE inline bool QBasicAtomicInt::isReferenceCountingNative() @@ -315,6 +327,4 @@ QT_END_NAMESPACE #endif // generic implementation with taskLock() -QT_END_HEADER - #endif // QATOMIC_VXWORKS_H diff --git a/src/corelib/arch/qatomic_x86.h b/src/corelib/arch/qatomic_x86.h index 5cef44b..f8180ad 100644 --- a/src/corelib/arch/qatomic_x86.h +++ b/src/corelib/arch/qatomic_x86.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2011 Thiago Macieira ** Contact: http://www.qt-project.org/legal ** @@ -45,15 +45,12 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -423,6 +420,4 @@ template <> struct QBasicAtomicOps<8>: QGenericAtomicOps > QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_X86_H diff --git a/src/corelib/codecs/qtextcodec.h b/src/corelib/codecs/qtextcodec.h index f34fd19..35ff83a 100644 --- a/src/corelib/codecs/qtextcodec.h +++ b/src/corelib/codecs/qtextcodec.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -166,6 +164,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTCODEC_H diff --git a/src/corelib/global/qcompilerdetection.h b/src/corelib/global/qcompilerdetection.h index 7fae3d9..b685c1f 100644 --- a/src/corelib/global/qcompilerdetection.h +++ b/src/corelib/global/qcompilerdetection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2012 Intel Corporation ** Contact: http://www.qt-project.org/legal ** @@ -94,8 +94,8 @@ # define Q_FUNC_INFO __FUNCSIG__ # define Q_ALIGNOF(type) __alignof(type) # define Q_DECL_ALIGN(n) __declspec(align(n)) -# define Q_ASSUME(expr) __assume(expr) -# define Q_UNREACHABLE() __assume(0) +# define Q_ASSUME_IMPL(expr) __assume(expr) +# define Q_UNREACHABLE_IMPL() __assume(0) # define Q_NORETURN __declspec(noreturn) # define Q_DECL_DEPRECATED __declspec(deprecated) # define Q_DECL_EXPORT __declspec(dllexport) @@ -150,18 +150,22 @@ # if defined(__INTEL_COMPILER) /* Intel C++ also masquerades as GCC */ # define Q_CC_INTEL -# define Q_ASSUME(expr) __assume(expr) -# define Q_UNREACHABLE() __assume(0) +# define Q_ASSUME_IMPL(expr) __assume(expr) +# define Q_UNREACHABLE_IMPL() __assume(0) # elif defined(__clang__) /* Clang also masquerades as GCC */ # define Q_CC_CLANG -# define Q_ASSUME(expr) if (expr){} else __builtin_unreachable() -# define Q_UNREACHABLE() __builtin_unreachable() +# define Q_ASSUME_IMPL(expr) if (expr){} else __builtin_unreachable() +# define Q_UNREACHABLE_IMPL() __builtin_unreachable() +# if !defined(__has_extension) +# /* Compatibility with older Clang versions */ +# define __has_extension __has_feature +# endif # else /* Plain GCC */ # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 405 -# define Q_ASSUME(expr) if (expr){} else __builtin_unreachable() -# define Q_UNREACHABLE() __builtin_unreachable() +# define Q_ASSUME_IMPL(expr) if (expr){} else __builtin_unreachable() +# define Q_UNREACHABLE_IMPL() __builtin_unreachable() # endif # endif @@ -179,6 +183,7 @@ # define Q_TYPEOF(expr) __typeof__(expr) # define Q_DECL_DEPRECATED __attribute__ ((__deprecated__)) # define Q_DECL_ALIGN(n) __attribute__((__aligned__(n))) +# define Q_DECL_UNUSED __attribute__((__unused__)) # define Q_LIKELY(expr) __builtin_expect(!!(expr), true) # define Q_UNLIKELY(expr) __builtin_expect(!!(expr), false) # define Q_NORETURN __attribute__((__noreturn__)) @@ -462,7 +467,7 @@ # if __INTEL_COMPILER < 1200 # define Q_NO_TEMPLATE_FRIENDS # endif -# if defined(_CHAR16T) || __cplusplus >= 201103L +# if __cplusplus >= 201103L # define Q_COMPILER_VARIADIC_MACROS # if __INTEL_COMPILER >= 1200 # define Q_COMPILER_AUTO_TYPE @@ -613,7 +618,6 @@ # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404 /* C++11 features supported in GCC 4.4: */ -# define Q_COMPILER_ATOMICS # define Q_COMPILER_AUTO_FUNCTION # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_CLASS_ENUM @@ -637,6 +641,11 @@ # define Q_COMPILER_RANGE_FOR # endif # if (__GNUC__ * 100 + __GNUC_MINOR__) >= 407 + /* GCC 4.4 implemented and std::atomic using its old intrinsics. + * However, the implementation is incomplete for most platforms until GCC 4.7: + * instead, std::atomic would use an external lock. Since we need an std::atomic + * that is behavior-compatible with QBasicAtomic, we only enable it here */ +# define Q_COMPILER_ATOMICS /* GCC 4.6.x has problems dealing with noexcept expressions, * so turn the feature on for 4.7 and above, only */ # define Q_COMPILER_NOEXCEPT @@ -653,7 +662,11 @@ # define Q_COMPILER_ALIGNOF # define Q_COMPILER_INHERITING_CONSTRUCTORS # define Q_COMPILER_THREAD_LOCAL +# if (__GNUC__ * 100 + __GNUC_MINOR__) > 408 || __GNUC_PATCHLEVEL__ >= 1 +# define Q_COMPILER_REF_QUALIFIERS +# endif # endif + /* C++11 features are complete as of GCC 4.8.1 */ # endif #endif @@ -673,6 +686,7 @@ # endif # if _MSC_VER >= 1600 /* C++11 features supported in VC10 = VC2010: */ +# define Q_COMPILER_AUTO_FUNCTION # define Q_COMPILER_AUTO_TYPE # define Q_COMPILER_LAMBDA # define Q_COMPILER_DECLTYPE @@ -693,7 +707,7 @@ #endif /* Q_CC_MSVC */ #ifdef __cplusplus -# if defined(Q_OS_BLACKBERRY) || defined(Q_OS_QNX) +# if defined(Q_OS_QNX) # include # if defined(_YVALS) || defined(_LIBCPP_VER) // QNX: libcpp (Dinkumware-based) doesn't have the @@ -702,9 +716,12 @@ # ifdef Q_COMPILER_INITIALIZER_LISTS # undef Q_COMPILER_INITIALIZER_LISTS # endif +# ifdef Q_COMPILER_RVALUE_REFS +# undef Q_COMPILER_RVALUE_REFS +# endif # endif # endif -#endif // Q_OS_BLACKBERRY || Q_OS_QNX +#endif // Q_OS_QNX /* * C++11 keywords and expressions @@ -785,11 +802,11 @@ #ifndef Q_UNLIKELY # define Q_UNLIKELY(x) (x) #endif -#ifndef Q_ASSUME -# define Q_ASSUME(expr) qt_noop() +#ifndef Q_ASSUME_IMPL +# define Q_ASSUME_IMPL(expr) qt_noop() #endif -#ifndef Q_UNREACHABLE -# define Q_UNREACHABLE() qt_noop() +#ifndef Q_UNREACHABLE_IMPL +# define Q_UNREACHABLE_IMPL() qt_noop() #endif #ifndef Q_ALLOC_SIZE # define Q_ALLOC_SIZE(x) @@ -812,6 +829,9 @@ #ifndef Q_DECL_HIDDEN # define Q_DECL_HIDDEN #endif +#ifndef Q_DECL_UNUSED +# define Q_DECL_UNUSED +#endif #ifndef Q_FUNC_INFO # if defined(Q_OS_SOLARIS) || defined(Q_CC_XLC) # define Q_FUNC_INFO __FILE__ "(line number unavailable)" @@ -847,4 +867,18 @@ #define qMove(x) (x) #endif +#define Q_UNREACHABLE() \ + do {\ + Q_ASSERT_X(false, "Q_UNREACHABLE()", "Q_UNREACHABLE was reached");\ + Q_UNREACHABLE_IMPL();\ + } while (0) + +#define Q_ASSUME(Expr) \ + do {\ + const bool valueOfExpression = Expr;\ + Q_ASSERT_X(valueOfExpression, "Q_ASSUME()", "Assumption in Q_ASSUME(\"" #Expr "\") was not correct");\ + Q_ASSUME_IMPL(valueOfExpression);\ + Q_UNUSED(valueOfExpression); /* the value may not be used if Q_ASSERT_X and Q_ASSUME_IMPL are noop */\ + } while (0) + #endif // QCOMPILERDETECTION_H diff --git a/src/corelib/global/qconfig-dist.h b/src/corelib/global/qconfig-dist.h index 3d95e94..7b49102 100644 --- a/src/corelib/global/qconfig-dist.h +++ b/src/corelib/global/qconfig-dist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/src/corelib/global/qconfig-large.h b/src/corelib/global/qconfig-large.h index b621104..584be07 100644 --- a/src/corelib/global/qconfig-large.h +++ b/src/corelib/global/qconfig-large.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/src/corelib/global/qconfig-medium.h b/src/corelib/global/qconfig-medium.h index c62d700..132c8ce 100644 --- a/src/corelib/global/qconfig-medium.h +++ b/src/corelib/global/qconfig-medium.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/src/corelib/global/qconfig-minimal.h b/src/corelib/global/qconfig-minimal.h index 6a21492..cc5ac99 100644 --- a/src/corelib/global/qconfig-minimal.h +++ b/src/corelib/global/qconfig-minimal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/src/corelib/global/qconfig-nacl.h b/src/corelib/global/qconfig-nacl.h index 9dac73e..c2854b2 100644 --- a/src/corelib/global/qconfig-nacl.h +++ b/src/corelib/global/qconfig-nacl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/src/corelib/global/qconfig-small.h b/src/corelib/global/qconfig-small.h index 405521c..f730b3d 100644 --- a/src/corelib/global/qconfig-small.h +++ b/src/corelib/global/qconfig-small.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. diff --git a/src/corelib/global/qendian.h b/src/corelib/global/qendian.h index 166774f..9b939fe 100644 --- a/src/corelib/global/qendian.h +++ b/src/corelib/global/qendian.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -52,8 +52,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,7 +78,10 @@ template inline void qbswap(const T src, uchar *dest) // If you want to avoid the memcopy, you must write specializations for this function template inline void qToUnaligned(const T src, uchar *dest) { - memcpy(dest, &src, sizeof(T)); + // Using sizeof(T) inside memcpy function produces internal compiler error with + // MSVC2008/ARM in tst_endian -> use extra indirection to resolve size of T. + const size_t size = sizeof(T); + memcpy(dest, &src, size); } /* T qFromLittleEndian(const uchar *src) @@ -386,6 +387,4 @@ template <> inline qint8 qbswap(qint8 source) QT_END_NAMESPACE -QT_END_HEADER - #endif // QENDIAN_H diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index a63d3a3..f2e5dc7 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -154,6 +154,9 @@ // Properties //#define QT_NO_PROPERTIES +// QRegularExpression +//#define QT_NO_REGULAREXPRESSION + // Resize Handler //#define QT_NO_RESIZEHANDLER @@ -298,6 +301,11 @@ #define QT_NO_IM #endif +// QImageIOPlugin +#if !defined(QT_NO_IMAGEFORMATPLUGIN) && (defined(QT_NO_LIBRARY)) +#define QT_NO_IMAGEFORMATPLUGIN +#endif + // QLocalServer #if !defined(QT_NO_LOCALSERVER) && (defined(QT_NO_TEMPORARYFILE)) #define QT_NO_LOCALSERVER @@ -378,7 +386,7 @@ #define QT_NO_CONTEXTMENU #endif -// QtDBus module +// Qt D-Bus module #if !defined(QT_NO_DBUS) && (defined(QT_NO_PROPERTIES) || defined(QT_NO_DOM)) #define QT_NO_DBUS #endif diff --git a/src/corelib/global/qflags.h b/src/corelib/global/qflags.h index cbd7185..5b7edba 100644 --- a/src/corelib/global/qflags.h +++ b/src/corelib/global/qflags.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QFlag @@ -81,11 +79,11 @@ class QFlags { Q_STATIC_ASSERT_X((sizeof(Enum) <= sizeof(int)), "QFlags uses an int as storage, so an enum with underlying " - "long long would overflow. Qt 5.1 will have support for 64bit enums."); + "long long will overflow."); struct Private; typedef int (Private::*Zero); public: -#ifndef qdoc +#ifndef Q_QDOC typedef typename QtPrivate::if_< QtPrivate::is_unsigned::value, unsigned int, @@ -94,36 +92,37 @@ public: #endif typedef Enum enum_type; // compiler-generated copy/move ctor/assignment operators are fine! -#ifdef qdoc +#ifdef Q_QDOC typedef int Int; // the real typedef above is too complex for qdoc inline QFlags(const QFlags &other); inline QFlags &operator=(const QFlags &other); #endif - Q_DECL_CONSTEXPR inline QFlags(Enum f) : i(f) {} + Q_DECL_CONSTEXPR inline QFlags(Enum f) : i(Int(f)) {} Q_DECL_CONSTEXPR inline QFlags(Zero = 0) : i(0) {} Q_DECL_CONSTEXPR inline QFlags(QFlag f) : i(f) {} inline QFlags &operator&=(int mask) { i &= mask; return *this; } inline QFlags &operator&=(uint mask) { i &= mask; return *this; } + inline QFlags &operator&=(Enum mask) { i &= Int(mask); return *this; } inline QFlags &operator|=(QFlags f) { i |= f.i; return *this; } - inline QFlags &operator|=(Enum f) { i |= f; return *this; } + inline QFlags &operator|=(Enum f) { i |= Int(f); return *this; } inline QFlags &operator^=(QFlags f) { i ^= f.i; return *this; } - inline QFlags &operator^=(Enum f) { i ^= f; return *this; } + inline QFlags &operator^=(Enum f) { i ^= Int(f); return *this; } Q_DECL_CONSTEXPR inline operator Int() const { return i; } Q_DECL_CONSTEXPR inline QFlags operator|(QFlags f) const { return QFlags(Enum(i | f.i)); } - Q_DECL_CONSTEXPR inline QFlags operator|(Enum f) const { return QFlags(Enum(i | f)); } + Q_DECL_CONSTEXPR inline QFlags operator|(Enum f) const { return QFlags(Enum(i | Int(f))); } Q_DECL_CONSTEXPR inline QFlags operator^(QFlags f) const { return QFlags(Enum(i ^ f.i)); } - Q_DECL_CONSTEXPR inline QFlags operator^(Enum f) const { return QFlags(Enum(i ^ f)); } + Q_DECL_CONSTEXPR inline QFlags operator^(Enum f) const { return QFlags(Enum(i ^ Int(f))); } Q_DECL_CONSTEXPR inline QFlags operator&(int mask) const { return QFlags(Enum(i & mask)); } Q_DECL_CONSTEXPR inline QFlags operator&(uint mask) const { return QFlags(Enum(i & mask)); } - Q_DECL_CONSTEXPR inline QFlags operator&(Enum f) const { return QFlags(Enum(i & f)); } + Q_DECL_CONSTEXPR inline QFlags operator&(Enum f) const { return QFlags(Enum(i & Int(f))); } Q_DECL_CONSTEXPR inline QFlags operator~() const { return QFlags(Enum(~i)); } Q_DECL_CONSTEXPR inline bool operator!() const { return !i; } - Q_DECL_CONSTEXPR inline bool testFlag(Enum f) const { return (i & f) == f && (f != 0 || i == Int(f) ); } + Q_DECL_CONSTEXPR inline bool testFlag(Enum f) const { return (i & Int(f)) == Int(f) && (Int(f) != 0 || i == Int(f) ); } private: Int i; }; @@ -152,6 +151,4 @@ typedef uint Flags; QT_END_NAMESPACE -QT_END_HEADER - #endif // QFLAGS_H diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 6c2900e..79e32fe 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2012 Intel Corporation. ** Contact: http://www.qt-project.org/legal ** @@ -45,11 +45,11 @@ #include -#define QT_VERSION_STR "5.0.0" +#define QT_VERSION_STR "5.1.0" /* QT_VERSION is (major << 16) + (minor << 8) + patch. */ -#define QT_VERSION 0x050000 +#define QT_VERSION 0x050100 /* can be used like #if (QT_VERSION >= QT_VERSION_CHECK(4, 4, 0)) */ @@ -151,6 +151,7 @@ namespace QT_NAMESPACE {} #endif /* __cplusplus */ +// ### Qt6: remove me. #define QT_BEGIN_HEADER #define QT_END_HEADER @@ -158,7 +159,6 @@ namespace QT_NAMESPACE {} # define QT_LARGEFILE_SUPPORT 64 #endif -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE /* @@ -203,7 +203,11 @@ typedef quint64 qulonglong; QT_BEGIN_INCLUDE_NAMESPACE typedef unsigned char uchar; typedef unsigned short ushort; +#if defined(Q_QDOC) || !defined(Q_OS_ANDROID) typedef unsigned int uint; +#else +# include +#endif typedef unsigned long ulong; QT_END_INCLUDE_NAMESPACE @@ -470,7 +474,7 @@ typedef qptrdiff qintptr; # else # define QT_ENSURE_STACK_ALIGNED_FOR_SSE # endif -# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE +# define QT_WIN_CALLBACK CALLBACK QT_ENSURE_STACK_ALIGNED_FOR_SSE #endif typedef int QNoImplicitBoolCast; @@ -512,6 +516,16 @@ template Q_DECL_CONSTEXPR inline const T &qBound(const T &min, const T &val, const T &max) { return qMax(min, qMin(max, val)); } +#ifdef Q_OS_DARWIN +# define QT_MAC_PLATFORM_SDK_EQUAL_OR_ABOVE(osx, ios) \ + (defined(__MAC_OS_X_VERSION_MAX_ALLOWED) && __MAC_OS_X_VERSION_MAX_ALLOWED >= osx) || \ + (defined(__IPHONE_OS_VERSION_MAX_ALLOWED) && __IPHONE_OS_VERSION_MAX_ALLOWED >= ios) + +# define QT_MAC_DEPLOYMENT_TARGET_BELOW(osx, ios) \ + (defined(__MAC_OS_X_VERSION_MIN_REQUIRED) && osx != __MAC_NA && __MAC_OS_X_VERSION_MIN_REQUIRED < osx) || \ + (defined(__IPHONE_OS_VERSION_MIN_REQUIRED) && ios != __IPHONE_NA && __IPHONE_OS_VERSION_MIN_REQUIRED < ios) +#endif + /* Data stream functions are provided by many classes (defined in qdatastream.h) */ @@ -664,133 +678,14 @@ typedef void (*QFunctionPointer)(); # define Q_UNIMPLEMENTED() qWarning("%s:%d: %s: Unimplemented code.", __FILE__, __LINE__, Q_FUNC_INFO) #endif -#if defined(QT_NO_THREAD) - -template -class QGlobalStatic -{ -public: - T *pointer; - inline QGlobalStatic(T *p) : pointer(p) { } - inline ~QGlobalStatic() { pointer = 0; } -}; - -#define Q_GLOBAL_STATIC(TYPE, NAME) \ - static TYPE *NAME() \ - { \ - static TYPE thisVariable; \ - static QGlobalStatic thisGlobalStatic(&thisVariable); \ - return thisGlobalStatic.pointer; \ - } - -#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS) \ - static TYPE *NAME() \ - { \ - static TYPE thisVariable ARGS; \ - static QGlobalStatic thisGlobalStatic(&thisVariable); \ - return thisGlobalStatic.pointer; \ - } - -#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER) \ - static TYPE *NAME() \ - { \ - static TYPE thisVariable; \ - static QGlobalStatic thisGlobalStatic(0); \ - if (!thisGlobalStatic.pointer) { \ - TYPE *x = thisGlobalStatic.pointer = &thisVariable; \ - INITIALIZER; \ - } \ - return thisGlobalStatic.pointer; \ - } - -#else - -// forward declaration, since qatomic.h needs qglobal.h -template class QBasicAtomicPointer; - -// POD for Q_GLOBAL_STATIC -template -class QGlobalStatic -{ -public: - QBasicAtomicPointer pointer; - bool destroyed; -}; - -// Created as a function-local static to delete a QGlobalStatic -template -class QGlobalStaticDeleter -{ -public: - QGlobalStatic &globalStatic; - QGlobalStaticDeleter(QGlobalStatic &_globalStatic) - : globalStatic(_globalStatic) - { } - - inline ~QGlobalStaticDeleter() - { - delete globalStatic.pointer.load(); - globalStatic.pointer.store(0); - globalStatic.destroyed = true; - } -}; - -#define Q_GLOBAL_STATIC(TYPE, NAME) \ - static TYPE *NAME() \ - { \ - static QGlobalStatic thisGlobalStatic \ - = { Q_BASIC_ATOMIC_INITIALIZER(0), false }; \ - if (!thisGlobalStatic.pointer.load() && !thisGlobalStatic.destroyed) { \ - TYPE *x = new TYPE; \ - if (!thisGlobalStatic.pointer.testAndSetOrdered(0, x)) \ - delete x; \ - else \ - static QGlobalStaticDeleter cleanup(thisGlobalStatic); \ - } \ - return thisGlobalStatic.pointer.load(); \ - } - -#define Q_GLOBAL_STATIC_WITH_ARGS(TYPE, NAME, ARGS) \ - static TYPE *NAME() \ - { \ - static QGlobalStatic thisGlobalStatic \ - = { Q_BASIC_ATOMIC_INITIALIZER(0), false }; \ - if (!thisGlobalStatic.pointer.load() && !thisGlobalStatic.destroyed) { \ - TYPE *x = new TYPE ARGS; \ - if (!thisGlobalStatic.pointer.testAndSetOrdered(0, x)) \ - delete x; \ - else \ - static QGlobalStaticDeleter cleanup(thisGlobalStatic); \ - } \ - return thisGlobalStatic.pointer.load(); \ - } - -#define Q_GLOBAL_STATIC_WITH_INITIALIZER(TYPE, NAME, INITIALIZER) \ - static TYPE *NAME() \ - { \ - static QGlobalStatic thisGlobalStatic \ - = { Q_BASIC_ATOMIC_INITIALIZER(0), false }; \ - if (!thisGlobalStatic.pointer.load() && !thisGlobalStatic.destroyed) { \ - QScopedPointer x(new TYPE); \ - INITIALIZER; \ - if (thisGlobalStatic.pointer.testAndSetOrdered(0, x.data())) { \ - static QGlobalStaticDeleter cleanup(thisGlobalStatic); \ - x.take(); \ - } \ - } \ - return thisGlobalStatic.pointer.load(); \ - } - -#endif - Q_DECL_CONSTEXPR static inline bool qFuzzyCompare(double p1, double p2) { - return (qAbs(p1 - p2) <= 0.000000000001 * qMin(qAbs(p1), qAbs(p2))); + return (qAbs(p1 - p2) * 1000000000000. <= qMin(qAbs(p1), qAbs(p2))); } Q_DECL_CONSTEXPR static inline bool qFuzzyCompare(float p1, float p2) { - return (qAbs(p1 - p2) <= 0.00001f * qMin(qAbs(p1), qAbs(p2))); + return (qAbs(p1 - p2) * 100000.f <= qMin(qAbs(p1), qAbs(p2))); } /*! @@ -1053,6 +948,7 @@ Q_CORE_EXPORT QString qtTrId(const char *id, int n = -1); class QByteArray; Q_CORE_EXPORT QByteArray qgetenv(const char *varName); Q_CORE_EXPORT bool qputenv(const char *varName, const QByteArray& value); +Q_CORE_EXPORT bool qunsetenv(const char *varName); Q_CORE_EXPORT bool qEnvironmentVariableIsEmpty(const char *varName) Q_DECL_NOEXCEPT; Q_CORE_EXPORT bool qEnvironmentVariableIsSet(const char *varName) Q_DECL_NOEXCEPT; @@ -1087,7 +983,8 @@ template struct QEnableIf { typedef T Type; }; } QT_END_NAMESPACE -QT_END_HEADER +// Q_GLOBAL_STATIC +#include // qDebug and friends #include diff --git a/src/corelib/global/qisenum.h b/src/corelib/global/qisenum.h index 104c5a4..577007b 100644 --- a/src/corelib/global/qisenum.h +++ b/src/corelib/global/qisenum.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -62,9 +62,6 @@ #endif // shut up syncqt -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QISENUM_H diff --git a/src/corelib/global/qlibraryinfo.h b/src/corelib/global/qlibraryinfo.h index a574b4b..b275e01 100644 --- a/src/corelib/global/qlibraryinfo.h +++ b/src/corelib/global/qlibraryinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QLibraryInfo @@ -84,6 +82,7 @@ public: SysrootPath, HostPrefixPath, HostBinariesPath, + HostLibrariesPath, HostDataPath, TargetSpecPath, HostSpecPath, @@ -103,6 +102,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QLIBRARYINFO_H diff --git a/src/corelib/global/qlogging.h b/src/corelib/global/qlogging.h index 4a4eb26..2b798f9 100644 --- a/src/corelib/global/qlogging.h +++ b/src/corelib/global/qlogging.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,7 +49,6 @@ #pragma qt_no_master_include #endif -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE /* @@ -95,22 +94,38 @@ public: void debug(const char *msg, ...) const #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 3))) +# else __attribute__ ((format (printf, 2, 3))) +# endif #endif ; void noDebug(const char *, ...) const #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 3))) +# else __attribute__ ((format (printf, 2, 3))) +# endif #endif {} void warning(const char *msg, ...) const #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 3))) +# else __attribute__ ((format (printf, 2, 3))) +# endif #endif ; void critical(const char *msg, ...) const #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 3))) +# else __attribute__ ((format (printf, 2, 3))) +# endif #endif ; @@ -119,7 +134,11 @@ public: #endif void fatal(const char *msg, ...) const Q_DECL_NOTHROW #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 3))) +# else __attribute__ ((format (printf, 2, 3))) +# endif #endif ; @@ -172,6 +191,4 @@ Q_CORE_EXPORT QtMessageHandler qInstallMessageHandler(QtMessageHandler); Q_CORE_EXPORT void qSetMessagePattern(const QString &messagePattern); QT_END_NAMESPACE -QT_END_HEADER - #endif // QLOGGING_H diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index d071bd2..25c47d5 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,7 +63,7 @@ Qt { Q_ENUMS(ScrollBarPolicy FocusPolicy ContextMenuPolicy) Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle) Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode) - Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation DropAction) + Q_ENUMS(Axis Corner Edge LayoutDirection SizeHint Orientation DropAction) Q_FLAGS(Alignment Orientations DropActions) Q_FLAGS(DockWidgetAreas ToolBarAreas) Q_ENUMS(DockWidgetArea ToolBarArea) @@ -140,6 +138,10 @@ public: Q_DECLARE_FLAGS(KeyboardModifiers, KeyboardModifier) //shorter names for shortcuts + // The use of all-caps identifiers has the potential for clashing with + // user-defined or third-party macros. More so when the identifiers are not + // "namespace"-prefixed. This is considered bad practice and is why + // KeypadModifier was not added to the Modifier enum. enum Modifier { META = Qt::MetaModifier, SHIFT = Qt::ShiftModifier, @@ -286,11 +288,13 @@ public: SplashScreen = ToolTip | Dialog, Desktop = 0x00000010 | Window, SubWindow = 0x00000012, + ForeignWindow = 0x00000020 | Window, WindowType_Mask = 0x000000ff, MSWindowsFixedSizeDialogHint = 0x00000100, MSWindowsOwnDC = 0x00000200, - X11BypassWindowManagerHint = 0x00000400, + BypassWindowManagerHint = 0x00000400, + X11BypassWindowManagerHint = BypassWindowManagerHint, FramelessWindowHint = 0x00000800, WindowTitleHint = 0x00001000, WindowSystemMenuHint = 0x00002000, @@ -327,6 +331,15 @@ public: Q_DECLARE_FLAGS(WindowStates, WindowState) + enum ApplicationState { + ApplicationSuspended = 0x00000000, + ApplicationHidden = 0x00000001, + ApplicationInactive = 0x00000002, + ApplicationActive = 0x00000004 + }; + + Q_DECLARE_FLAGS(ApplicationStates, ApplicationState) + enum ScreenOrientation { PrimaryOrientation = 0x00000000, PortraitOrientation = 0x00000001, @@ -490,6 +503,7 @@ public: AA_X11InitThreads = 10, AA_SynthesizeTouchForUnhandledMouseEvents = 11, AA_SynthesizeMouseForUnhandledTouchEvents = 12, + AA_UseHighDpiPixmaps = 13, // Add new attributes before this line AA_AttributeCount @@ -966,6 +980,8 @@ public: Key_TouchpadOn = 0x01000111, Key_TouchpadOff = 0x01000112, + Key_MicMute = 0x01000113, + Key_MediaLast = 0x0100ffff, // Keypad navigation keys @@ -1194,6 +1210,13 @@ public: BottomRightCorner = 0x00003 }; + enum Edge { + TopEdge = 0x00001, + LeftEdge = 0x00002, + RightEdge = 0x00004, + BottomEdge = 0x00008 + }; + enum ConnectionType { AutoConnection, DirectConnection, @@ -1300,6 +1323,8 @@ public: ImhPreferLatin = 0x200, + ImhMultiLine = 0x400, + ImhDigitsOnly = 0x10000, ImhFormattedNumbersOnly = 0x20000, ImhUppercaseOnly = 0x40000, @@ -1397,7 +1422,8 @@ public: ItemIsDropEnabled = 8, ItemIsUserCheckable = 16, ItemIsEnabled = 32, - ItemIsTristate = 64 + ItemIsTristate = 64, + ItemNeverHasChildren = 128 }; Q_DECLARE_FLAGS(ItemFlags, ItemFlag) @@ -1603,6 +1629,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QNAMESPACE_H diff --git a/src/corelib/global/qnumeric.h b/src/corelib/global/qnumeric.h index 2b1c60b..25db544 100644 --- a/src/corelib/global/qnumeric.h +++ b/src/corelib/global/qnumeric.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,6 +63,4 @@ Q_CORE_EXPORT double qInf(); QT_END_NAMESPACE -QT_END_HEADER - #endif // QNUMERIC_H diff --git a/src/corelib/global/qprocessordetection.h b/src/corelib/global/qprocessordetection.h index b59954b..21f9c8f 100644 --- a/src/corelib/global/qprocessordetection.h +++ b/src/corelib/global/qprocessordetection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -101,6 +101,8 @@ || defined(__ARM_ARCH_7A__) \ || defined(__ARM_ARCH_7R__) \ || defined(__ARM_ARCH_7M__) \ + || defined(__ARM_ARCH_7S__) \ + || defined(_ARM_ARCH_7) \ || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 7) \ || (defined(_M_ARM) && _M_ARM-0 >= 7) # define Q_PROCESSOR_ARM_V7 @@ -118,6 +120,7 @@ # define Q_PROCESSOR_ARM_V6 # define Q_PROCESSOR_ARM_V5 # elif defined(__ARM_ARCH_5TEJ__) \ + || defined(__ARM_ARCH_5TE__) \ || (defined(__TARGET_ARCH_ARM) && __TARGET_ARCH_ARM-0 >= 5) \ || (defined(_M_ARM) && _M_ARM-0 >= 5) # define Q_PROCESSOR_ARM_V5 @@ -279,9 +282,9 @@ # if defined(__BYTE_ORDER__) && (__BYTE_ORDER__ == Q_BIG_ENDIAN || __BYTE_ORDER__ == Q_LITTLE_ENDIAN) // Reuse __BYTE_ORDER__ as-is, since our Q_*_ENDIAN #defines match the preprocessor defaults # define Q_BYTE_ORDER __BYTE_ORDER__ -# elif defined(__BIG_ENDIAN__) +# elif defined(__BIG_ENDIAN__) || defined(_big_endian__) || defined(_BIG_ENDIAN) # define Q_BYTE_ORDER Q_BIG_ENDIAN -# elif defined(__LITTLE_ENDIAN__) \ +# elif defined(__LITTLE_ENDIAN__) || defined(_little_endian__) || defined(_LITTLE_ENDIAN) \ || defined(_WIN32_WCE) // Windows CE is always little-endian according to MSDN. # define Q_BYTE_ORDER Q_LITTLE_ENDIAN # else diff --git a/src/corelib/global/qsysinfo.h b/src/corelib/global/qsysinfo.h index 867acd4..a6accdf 100644 --- a/src/corelib/global/qsysinfo.h +++ b/src/corelib/global/qsysinfo.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the FOO module of the Qt Toolkit. +** This file is part of the QtCore module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,7 +44,6 @@ #ifndef QSYSINFO_H #define QSYSINFO_H -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE /* @@ -70,7 +69,7 @@ public: BigEndian, LittleEndian -# ifdef qdoc +# ifdef Q_QDOC , ByteOrder = # elif Q_BYTE_ORDER == Q_BIG_ENDIAN , ByteOrder = BigEndian @@ -133,6 +132,7 @@ public: MV_10_6 = 0x0008, MV_10_7 = 0x0009, MV_10_8 = 0x000A, + MV_10_9 = 0x000B, /* codenames */ MV_CHEETAH = MV_10_0, @@ -143,7 +143,8 @@ public: MV_LEOPARD = MV_10_5, MV_SNOWLEOPARD = MV_10_6, MV_LION = MV_10_7, - MV_MOUNTAINLION = MV_10_8 + MV_MOUNTAINLION = MV_10_8, + MV_MAVERICKS = MV_10_9 }; static const MacVersion MacintoshVersion; static MacVersion macVersion(); @@ -151,6 +152,4 @@ public: }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QSYSINFO_H diff --git a/src/corelib/global/qsystemdetection.h b/src/corelib/global/qsystemdetection.h index 6bd921e..cb55fa8 100644 --- a/src/corelib/global/qsystemdetection.h +++ b/src/corelib/global/qsystemdetection.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,6 +50,9 @@ The operating system, must be one of: (Q_OS_x) DARWIN - Darwin OS (synonym for Q_OS_MAC) + MAC - OS X or iOS (synonym for Q_OS_DARWIN) + MACX - OS X + IOS - iOS MSDOS - MS-DOS and Windows OS2 - OS/2 OS2EMX - XFree86 on OS/2 (not PM) @@ -78,6 +81,7 @@ LYNX - LynxOS BSD4 - Any BSD 4.4 system UNIX - Any UNIX BSD/SYSV system + ANDROID - Android platform */ #if defined(__APPLE__) && (defined(__GNUC__) || defined(__xlC__) || defined(__xlc__)) @@ -88,6 +92,9 @@ # else # define Q_OS_DARWIN32 # endif +#elif defined(ANDROID) +# define Q_OS_ANDROID +# define Q_OS_LINUX #elif defined(__CYGWIN__) # define Q_OS_CYGWIN #elif !defined(SAG_COM) && (defined(WIN64) || defined(_WIN64) || defined(__WIN64__)) @@ -160,12 +167,17 @@ #if defined(Q_OS_DARWIN) # define Q_OS_MAC -# define Q_OS_MACX /* Q_OS_MACX is only for compatibility.*/ # if defined(Q_OS_DARWIN64) # define Q_OS_MAC64 # elif defined(Q_OS_DARWIN32) # define Q_OS_MAC32 # endif +# include +# if defined(TARGET_OS_IPHONE) && TARGET_OS_IPHONE +# define Q_OS_IOS +# else +# define Q_OS_MACX +# endif #endif #if defined(Q_OS_WIN) @@ -175,31 +187,60 @@ #endif #ifdef Q_OS_DARWIN -# ifdef MAC_OS_X_VERSION_MIN_REQUIRED -# undef MAC_OS_X_VERSION_MIN_REQUIRED +# include +# if !defined(__MAC_OS_X_VERSION_MIN_REQUIRED) || __MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_6 +# undef __MAC_OS_X_VERSION_MIN_REQUIRED +# define __MAC_OS_X_VERSION_MIN_REQUIRED __MAC_10_6 # endif -# define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_4 # include -# if !defined(MAC_OS_X_VERSION_10_3) -# define MAC_OS_X_VERSION_10_3 MAC_OS_X_VERSION_10_2 + 1 +# if !defined(MAC_OS_X_VERSION_MIN_REQUIRED) || MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_6 +# undef MAC_OS_X_VERSION_MIN_REQUIRED +# define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_6 # endif -# if !defined(MAC_OS_X_VERSION_10_4) -# define MAC_OS_X_VERSION_10_4 MAC_OS_X_VERSION_10_3 + 1 +# +# // Numerical checks are preferred to named checks, but to be safe +# // we define the missing version names in case Qt uses them. +# +# if !defined(__MAC_10_7) +# define __MAC_10_7 1070 # endif -# if !defined(MAC_OS_X_VERSION_10_5) -# define MAC_OS_X_VERSION_10_5 MAC_OS_X_VERSION_10_4 + 1 +# if !defined(__MAC_10_8) +# define __MAC_10_8 1080 # endif -# if !defined(MAC_OS_X_VERSION_10_6) -# define MAC_OS_X_VERSION_10_6 MAC_OS_X_VERSION_10_5 + 1 +# if !defined(__MAC_10_9) +# define __MAC_10_9 1090 # endif # if !defined(MAC_OS_X_VERSION_10_7) -# define MAC_OS_X_VERSION_10_7 MAC_OS_X_VERSION_10_6 + 1 +# define MAC_OS_X_VERSION_10_7 1070 # endif # if !defined(MAC_OS_X_VERSION_10_8) -# define MAC_OS_X_VERSION_10_8 MAC_OS_X_VERSION_10_7 + 1 +# define MAC_OS_X_VERSION_10_8 1080 +# endif +# if !defined(MAC_OS_X_VERSION_10_9) +# define MAC_OS_X_VERSION_10_9 1090 +# endif +# +# if !defined(__IPHONE_4_3) +# define __IPHONE_4_3 40300 +# endif +# if !defined(__IPHONE_5_0) +# define __IPHONE_5_0 50000 +# endif +# if !defined(__IPHONE_5_1) +# define __IPHONE_5_1 50100 +# endif +# if !defined(__IPHONE_6_0) +# define __IPHONE_6_0 60000 +# endif +# if !defined(__IPHONE_6_1) +# define __IPHONE_6_1 60100 +# endif +# if !defined(__IPHONE_7_0) +# define __IPHONE_7_0 70000 # endif -# if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_8) -# warning "This version of Mac OS X is unsupported" +# +# if (__MAC_OS_X_VERSION_MAX_ALLOWED > __MAC_10_8) +# warning "This version of OS X is unsupported" # endif #endif diff --git a/src/corelib/global/qt_windows.h b/src/corelib/global/qt_windows.h index 00a511a..c3266c5 100644 --- a/src/corelib/global/qt_windows.h +++ b/src/corelib/global/qt_windows.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,6 +42,11 @@ #ifndef QT_WINDOWS_H #define QT_WINDOWS_H +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + #if defined(Q_CC_BOR) // Borland's windows.h does not set these correctly, resulting in // unusable WinSDK standard dialogs diff --git a/src/corelib/global/qtypeinfo.h b/src/corelib/global/qtypeinfo.h index 68df50a..8e34c97 100644 --- a/src/corelib/global/qtypeinfo.h +++ b/src/corelib/global/qtypeinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,7 +44,6 @@ #ifndef QTYPEINFO_H #define QTYPEINFO_H -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE /* @@ -241,6 +240,4 @@ Q_DECLARE_TYPEINFO(long double, Q_PRIMITIVE_TYPE); #endif QT_END_NAMESPACE -QT_END_HEADER - #endif // QTYPEINFO_H diff --git a/src/corelib/global/qtypetraits.h b/src/corelib/global/qtypetraits.h index 0183f33..2ae66da 100644 --- a/src/corelib/global/qtypetraits.h +++ b/src/corelib/global/qtypetraits.h @@ -102,13 +102,13 @@ // - Use Qt macros for long long type differences on Windows. // - Enclose in QtPrivate namespace. +#include "QtCore/qglobal.h" + #ifndef QTYPETRAITS_H #define QTYPETRAITS_H #include // For pair -#include "QtCore/qglobal.h" -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE namespace QtPrivate { @@ -245,6 +245,10 @@ template<> struct is_integral : true_type { }; template struct is_integral : is_integral { }; template struct is_integral : is_integral { }; template struct is_integral : is_integral { }; +#if defined (Q_COMPILER_UNICODE_STRINGS) +template<> struct is_integral : true_type { }; +template<> struct is_integral : true_type { }; +#endif // is_floating_point is false except for the built-in floating-point types. // A cv-qualified type is integral if and only if the underlying type is. @@ -504,6 +508,4 @@ Q_STATIC_ASSERT(( is_signed::value)); } // namespace QtPrivate QT_END_NAMESPACE -QT_END_HEADER - #endif // QTYPETRAITS_H diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h index d53deed..de0fe9f 100644 --- a/src/corelib/io/qbuffer.h +++ b/src/corelib/io/qbuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ inline void QBuffer::setData(const char *adata, int alen) QT_END_NAMESPACE -QT_END_HEADER - #endif // QBUFFER_H diff --git a/src/corelib/io/qdatastream.h b/src/corelib/io/qdatastream.h index 7fe2598..969cdf4 100644 --- a/src/corelib/io/qdatastream.h +++ b/src/corelib/io/qdatastream.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ #error qdatastream.h must be included before any header file that defines Status #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,8 +85,9 @@ public: Qt_4_7 = Qt_4_6, Qt_4_8 = Qt_4_7, Qt_4_9 = Qt_4_8, - Qt_5_0 = 13 -#if QT_VERSION >= 0x050100 + Qt_5_0 = 13, + Qt_5_1 = 14 +#if QT_VERSION >= 0x050200 #error Add the datastream version for this Qt version #endif }; @@ -369,7 +368,7 @@ Q_OUTOFLINE_TEMPLATE QDataStream &operator<<(QDataStream &out, const QHash Q_OUTOFLINE_TEMPLATE QDataStream &operator>>(QDataStream &in, QMap &map) #else @@ -434,6 +433,4 @@ inline QDataStream& operator<<(QDataStream& s, const QPair& p) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDATASTREAM_H diff --git a/src/corelib/io/qdebug.h b/src/corelib/io/qdebug.h index 4c8f961..9ed5f6e 100644 --- a/src/corelib/io/qdebug.h +++ b/src/corelib/io/qdebug.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -53,14 +53,13 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QDebug { friend class QMessageLogger; + friend class QDebugStateSaverPrivate; struct Stream { Stream(QIODevice *device) : ts(device), ref(1), type(QtDebugMsg), space(true), message_output(false) {} Stream(QString *string) : ts(string, QIODevice::WriteOnly), ref(1), type(QtDebugMsg), space(true), message_output(false) {} @@ -132,6 +131,17 @@ public: Q_DECLARE_SHARED(QDebug) +class QDebugStateSaverPrivate; +class Q_CORE_EXPORT QDebugStateSaver +{ +public: + QDebugStateSaver(QDebug &dbg); + ~QDebugStateSaver(); +private: + Q_DISABLE_COPY(QDebugStateSaver) + QScopedPointer d; +}; + class QNoDebug { public: @@ -270,7 +280,7 @@ inline QDebug operator<<(QDebug debug, const QFlags &flags) debug.nospace() << '|'; else needSeparator = true; - debug.nospace() << "0x" << QByteArray::number(T(1 << i), 16).constData(); + debug.nospace() << "0x" << QByteArray::number(typename QFlags::Int(1) << i, 16).constData(); } } debug << ')'; @@ -279,6 +289,4 @@ inline QDebug operator<<(QDebug debug, const QFlags &flags) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDEBUG_H diff --git a/src/corelib/io/qdir.h b/src/corelib/io/qdir.h index 7a44c83..dbb6d93 100644 --- a/src/corelib/io/qdir.h +++ b/src/corelib/io/qdir.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -236,6 +234,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, const QDir &dir); QT_END_NAMESPACE -QT_END_HEADER - #endif // QDIR_H diff --git a/src/corelib/io/qdiriterator.h b/src/corelib/io/qdiriterator.h index 45995ca..4a96005 100644 --- a/src/corelib/io/qdiriterator.h +++ b/src/corelib/io/qdiriterator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -91,6 +89,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDirIterator::IteratorFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index 56c8d8b..2e75e29 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ #error qfile.h must be included before any header file that defines open #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QTemporaryFile; @@ -154,6 +152,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QFILE_H diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index e1ea5b8..fc27790 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QFileDevicePrivate; @@ -142,6 +140,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDevice::Permissions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QFILEDEVICE_H diff --git a/src/corelib/io/qfileinfo.h b/src/corelib/io/qfileinfo.h index ae963ed..211c18d 100644 --- a/src/corelib/io/qfileinfo.h +++ b/src/corelib/io/qfileinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -159,6 +157,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QFileInfo) -QT_END_HEADER - #endif // QFILEINFO_H diff --git a/src/corelib/io/qfilesystemwatcher.h b/src/corelib/io/qfilesystemwatcher.h index 6fbbdae..5a32607 100644 --- a/src/corelib/io/qfilesystemwatcher.h +++ b/src/corelib/io/qfilesystemwatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #ifndef QT_NO_FILESYSTEMWATCHER -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -73,12 +71,12 @@ public: Q_SIGNALS: void fileChanged(const QString &path -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void directoryChanged(const QString &path -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -90,7 +88,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_FILESYSTEMWATCHER #endif // QFILESYSTEMWATCHER_H diff --git a/src/corelib/io/qiodevice.h b/src/corelib/io/qiodevice.h index 3294fc3..cdc90f2 100644 --- a/src/corelib/io/qiodevice.h +++ b/src/corelib/io/qiodevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,6 +42,7 @@ #ifndef QIODEVICE_H #define QIODEVICE_H +#include #ifndef QT_NO_QOBJECT #include #else @@ -54,8 +55,6 @@ #error qiodevice.h must be included before any header file that defines open #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -177,6 +176,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug debug, QIODevice::OpenMode modes); QT_END_NAMESPACE -QT_END_HEADER - #endif // QIODEVICE_H diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index bf4f2fb..9da3e63 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,14 +46,12 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_PROCESS -#if !defined(Q_OS_WIN) || defined(qdoc) +#if !defined(Q_OS_WIN) || defined(Q_QDOC) typedef qint64 Q_PID; #else QT_END_NAMESPACE @@ -138,8 +136,14 @@ public: void start(const QString &program, const QStringList &arguments, OpenMode mode = ReadWrite); void start(const QString &command, OpenMode mode = ReadWrite); + void start(OpenMode mode = ReadWrite); + bool open(OpenMode mode = ReadWrite) Q_DECL_OVERRIDE; + QString program() const; + void setProgram(const QString &program); + QStringList arguments() const; + void setArguments(const QStringList & arguments); ProcessChannelMode readChannelMode() const; void setReadChannelMode(ProcessChannelMode mode); @@ -211,26 +215,26 @@ public Q_SLOTS: Q_SIGNALS: void started( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); - void finished(int exitCode); + void finished(int exitCode); // ### Qt 6: merge the two signals with a default value void finished(int exitCode, QProcess::ExitStatus exitStatus); void error(QProcess::ProcessError error); void stateChanged(QProcess::ProcessState state -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void readyReadStandardOutput( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void readyReadStandardError( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -261,6 +265,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPROCESS_H diff --git a/src/corelib/io/qresource.h b/src/corelib/io/qresource.h index a8c7faf..88467bd 100644 --- a/src/corelib/io/qresource.h +++ b/src/corelib/io/qresource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QRESOURCE_H diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index 456147b..a720b3d 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE QT_END_NAMESPACE @@ -198,6 +196,4 @@ QT_END_NAMESPACE #endif // QT_NO_SETTINGS -QT_END_HEADER - #endif // QSETTINGS_H diff --git a/src/corelib/io/qstandardpaths.h b/src/corelib/io/qstandardpaths.h index d9d572d..d8b6d24 100644 --- a/src/corelib/io/qstandardpaths.h +++ b/src/corelib/io/qstandardpaths.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,15 +44,11 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_STANDARDPATHS -class QStringList; - class Q_CORE_EXPORT QStandardPaths { public: @@ -87,7 +83,9 @@ public: static QString locate(StandardLocation type, const QString &fileName, LocateOptions options = LocateFile); static QStringList locateAll(StandardLocation type, const QString &fileName, LocateOptions options = LocateFile); +#ifndef QT_BOOTSTRAPPED static QString displayName(StandardLocation type); +#endif static QString findExecutable(const QString &executableName, const QStringList &paths = QStringList()); @@ -104,6 +102,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTANDARDPATHS_H diff --git a/src/corelib/io/qtemporarydir.h b/src/corelib/io/qtemporarydir.h index b75a6e3..47252cb 100644 --- a/src/corelib/io/qtemporarydir.h +++ b/src/corelib/io/qtemporarydir.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEMPORARYDIR_H diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index b7c375e..09aa53c 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,14 +49,13 @@ #error qtemporaryfile.h must be included before any header file that defines open #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_TEMPORARYFILE class QTemporaryFilePrivate; +class QLockFilePrivate; class Q_CORE_EXPORT QTemporaryFile : public QFile { @@ -98,6 +97,7 @@ protected: private: friend class QFile; + friend class QLockFilePrivate; Q_DISABLE_COPY(QTemporaryFile) }; @@ -105,6 +105,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEMPORARYFILE_H diff --git a/src/corelib/io/qtextstream.h b/src/corelib/io/qtextstream.h index cf19721..6d143bd 100644 --- a/src/corelib/io/qtextstream.h +++ b/src/corelib/io/qtextstream.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,8 +54,6 @@ #error qtextstream.h must be included before any header file that defines Status #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -194,6 +192,7 @@ public: private: Q_DISABLE_COPY(QTextStream) + friend class QDebugStateSaverPrivate; QScopedPointer d_ptr; }; @@ -284,6 +283,4 @@ inline QTextStreamManipulator qSetRealNumberPrecision(int precision) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTSTREAM_H diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index fcea4fd..de4ce75 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Copyright (C) 2012 Intel Corporation. ** Contact: http://www.qt-project.org/legal ** @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -154,7 +152,7 @@ public: FullyDecoded = FullyEncoded | DecodeReserved | 0x4000000 }; Q_DECLARE_FLAGS(ComponentFormattingOptions, ComponentFormattingOption) -#ifdef qdoc +#ifdef Q_QDOC Q_DECLARE_FLAGS(FormattingOptions, UrlFormattingOption) #else typedef QUrlTwoFlags FormattingOptions; @@ -322,6 +320,9 @@ public: static QString fromAce(const QByteArray &); static QByteArray toAce(const QString &); static QStringList idnWhitelist(); + static QStringList toStringList(const QList &uris, FormattingOptions options = FormattingOptions(PrettyDecoded)); + static QList fromStringList(const QStringList &uris, ParsingMode mode = TolerantMode); + static void setIdnWhitelist(const QStringList &); friend Q_CORE_EXPORT uint qHash(const QUrl &url, uint seed = 0) Q_DECL_NOTHROW; @@ -381,6 +382,4 @@ QT_END_NAMESPACE # include #endif -QT_END_HEADER - #endif // QURL_H diff --git a/src/corelib/io/qurlquery.h b/src/corelib/io/qurlquery.h index 319fe3c..c515bf7 100644 --- a/src/corelib/io/qurlquery.h +++ b/src/corelib/io/qurlquery.h @@ -50,8 +50,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUrlQueryPrivate; @@ -173,6 +171,4 @@ inline QList QUrl::allEncodedQueryItemValues(const QByteArray &key) QT_END_NAMESPACE -QT_END_HEADER - #endif // QURLQUERY_H diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 9513a24..215ccce 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -156,7 +154,7 @@ template class QMap; class Q_CORE_EXPORT QAbstractItemModel : public QObject { Q_OBJECT - Q_ENUMS(LayoutChangeHints) + Q_ENUMS(LayoutChangeHint) friend class QPersistentModelIndexData; friend class QAbstractItemViewPrivate; @@ -252,78 +250,78 @@ Q_SIGNALS: void layoutAboutToBeChanged(const QList &parents = QList(), QAbstractItemModel::LayoutChangeHint hint = QAbstractItemModel::NoLayoutChangeHint); void rowsAboutToBeInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsAboutToBeRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsAboutToBeInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsInserted(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsAboutToBeRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsRemoved(const QModelIndex &parent, int first, int last -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void modelAboutToBeReset( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void modelReset( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void rowsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationRow -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void rowsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int row -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsAboutToBeMoved( const QModelIndex &sourceParent, int sourceStart, int sourceEnd, const QModelIndex &destinationParent, int destinationColumn -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void columnsMoved( const QModelIndex &parent, int start, int end, const QModelIndex &destination, int column -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -332,6 +330,10 @@ public Q_SLOTS: virtual bool submit(); virtual void revert(); +protected Q_SLOTS: + // Qt 6: Make virtual + void resetInternalData(); + protected: QAbstractItemModel(QAbstractItemModelPrivate &dd, QObject *parent = 0); @@ -403,7 +405,7 @@ inline bool QAbstractItemModel::moveRow(const QModelIndex &sourceParent, int sou { return moveRows(sourceParent, sourceRow, 1, destinationParent, destinationChild); } inline bool QAbstractItemModel::moveColumn(const QModelIndex &sourceParent, int sourceColumn, const QModelIndex &destinationParent, int destinationChild) -{ return moveRows(sourceParent, sourceColumn, 1, destinationParent, destinationChild); } +{ return moveColumns(sourceParent, sourceColumn, 1, destinationParent, destinationChild); } inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, void *adata) const { return QModelIndex(arow, acolumn, adata, this); } inline QModelIndex QAbstractItemModel::createIndex(int arow, int acolumn, quintptr aid) const @@ -421,6 +423,7 @@ public: bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; protected: QAbstractTableModel(QAbstractItemModelPrivate &dd, QObject *parent); @@ -441,6 +444,8 @@ public: QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const; bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); + + Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; protected: QAbstractListModel(QAbstractItemModelPrivate &dd, QObject *parent); @@ -473,6 +478,4 @@ inline uint qHash(const QModelIndex &index) QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTITEMMODEL_H diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index 1f32126..9b26d6c 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -103,6 +101,9 @@ Q_SIGNALS: #endif ); +protected Q_SLOTS: + void resetInternalData(); + protected: QAbstractProxyModel(QAbstractProxyModelPrivate &, QObject *parent); @@ -116,6 +117,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTPROXYMODEL_H diff --git a/src/corelib/itemmodels/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h index da40836..8a416c9 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.h +++ b/src/corelib/itemmodels/qidentityproxymodel.h @@ -47,8 +47,6 @@ #ifndef QT_NO_IDENTITYPROXYMODEL -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -102,7 +100,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_sourceColumnsAboutToBeMoved(QModelIndex,int,int,QModelIndex,int)) Q_PRIVATE_SLOT(d_func(), void _q_sourceColumnsMoved(QModelIndex,int,int,QModelIndex,int)) - Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex)) + Q_PRIVATE_SLOT(d_func(), void _q_sourceDataChanged(QModelIndex,QModelIndex,QVector)) Q_PRIVATE_SLOT(d_func(), void _q_sourceHeaderDataChanged(Qt::Orientation orientation, int first, int last)) Q_PRIVATE_SLOT(d_func(), void _q_sourceLayoutAboutToBeChanged(const QList &sourceParents, QAbstractItemModel::LayoutChangeHint hint)) @@ -113,8 +111,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_IDENTITYPROXYMODEL #endif // QIDENTITYPROXYMODEL_H diff --git a/src/corelib/itemmodels/qitemselectionmodel.h b/src/corelib/itemmodels/qitemselectionmodel.h index 79a8a25..2a1a4b0 100644 --- a/src/corelib/itemmodels/qitemselectionmodel.h +++ b/src/corelib/itemmodels/qitemselectionmodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -253,6 +251,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QItemSelectionRange &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QITEMSELECTIONMODEL_H diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 18b7078..a37c892 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -198,8 +196,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SORTFILTERPROXYMODEL #endif // QSORTFILTERPROXYMODEL_H diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index 4da435c..3514b27 100644 --- a/src/corelib/itemmodels/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTRINGLISTMODEL_H diff --git a/src/corelib/json/qjsonarray.h b/src/corelib/json/qjsonarray.h index 0a6c769..1474cca 100644 --- a/src/corelib/json/qjsonarray.h +++ b/src/corelib/json/qjsonarray.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDebug; @@ -219,6 +217,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonArray &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSONARRAY_H diff --git a/src/corelib/json/qjsondocument.h b/src/corelib/json/qjsondocument.h index a5e87a8..0354262 100644 --- a/src/corelib/json/qjsondocument.h +++ b/src/corelib/json/qjsondocument.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDebug; @@ -69,7 +67,8 @@ struct Q_CORE_EXPORT QJsonParseError IllegalUTF8String, UnterminatedString, MissingObject, - DeepNesting + DeepNesting, + DocumentTooLarge }; QString errorString() const; @@ -109,8 +108,19 @@ public: static QJsonDocument fromVariant(const QVariant &variant); QVariant toVariant() const; + enum JsonFormat { + Indented, + Compact + }; + static QJsonDocument fromJson(const QByteArray &json, QJsonParseError *error = 0); - QByteArray toJson() const; + +#ifdef Q_QDOC + QByteArray toJson(JsonFormat format = Indented) const; +#else + QByteArray toJson() const; //### Merge in Qt6 + QByteArray toJson(JsonFormat format) const; +#endif bool isEmpty() const; bool isArray() const; @@ -144,6 +154,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonDocument &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSONDOCUMENT_H diff --git a/src/corelib/json/qjsonobject.h b/src/corelib/json/qjsonobject.h index a7cd3c9..8226b61 100644 --- a/src/corelib/json/qjsonobject.h +++ b/src/corelib/json/qjsonobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDebug; @@ -214,6 +212,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonObject &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSONOBJECT_H diff --git a/src/corelib/json/qjsonvalue.h b/src/corelib/json/qjsonvalue.h index 990c262..b8bdf55 100644 --- a/src/corelib/json/qjsonvalue.h +++ b/src/corelib/json/qjsonvalue.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QDebug; @@ -184,6 +182,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QJsonValue &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSONVALUE_H diff --git a/src/corelib/kernel/qabstracteventdispatcher.h b/src/corelib/kernel/qabstracteventdispatcher.h index 99e3163..6f21cef 100644 --- a/src/corelib/kernel/qabstracteventdispatcher.h +++ b/src/corelib/kernel/qabstracteventdispatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAbstractNativeEventFilter; @@ -129,6 +127,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTEVENTDISPATCHER_H diff --git a/src/corelib/kernel/qabstractnativeeventfilter.h b/src/corelib/kernel/qabstractnativeeventfilter.h index 2d57b14..9d1db2c 100644 --- a/src/corelib/kernel/qabstractnativeeventfilter.h +++ b/src/corelib/kernel/qabstractnativeeventfilter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QAbstractNativeEventFilterPrivate; @@ -65,6 +63,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif /* QABSTRACTNATIVEEVENTFILTER_H */ diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h index 6915623..432e4d5 100644 --- a/src/corelib/kernel/qbasictimer.h +++ b/src/corelib/kernel/qbasictimer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -70,6 +68,4 @@ Q_DECLARE_TYPEINFO(QBasicTimer, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QBASICTIMER_H diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 83f444c..ae17aee 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,15 +42,21 @@ #ifndef QCOREAPPLICATION_H #define QCOREAPPLICATION_H +#include +#include +#ifndef QT_NO_QOBJECT #include #include #include +#else +#include +#endif +#ifndef QT_NO_QOBJECT #if defined(Q_OS_WIN) && !defined(tagMSG) typedef struct tagMSG MSG; #endif - -QT_BEGIN_HEADER +#endif QT_BEGIN_NAMESPACE @@ -65,14 +71,19 @@ class QAbstractNativeEventFilter; #define qApp QCoreApplication::instance() -class Q_CORE_EXPORT QCoreApplication : public QObject +class Q_CORE_EXPORT QCoreApplication +#ifndef QT_NO_QOBJECT + : public QObject +#endif { +#ifndef QT_NO_QOBJECT Q_OBJECT - Q_PROPERTY(QString applicationName READ applicationName WRITE setApplicationName) - Q_PROPERTY(QString applicationVersion READ applicationVersion WRITE setApplicationVersion) - Q_PROPERTY(QString organizationName READ organizationName WRITE setOrganizationName) - Q_PROPERTY(QString organizationDomain READ organizationDomain WRITE setOrganizationDomain) + Q_PROPERTY(QString applicationName READ applicationName WRITE setApplicationName NOTIFY applicationNameChanged) + Q_PROPERTY(QString applicationVersion READ applicationVersion WRITE setApplicationVersion NOTIFY applicationVersionChanged) + Q_PROPERTY(QString organizationName READ organizationName WRITE setOrganizationName NOTIFY organizationNameChanged) + Q_PROPERTY(QString organizationDomain READ organizationDomain WRITE setOrganizationDomain NOTIFY organizationDomainChanged) Q_PROPERTY(bool quitLockEnabled READ isQuitLockEnabled WRITE setQuitLockEnabled) +#endif Q_DECLARE_PRIVATE(QCoreApplication) public: @@ -103,6 +114,7 @@ public: static QCoreApplication *instance() { return self; } +#ifndef QT_NO_QOBJECT static int exec(); static void processEvents(QEventLoop::ProcessEventsFlags flags = QEventLoop::AllEvents); static void processEvents(QEventLoop::ProcessEventsFlags flags, int maxtime); @@ -120,6 +132,7 @@ public: static bool startingUp(); static bool closingDown(); +#endif static QString applicationDirPath(); static QString applicationFilePath(); @@ -148,6 +161,7 @@ public: { return translate(context, key, disambiguation, n); } #endif +#ifndef QT_NO_QOBJECT static void flush(); void installNativeEventFilter(QAbstractNativeEventFilter *filterObj); @@ -161,22 +175,34 @@ public Q_SLOTS: Q_SIGNALS: void aboutToQuit( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); + void organizationNameChanged(); + void organizationDomainChanged(); + void applicationNameChanged(); + void applicationVersionChanged(); + protected: bool event(QEvent *); virtual bool compressEvent(QEvent *, QObject *receiver, QPostEventList *); +#endif // QT_NO_QOBJECT protected: QCoreApplication(QCoreApplicationPrivate &p); +#ifdef QT_NO_QOBJECT + QScopedPointer d_ptr; +#endif + private: +#ifndef QT_NO_QOBJECT static bool sendSpontaneousEvent(QObject *receiver, QEvent *event); bool notifyInternal(QObject *receiver, QEvent *event); +#endif void init(); @@ -184,7 +210,6 @@ private: Q_DISABLE_COPY(QCoreApplication) - friend class QEventDispatcherUNIXPrivate; friend class QApplication; friend class QApplicationPrivate; friend class QGuiApplication; @@ -193,46 +218,59 @@ private: friend class QWidget; friend class QWidgetWindow; friend class QWidgetPrivate; +#ifndef QT_NO_QOBJECT + friend class QEventDispatcherUNIXPrivate; friend class QCocoaEventDispatcherPrivate; friend bool qt_sendSpontaneousEvent(QObject*, QEvent*); +#endif friend Q_CORE_EXPORT QString qAppName(); friend class QClassFactory; }; +#ifndef QT_NO_QOBJECT inline bool QCoreApplication::sendEvent(QObject *receiver, QEvent *event) { if (event) event->spont = false; return self ? self->notifyInternal(receiver, event) : false; } inline bool QCoreApplication::sendSpontaneousEvent(QObject *receiver, QEvent *event) { if (event) event->spont = true; return self ? self->notifyInternal(receiver, event) : false; } +#endif -#ifdef QT_NO_TRANSLATION -inline QString QCoreApplication::translate(const char *, const char *sourceText, const char *, int) -{ - return QString::fromUtf8(sourceText); -} +#ifdef QT_NO_DEPRECATED +# define QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) +#else +# define QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) \ + QT_DEPRECATED static inline QString trUtf8(const char *sourceText, const char *disambiguation = 0, int n = -1) \ + { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } #endif #define Q_DECLARE_TR_FUNCTIONS(context) \ public: \ static inline QString tr(const char *sourceText, const char *disambiguation = 0, int n = -1) \ { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } \ - QT_DEPRECATED static inline QString trUtf8(const char *sourceText, const char *disambiguation = 0, int n = -1) \ - { return QCoreApplication::translate(#context, sourceText, disambiguation, n); } \ + QT_DECLARE_DEPRECATED_TR_FUNCTIONS(context) \ private: +typedef void (*QtStartUpFunction)(); typedef void (*QtCleanUpFunction)(); +Q_CORE_EXPORT void qAddPreRoutine(QtStartUpFunction); Q_CORE_EXPORT void qAddPostRoutine(QtCleanUpFunction); Q_CORE_EXPORT void qRemovePostRoutine(QtCleanUpFunction); Q_CORE_EXPORT QString qAppName(); // get application name +#define Q_COREAPP_STARTUP_FUNCTION(AFUNC) \ + static void AFUNC ## _ctor_function() { \ + qAddPreRoutine(AFUNC); \ + } \ + Q_CONSTRUCTOR_FUNCTION(AFUNC ## _ctor_function) + +#ifndef QT_NO_QOBJECT #if defined(Q_OS_WIN) && !defined(QT_NO_DEBUG_STREAM) Q_CORE_EXPORT QString decodeMSG(const MSG &); Q_CORE_EXPORT QDebug operator<<(QDebug, const MSG &); #endif +#endif QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOREAPPLICATION_H diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index 6cce838..2ca0a7d 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -169,9 +167,9 @@ public: ToolBarChange = 120, // toolbar visibility toggled - ApplicationActivate = 121, // application has been changed to active + ApplicationActivate = 121, // deprecated. Use ApplicationStateChange instead. ApplicationActivated = ApplicationActivate, // deprecated - ApplicationDeactivate = 122, // application has been changed to inactive + ApplicationDeactivate = 122, // deprecated. Use ApplicationStateChange instead. ApplicationDeactivated = ApplicationDeactivate, // deprecated QueryWhatsThis = 123, // query what's this widget help @@ -278,6 +276,7 @@ public: PlatformPanel = 212, StyleAnimationUpdate = 213, // style animation target should be updated + ApplicationStateChange = 214, // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event @@ -377,6 +376,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOREEVENT_H diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index c11e3ed..926be08 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QEVENTLOOP_H diff --git a/src/corelib/kernel/qfunctions_nacl.h b/src/corelib/kernel/qfunctions_nacl.h index 1e90283..c15b975 100644 --- a/src/corelib/kernel/qfunctions_nacl.h +++ b/src/corelib/kernel/qfunctions_nacl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,6 +42,8 @@ #ifndef QFUNCTIONS_NACL_H #define QFUNCTIONS_NACL_H +#include + #ifdef Q_OS_NACL #include @@ -52,8 +54,6 @@ #define PTHREAD_CANCEL_ENABLE 2 #define PTHREAD_INHERIT_SCHED 3 -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -69,7 +69,7 @@ int pthread_cancel(pthread_t thread); int pthread_attr_setinheritsched(pthread_attr_t *attr, int inheritsched); -int pthread_attr_getinheritsched(const pthread_attr_t *attr, +int pthread_attr_getinheritsched(const pthread_attr_t *attr, int *inheritsched); // event dispatcher, select @@ -89,8 +89,6 @@ int select(int nfds, fd_set * readfds, fd_set * writefds, fd_set * errorfds, str QT_END_NAMESPACE -QT_END_HEADER - #endif //Q_OS_NACL #endif //QFUNCTIONS_NACL_H diff --git a/src/corelib/kernel/qfunctions_vxworks.h b/src/corelib/kernel/qfunctions_vxworks.h index d0f6e60..e33401a 100644 --- a/src/corelib/kernel/qfunctions_vxworks.h +++ b/src/corelib/kernel/qfunctions_vxworks.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -41,6 +41,9 @@ #ifndef QFUNCTIONS_VXWORKS_H #define QFUNCTIONS_VXWORKS_H + +#include + #ifdef Q_OS_VXWORKS #include @@ -52,7 +55,11 @@ #include #include #include +#if defined(_WRS_KERNEL) #include +#else +#include +#endif #include #include #include @@ -61,15 +68,50 @@ #include #endif -QT_BEGIN_HEADER +// VxWorks has public header mbuf.h which defines following variables for DKM. +// Let's undef those to because they overlap with Qt variable names- +// File mbuf.h is included in headers , so make sure +// that those are included before undef's. +#if defined(mbuf) +# undef mbuf +#endif +#if defined(m_data) +# undef m_data +#endif +#if defined(m_type) +# undef m_type +#endif +#if defined(m_next) +# undef m_next +#endif +#if defined(m_len) +# undef m_len +#endif +#if defined(m_flags) +# undef m_flags +#endif +#if defined(m_hdr) +# undef m_hdr +#endif +#if defined(m_ext) +# undef m_ext +#endif +#if defined(m_act) +# undef m_act +#endif +#if defined(m_nextpkt) +# undef m_nextpkt +#endif +#if defined(m_pkthdr) +# undef m_pkthdr +#endif + QT_BEGIN_NAMESPACE #ifdef QT_BUILD_CORE_LIB #endif QT_END_NAMESPACE -QT_END_HEADER - #ifndef RTLD_LOCAL #define RTLD_LOCAL 0 @@ -95,17 +137,23 @@ void *lfind(const void* key, const void* base, size_t* elements, size_t size, // no rand_r(), but rand() // NOTE: this implementation is wrong for multi threaded applications, // but there is no way to get it right on VxWorks (in kernel mode) +#if defined(_WRS_KERNEL) int rand_r(unsigned int * /*seedp*/); +#endif // no usleep() support int usleep(unsigned int); +#if defined(VXWORKS_DKM) || defined(VXWORKS_RTP) +int gettimeofday(struct timeval *, void *); +#else // gettimeofday() is declared, but is missing from the library. // It IS however defined in the Curtis-Wright X11 libraries, so // we have to make the symbol 'weak' int gettimeofday(struct timeval *tv, void /*struct timezone*/ *) __attribute__((weak)); +#endif -// neither getpagesize() or sysconf(_SC_PAGESIZE) are available +// getpagesize() not available int getpagesize(); // symlinks are not supported (lstat is now just a call to stat - see qplatformdefs.h) diff --git a/src/corelib/kernel/qfunctions_wince.h b/src/corelib/kernel/qfunctions_wince.h index a4dc783..ab7bbe3 100644 --- a/src/corelib/kernel/qfunctions_wince.h +++ b/src/corelib/kernel/qfunctions_wince.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -41,6 +41,9 @@ #ifndef QFUNCTIONS_WINCE_H #define QFUNCTIONS_WINCE_H + +#include + #ifdef Q_OS_WINCE #include #include @@ -56,15 +59,12 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifdef QT_BUILD_CORE_LIB #endif QT_END_NAMESPACE -QT_END_HEADER - // The standard SDK misses this define... #define _control87 _controlfp diff --git a/src/corelib/kernel/qmath.h b/src/corelib/kernel/qmath.h index c5aa90e..21e23b9 100644 --- a/src/corelib/kernel/qmath.h +++ b/src/corelib/kernel/qmath.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,12 +42,14 @@ #ifndef QMATH_H #define QMATH_H +#if 0 +#pragma qt_class(QtMath) +#endif + #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -264,8 +266,26 @@ inline qreal qFastCos(qreal x) return qt_sine_table[si] - (qt_sine_table[ci] + 0.5 * qt_sine_table[si] * d) * d; } -QT_END_NAMESPACE +Q_DECL_CONSTEXPR inline float qDegreesToRadians(float degrees) +{ + return degrees * float(M_PI/180); +} + +Q_DECL_CONSTEXPR inline double qDegreesToRadians(double degrees) +{ + return degrees * (M_PI / 180); +} + +Q_DECL_CONSTEXPR inline float qRadiansToDegrees(float radians) +{ + return radians * float(180/M_PI); +} -QT_END_HEADER +Q_DECL_CONSTEXPR inline double qRadiansToDegrees(double radians) +{ + return radians * (180 / M_PI); +} + +QT_END_NAMESPACE #endif // QMATH_H diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 9e0cba7..23fc89f 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -274,6 +272,4 @@ Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QMETAOBJECT_H diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h index 09c641e..aed998f 100644 --- a/src/corelib/kernel/qmetatype.h +++ b/src/corelib/kernel/qmetatype.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -56,8 +56,6 @@ #error qmetatype.h must be included before any header file that defines Bool #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -534,6 +532,9 @@ struct QMetaTypeId2 static inline Q_DECL_CONSTEXPR int qt_metatype_id() { return QMetaTypeId::qt_metatype_id(); } }; +template +struct QMetaTypeId2 : QMetaTypeId2 {}; + namespace QtPrivate { template ::Defined> struct QMetaTypeIdHelper { @@ -574,7 +575,7 @@ namespace QtPrivate { template int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normalizedTypeName -#ifndef qdoc +#ifndef Q_QDOC , T * dummy = 0 , typename QtPrivate::MetaTypeDefinedHelper::Defined && !QMetaTypeId2::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper::Defined && !QMetaTypeId2::IsBuiltIn>::Defined #endif @@ -604,7 +605,7 @@ int qRegisterNormalizedMetaType(const QT_PREPEND_NAMESPACE(QByteArray) &normaliz template int qRegisterMetaType(const char *typeName -#ifndef qdoc +#ifndef Q_QDOC , T * dummy = 0 , typename QtPrivate::MetaTypeDefinedHelper::Defined && !QMetaTypeId2::IsBuiltIn>::DefinedType defined = QtPrivate::MetaTypeDefinedHelper::Defined && !QMetaTypeId2::IsBuiltIn>::Defined #endif @@ -621,7 +622,7 @@ int qRegisterMetaType(const char *typeName #ifndef QT_NO_DATASTREAM template void qRegisterMetaTypeStreamOperators(const char *typeName -#ifndef qdoc +#ifndef Q_QDOC , T * /* dummy */ = 0 #endif ) @@ -633,30 +634,30 @@ void qRegisterMetaTypeStreamOperators(const char *typeName #endif // QT_NO_DATASTREAM template -inline Q_DECL_CONSTEXPR int qMetaTypeId( -#ifndef qdoc - T * /* dummy */ = 0 -#endif -) +inline Q_DECL_CONSTEXPR int qMetaTypeId() { Q_STATIC_ASSERT_X(QMetaTypeId2::Defined, "Type is not registered, please use the Q_DECLARE_METATYPE macro to make it known to Qt's meta-object system"); return QMetaTypeId2::qt_metatype_id(); } template -inline Q_DECL_CONSTEXPR int qRegisterMetaType( -#if !defined(qdoc) && !defined(Q_CC_SUN) - T * dummy = 0 -#endif -) +inline Q_DECL_CONSTEXPR int qRegisterMetaType() { -#ifdef Q_CC_SUN - return qMetaTypeId(static_cast(0)); -#else - return qMetaTypeId(dummy); -#endif + return qMetaTypeId(); } +#if QT_DEPRECATED_SINCE(5, 1) && !defined(Q_QDOC) +// There used to be a T *dummy = 0 argument in Qt 4.0 to support MSVC6 +template +QT_DEPRECATED inline Q_DECL_CONSTEXPR int qMetaTypeId(T *) +{ return qMetaTypeId(); } +#ifndef Q_CC_SUN +template +QT_DEPRECATED inline Q_DECL_CONSTEXPR int qRegisterMetaType(T *) +{ return qRegisterMetaType(); } +#endif +#endif + template struct QMetaTypeIdQObject { @@ -669,12 +670,12 @@ struct QMetaTypeIdQObject static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); if (const int id = metatype_id.loadAcquire()) return id; - const int len = int(strlen(T::staticMetaObject.className())); - QVarLengthArray classNameStar; - classNameStar.append(T::staticMetaObject.className(), len); - classNameStar.append('*'); - const int newId = qRegisterNormalizedMetaType( \ - QByteArray(classNameStar.constData(), classNameStar.size()), + const char * const cName = T::staticMetaObject.className(); + QByteArray typeName; + typeName.reserve(int(strlen(cName)) + 1); + typeName.append(cName).append('*'); + const int newId = qRegisterNormalizedMetaType( + typeName, reinterpret_cast(quintptr(-1))); metatype_id.storeRelease(newId); return newId; @@ -756,17 +757,18 @@ struct QMetaTypeId< SINGLE_ARG_TEMPLATE > \ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \ if (const int id = metatype_id.load()) \ return id; \ - QVarLengthArray name; \ - name.append(#SINGLE_ARG_TEMPLATE, int(sizeof(#SINGLE_ARG_TEMPLATE)) - 1); \ - name.append('<'); \ const char *tName = QMetaType::typeName(qMetaTypeId()); \ Q_ASSERT(tName); \ - name.append(tName, int(strlen(tName))); \ - if (name.last() == '>') \ - name.append(' '); \ - name.append('>'); \ - const int newId = qRegisterNormalizedMetaType< SINGLE_ARG_TEMPLATE >( \ - QByteArray(name.constData(), name.size()), \ + const int tNameLen = qstrlen(tName); \ + QByteArray typeName; \ + typeName.reserve(sizeof(#SINGLE_ARG_TEMPLATE) + 1 + tNameLen + 1 + 1); \ + typeName.append(#SINGLE_ARG_TEMPLATE, sizeof(#SINGLE_ARG_TEMPLATE) - 1) \ + .append('<').append(tName, tNameLen); \ + if (typeName.endsWith('>')) \ + typeName.append(' '); \ + typeName.append('>'); \ + const int newId = qRegisterNormalizedMetaType< SINGLE_ARG_TEMPLATE >( \ + typeName, \ reinterpret_cast< SINGLE_ARG_TEMPLATE *>(quintptr(-1))); \ metatype_id.storeRelease(newId); \ return newId; \ @@ -785,21 +787,21 @@ struct QMetaTypeId< DOUBLE_ARG_TEMPLATE > \ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \ if (const int id = metatype_id.loadAcquire()) \ return id; \ - QVarLengthArray name; \ - name.append(#DOUBLE_ARG_TEMPLATE, sizeof(#DOUBLE_ARG_TEMPLATE) - 1); \ - name.append('<'); \ const char *tName = QMetaType::typeName(qMetaTypeId()); \ - Q_ASSERT(tName); \ - name.append(tName, int(strlen(tName))); \ - name.append(','); \ const char *uName = QMetaType::typeName(qMetaTypeId()); \ + Q_ASSERT(tName); \ Q_ASSERT(uName); \ - name.append(uName, int(strlen(uName))); \ - if (name.last() == '>') \ - name.append(' '); \ - name.append('>'); \ + const int tNameLen = qstrlen(tName); \ + const int uNameLen = qstrlen(uName); \ + QByteArray typeName; \ + typeName.reserve(sizeof(#DOUBLE_ARG_TEMPLATE) + 1 + tNameLen + 1 + uNameLen + 1 + 1); \ + typeName.append(#DOUBLE_ARG_TEMPLATE, sizeof(#DOUBLE_ARG_TEMPLATE) - 1) \ + .append('<').append(tName, tNameLen).append(',').append(uName, uNameLen); \ + if (typeName.endsWith('>')) \ + typeName.append(' '); \ + typeName.append('>'); \ const int newId = qRegisterNormalizedMetaType< DOUBLE_ARG_TEMPLATE >(\ - QByteArray(name.constData(), name.size()), \ + typeName, \ reinterpret_cast< DOUBLE_ARG_TEMPLATE *>(quintptr(-1))); \ metatype_id.storeRelease(newId); \ return newId; \ @@ -826,7 +828,13 @@ struct QMetaTypeId_ ## SMART_POINTER ## _QObjectStar \ static QBasicAtomicInt metatype_id = Q_BASIC_ATOMIC_INITIALIZER(0); \ if (const int id = metatype_id.loadAcquire()) \ return id; \ - const int newId = qRegisterNormalizedMetaType< SMART_POINTER >( #SMART_POINTER "<" + QByteArray(T::staticMetaObject.className()) + ">", \ + const char * const cName = T::staticMetaObject.className(); \ + QByteArray typeName; \ + typeName.reserve(sizeof(#SMART_POINTER) + 1 + strlen(cName) + 1); \ + typeName.append(#SMART_POINTER, sizeof(#SMART_POINTER) - 1) \ + .append('<').append(cName).append('>'); \ + const int newId = qRegisterNormalizedMetaType< SMART_POINTER >( \ + typeName, \ reinterpret_cast< SMART_POINTER *>(quintptr(-1))); \ metatype_id.storeRelease(newId); \ return newId; \ @@ -980,6 +988,4 @@ QT_END_NAMESPACE QT_FOR_EACH_STATIC_TYPE(Q_DECLARE_BUILTIN_METATYPE) -QT_END_HEADER - #endif // QMETATYPE_H diff --git a/src/corelib/kernel/qmimedata.h b/src/corelib/kernel/qmimedata.h index 662a726..84c7326 100644 --- a/src/corelib/kernel/qmimedata.h +++ b/src/corelib/kernel/qmimedata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMIMEDATA_H diff --git a/src/corelib/kernel/qobject.h b/src/corelib/kernel/qobject.h index e9316c9..aaa09fa 100644 --- a/src/corelib/kernel/qobject.h +++ b/src/corelib/kernel/qobject.h @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Olivier Goffart ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -56,8 +57,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -73,7 +72,7 @@ class QWidget; #ifndef QT_NO_REGEXP class QRegExp; #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION class QRegularExpression; #endif #ifndef QT_NO_USERDATA @@ -125,7 +124,7 @@ public: virtual bool event(QEvent *); virtual bool eventFilter(QObject *, QEvent *); -#ifdef qdoc +#ifdef Q_QDOC static QString tr(const char *sourceText, const char *comment = 0, int n = -1); static QString trUtf8(const char *sourceText, const char *comment = 0, int n = -1); virtual const QMetaObject *metaObject() const; @@ -163,12 +162,8 @@ public: inline QList findChildren(const QString &aName = QString(), Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { QList list; - union { - QList *typedList; - QList *voidList; - } u; - u.typedList = &list; - qt_qFindChildren_helper(this, aName, reinterpret_cast(0)->staticMetaObject, u.voidList, options); + qt_qFindChildren_helper(this, aName, reinterpret_cast(0)->staticMetaObject, + reinterpret_cast *>(&list), options); return list; } @@ -177,27 +172,19 @@ public: inline QList findChildren(const QRegExp &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { QList list; - union { - QList *typedList; - QList *voidList; - } u; - u.typedList = &list; - qt_qFindChildren_helper(this, re, reinterpret_cast(0)->staticMetaObject, u.voidList, options); + qt_qFindChildren_helper(this, re, reinterpret_cast(0)->staticMetaObject, + reinterpret_cast *>(&list), options); return list; } #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION template inline QList findChildren(const QRegularExpression &re, Qt::FindChildOptions options = Qt::FindChildrenRecursively) const { QList list; - union { - QList *typedList; - QList *voidList; - } u; - u.typedList = &list; - qt_qFindChildren_helper(this, re, reinterpret_cast(0)->staticMetaObject, u.voidList, options); + qt_qFindChildren_helper(this, re, reinterpret_cast(0)->staticMetaObject, + reinterpret_cast *>(&list), options); return list; } #endif @@ -279,27 +266,50 @@ public: static inline typename QtPrivate::QEnableIf::ArgumentCount == -1, QMetaObject::Connection>::Type connect(const typename QtPrivate::FunctionPointer::Object *sender, Func1 signal, Func2 slot) { +#if defined (Q_COMPILER_DECLTYPE) && defined (Q_COMPILER_VARIADIC_TEMPLATES) + typedef QtPrivate::FunctionPointer SignalType; + const int FunctorArgumentCount = QtPrivate::ComputeFunctorArgumentCount::Value; + + Q_STATIC_ASSERT_X((FunctorArgumentCount >= 0), + "Signal and slot arguments are not compatible."); + const int SlotArgumentCount = (FunctorArgumentCount >= 0) ? FunctorArgumentCount : 0; + typedef typename QtPrivate::FunctorReturnType::Value>::Value SlotReturnType; +#else + // Without variadic template, we don't detect the best overload of operator(). We just + // assume there is only one simple operator() and connect to &Func2::operator() + + /* If you get an error such as: + couldn't deduce template parameter 'Func2Operator' + or + cannot resolve address of overloaded function + It means the functor does not have a single operator(). + Functors with overloaded or templated operator() are only supported if the compiler supports + C++11 variadic templates + */ #ifndef Q_COMPILER_DECLTYPE //Workaround the lack of decltype using another function as indirection return connect_functor(sender, signal, slot, &Func2::operator()); } template static inline QMetaObject::Connection connect_functor(const QObject *sender, Func1 signal, Func2 slot, Func2Operator) { typedef QtPrivate::FunctionPointer SlotType ; #else - typedef QtPrivate::FunctionPointer SlotType ; #endif typedef QtPrivate::FunctionPointer SignalType; + typedef typename SlotType::ReturnType SlotReturnType; + const int SlotArgumentCount = SlotType::ArgumentCount; - Q_STATIC_ASSERT_X(int(SignalType::ArgumentCount) >= int(SlotType::ArgumentCount), + Q_STATIC_ASSERT_X(int(SignalType::ArgumentCount) >= SlotArgumentCount, "The slot requires more arguments than the signal provides."); Q_STATIC_ASSERT_X((QtPrivate::CheckCompatibleArguments::value), "Signal and slot arguments are not compatible."); - Q_STATIC_ASSERT_X((QtPrivate::AreArgumentsCompatible::value), +#endif + + Q_STATIC_ASSERT_X((QtPrivate::AreArgumentsCompatible::value), "Return type of the slot is not compatible with the return type of the signal."); return connectImpl(sender, reinterpret_cast(&signal), sender, 0, - new QtPrivate::QFunctorSlotObject::Value, + new QtPrivate::QFunctorSlotObject::Value, typename SignalType::ReturnType>(slot), Qt::DirectConnection, 0, &SignalType::Object::staticMetaObject); } @@ -367,7 +377,7 @@ public: Q_SIGNALS: void destroyed(QObject * = 0); void objectNameChanged(const QString &objectName -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -438,7 +448,7 @@ public: }; #endif -#ifdef qdoc +#ifdef Q_QDOC T qFindChild(const QObject *o, const QString &name = QString()); QList qFindChildren(const QObject *oobj, const QString &name = QString()); QList qFindChildren(const QObject *o, const QRegExp &re); @@ -508,8 +518,6 @@ namespace QtPrivate { QT_END_NAMESPACE -QT_END_HEADER - #endif #endif // QOBJECT_H diff --git a/src/corelib/kernel/qobject_impl.h b/src/corelib/kernel/qobject_impl.h index 7083ded..0b5631f 100644 --- a/src/corelib/kernel/qobject_impl.h +++ b/src/corelib/kernel/qobject_impl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,7 +45,10 @@ #error Do not include qobject_impl.h directly #endif -QT_BEGIN_HEADER +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif QT_BEGIN_NAMESPACE @@ -78,14 +81,14 @@ namespace QtPrivate { { static const int *types() { static const int t[4] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), 0 }; return t; } }; template struct ConnectionTypes > > >, true> - { static const int *types() { static const int t[4] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), + { static const int *types() { static const int t[5] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), 0 }; return t; } }; template struct ConnectionTypes > > > >, true> - { static const int *types() { static const int t[4] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), + { static const int *types() { static const int t[6] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), 0 }; return t; } }; template struct ConnectionTypes > > > > >, true> - { static const int *types() { static const int t[4] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), + { static const int *types() { static const int t[7] = { QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), QtPrivate::QMetaTypeIdHelper::qt_metatype_id(), 0 }; return t; } }; #else @@ -207,6 +210,4 @@ namespace QtPrivate { QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/kernel/qobjectcleanuphandler.h b/src/corelib/kernel/qobjectcleanuphandler.h index 68f4f43..1f053cc 100644 --- a/src/corelib/kernel/qobjectcleanuphandler.h +++ b/src/corelib/kernel/qobjectcleanuphandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ private Q_SLOTS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QOBJECTCLEANUPHANDLER_H diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h index 78a6827..afbe1a5 100644 --- a/src/corelib/kernel/qobjectdefs.h +++ b/src/corelib/kernel/qobjectdefs.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -483,6 +481,4 @@ inline const QMetaObject *QMetaObject::superClass() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QOBJECTDEFS_H diff --git a/src/corelib/kernel/qobjectdefs_impl.h b/src/corelib/kernel/qobjectdefs_impl.h index 7fd9800..4f44d92 100644 --- a/src/corelib/kernel/qobjectdefs_impl.h +++ b/src/corelib/kernel/qobjectdefs_impl.h @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Olivier Goffart ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,7 +46,10 @@ #error Do not include qobjectdefs_impl.h directly #endif -QT_BEGIN_HEADER +#if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif QT_BEGIN_NAMESPACE @@ -59,7 +63,7 @@ namespace QtPrivate { /* The following List classes are used to help to handle the list of arguments. It follow the same principles as the lisp lists. - List_Left take a list and a number as a parametter and returns (via the Value typedef, + List_Left take a list and a number as a parameter and returns (via the Value typedef, the list composed of the first N element of the list */ #ifndef Q_COMPILER_VARIADIC_TEMPLATES @@ -90,7 +94,7 @@ namespace QtPrivate { template struct ApplyReturnValue { void *data; - ApplyReturnValue(void *data_) : data(data_) {} + explicit ApplyReturnValue(void *data_) : data(data_) {} }; template void operator,(const T &value, const ApplyReturnValue &container) { @@ -113,7 +117,7 @@ namespace QtPrivate { - ArgumentCount is the number of argument, or -1 if it is unknown - the Object typedef is the Object of a pointer to member function - the Arguments typedef is the list of argument (in a QtPrivate::List) - - the Function typedef is an alias to the template parametter Func + - the Function typedef is an alias to the template parameter Func - the call(f,o,args) method is used to call that slot Args is the list of argument of the signal R is the return type of the signal @@ -594,13 +598,44 @@ namespace QtPrivate { enum { value = AreArgumentsCompatible::Type, typename RemoveConstRef::Type>::value && CheckCompatibleArguments, List>::value }; }; +#endif + +#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_VARIADIC_TEMPLATES) + /* + Find the maximum number of arguments a functor object can take and be still compatible with + the arguments from the signal. + Value is the number of arguments, or -1 if nothing matches. + */ + template struct ComputeFunctorArgumentCount; + + template struct ComputeFunctorArgumentCountHelper + { enum { Value = -1 }; }; + template + struct ComputeFunctorArgumentCountHelper, false> + : ComputeFunctorArgumentCount, sizeof...(ArgList)>::Value> {}; + + template struct ComputeFunctorArgumentCount> + { + template static D dummy(); + template static auto test(F f) -> decltype(((f.operator()((dummy())...)), int())); + static char test(...); + enum { + Ok = sizeof(test(dummy())) == sizeof(int), + Value = Ok ? sizeof...(ArgList) : int(ComputeFunctorArgumentCountHelper, Ok>::Value) + }; + }; + /* get the return type of a functor, given the signal argument list */ + template struct FunctorReturnType; + template struct FunctorReturnType> { + template static D dummy(); + typedef decltype(dummy().operator()((dummy())...)) Value; + }; #endif -} +} QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h index dee1543..230b6b6 100644 --- a/src/corelib/kernel/qpointer.h +++ b/src/corelib/kernel/qpointer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,67 +46,51 @@ #ifndef QT_NO_QOBJECT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QVariant; -class QPointerBase -{ - QWeakPointer wp; - -protected: - inline QPointerBase() : wp() { } - inline QPointerBase(QObject *p) : wp(p, true) { } - // compiler-generated copy/move ctor/assignment operators are fine! (even though public) - inline ~QPointerBase() { } - - inline QObject* data() const - { return wp.data(); } - - inline void assign(QObject *p) - { wp.assign(p); } - - inline bool isNull() const - { return wp.isNull(); } - - inline void clear() - { wp.clear(); } -}; - template -class QPointer : private QPointerBase +class QPointer { + template + struct TypeSelector + { + typedef QObject Type; + }; + template + struct TypeSelector + { + typedef const QObject Type; + }; + typedef typename TypeSelector::Type QObjectType; + QWeakPointer wp; public: inline QPointer() { } - inline QPointer(T *p) : QPointerBase(p) { } + inline QPointer(T *p) : wp(p, true) { } // compiler-generated copy/move ctor/assignment operators are fine! inline ~QPointer() { } inline QPointer &operator=(T* p) - { QPointerBase::assign(p); return *this; } + { wp.assign(static_cast(p)); return *this; } inline T* data() const - { return static_cast(QPointerBase::data()); } + { return static_cast( wp.data()); } inline T* operator->() const { return data(); } inline T& operator*() const { return *data(); } inline operator T*() const { return data(); } -#ifdef qdoc - inline bool isNull() const; - inline void clear(); -#else - using QPointerBase::isNull; - using QPointerBase::clear; -#endif + + inline bool isNull() const + { return wp.isNull(); } + + inline void clear() + { wp.clear(); } }; template Q_DECLARE_TYPEINFO_BODY(QPointer, Q_MOVABLE_TYPE); -#if (!defined(Q_CC_SUN) || (__SUNPRO_CC >= 0x580)) // ambiguity between const T * and T * - template inline bool operator==(const T *o, const QPointer &p) { return o == p.operator->(); } @@ -115,18 +99,6 @@ template inline bool operator==(const QPointer &p, const T *o) { return p.operator->() == o; } -#else - -template -inline bool operator==(const void *o, const QPointer &p) -{ return o == p.operator->(); } - -template -inline bool operator==(const QPointer &p, const void *o) -{ return p.operator->() == o; } - -#endif - template inline bool operator==(T *o, const QPointer &p) { return o == p.operator->(); } @@ -139,9 +111,6 @@ template inline bool operator==(const QPointer &p1, const QPointer &p2) { return p1.operator->() == p2.operator->(); } - -#if (!defined(Q_CC_SUN) || (__SUNPRO_CC >= 0x580)) // ambiguity between const T * and T * - template inline bool operator!=(const T *o, const QPointer &p) { return o != p.operator->(); } @@ -150,18 +119,6 @@ template inline bool operator!= (const QPointer &p, const T *o) { return p.operator->() != o; } -#else - -template -inline bool operator!= (const void *o, const QPointer &p) -{ return o != p.operator->(); } - -template -inline bool operator!= (const QPointer &p, const void *o) -{ return p.operator->() != o; } - -#endif - template inline bool operator!=(T *o, const QPointer &p) { return o != p.operator->(); } @@ -174,17 +131,6 @@ template inline bool operator!= (const QPointer &p1, const QPointer &p2) { return p1.operator->() != p2.operator->() ; } -// Make MSVC < 1400 (2005) handle "if (NULL == p)" syntax -#if defined(Q_CC_MSVC) && (_MSC_VER < 1400) -template -inline bool operator== (int i, const QPointer &p) -{ Q_ASSERT(i == 0); return !i && p.isNull(); } - -template -inline bool operator!= (int i, const QPointer &p) -{ Q_ASSERT(i == 0); return !i && !p.isNull(); } -#endif - template QPointer qPointerFromVariant(const QVariant &variant) @@ -194,8 +140,6 @@ qPointerFromVariant(const QVariant &variant) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QOBJECT #endif // QPOINTER_H diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index b9b94a0..6b44548 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -114,7 +112,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSHAREDMEMORY_H diff --git a/src/corelib/kernel/qsignalmapper.h b/src/corelib/kernel/qsignalmapper.h index bdffdfb..997e8e4 100644 --- a/src/corelib/kernel/qsignalmapper.h +++ b/src/corelib/kernel/qsignalmapper.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSignalMapperPrivate; @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSIGNALMAPPER_H diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index 35e73b7..8cc6b9c 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QSocketNotifierPrivate; @@ -70,7 +68,7 @@ public Q_SLOTS: Q_SIGNALS: void activated(int socket -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -84,6 +82,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSOCKETNOTIFIER_H diff --git a/src/corelib/kernel/qsystemsemaphore.h b/src/corelib/kernel/qsystemsemaphore.h index 931db7b..b7dd220 100644 --- a/src/corelib/kernel/qsystemsemaphore.h +++ b/src/corelib/kernel/qsystemsemaphore.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -96,7 +94,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSYSTEMSEMAPHORE_H diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index a3cc1c7..3484f4d 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,13 +42,13 @@ #ifndef QTIMER_H #define QTIMER_H +#include + #ifndef QT_NO_QOBJECT #include // conceptual inheritance #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -89,7 +89,7 @@ public Q_SLOTS: Q_SIGNALS: void timeout( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -114,8 +114,6 @@ inline void QTimer::setSingleShot(bool asingleShot) { single = asingleShot; } QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QOBJECT #endif // QTIMER_H diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index c87b9d8..c3957af 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTRANSLATOR_H diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 86b43cf..6f212f5 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -51,8 +51,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,8 +74,10 @@ class QRect; class QRectF; #ifndef QT_NO_REGEXP class QRegExp; -class QRegularExpression; #endif // QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION +class QRegularExpression; +#endif // QT_NO_REGULAREXPRESSION class QTextFormat; class QTextLength; class QUrl; @@ -240,11 +240,11 @@ class Q_CORE_EXPORT QVariant QVariant(const QLocale &locale); #ifndef QT_NO_REGEXP QVariant(const QRegExp ®Exp); -#ifndef QT_BOOTSRAPPED - QVariant(const QRegularExpression &re); -#endif // QT_BOOTSTRAPPED #endif // QT_NO_REGEXP #ifndef QT_BOOTSTRAPPED +#ifndef QT_NO_REGULAREXPRESSION + QVariant(const QRegularExpression &re); +#endif // QT_NO_REGULAREXPRESSION QVariant(const QUrl &url); QVariant(const QEasingCurve &easing); QVariant(const QUuid &uuid); @@ -253,7 +253,7 @@ class Q_CORE_EXPORT QVariant QVariant(const QJsonObject &jsonObject); QVariant(const QJsonArray &jsonArray); QVariant(const QJsonDocument &jsonDocument); -#endif +#endif // QT_BOOTSTRAPPED QVariant& operator=(const QVariant &other); #ifdef Q_COMPILER_RVALUE_REFS @@ -313,11 +313,11 @@ class Q_CORE_EXPORT QVariant QLocale toLocale() const; #ifndef QT_NO_REGEXP QRegExp toRegExp() const; -#ifndef QT_BOOTSTRAPPED - QRegularExpression toRegularExpression() const; -#endif // QT_BOOTSTRAPPED #endif // QT_NO_REGEXP #ifndef QT_BOOTSTRAPPED +#ifndef QT_NO_REGULAREXPRESSION + QRegularExpression toRegularExpression() const; +#endif // QT_NO_REGULAREXPRESSION QUrl toUrl() const; QEasingCurve toEasingCurve() const; QUuid toUuid() const; @@ -326,7 +326,7 @@ class Q_CORE_EXPORT QVariant QJsonObject toJsonObject() const; QJsonArray toJsonArray() const; QJsonDocument toJsonDocument() const; -#endif +#endif // QT_BOOTSTRAPPED #ifndef QT_NO_DATASTREAM void load(QDataStream &ds); @@ -355,7 +355,7 @@ class Q_CORE_EXPORT QVariant { return canConvert(qMetaTypeId()); } public: -#ifndef qdoc +#ifndef Q_QDOC struct PrivateShared { inline PrivateShared(void *v) : ptr(v), ref(1) { } @@ -484,7 +484,7 @@ public: template inline QVariant qVariantFromValue(const T &t) { - return QVariant(qMetaTypeId(reinterpret_cast(0)), &t, QTypeInfo::isPointer); + return QVariant(qMetaTypeId(), &t, QTypeInfo::isPointer); } template <> @@ -494,7 +494,7 @@ template inline void qVariantSetValue(QVariant &v, const T &t) { //if possible we reuse the current QVariant private - const uint type = qMetaTypeId(reinterpret_cast(0)); + const uint type = qMetaTypeId(); QVariant::Private &d = v.data_ptr(); if (v.isDetached() && (type == d.type || (type <= uint(QVariant::Char) && d.type <= uint(QVariant::Char)))) { d.type = type; @@ -533,7 +533,7 @@ inline bool QVariant::isDetached() const { return !d.is_shared || d.data.shared->ref.load() == 1; } -#ifdef qdoc +#ifdef Q_QDOC inline bool operator==(const QVariant &v1, const QVariant &v2); inline bool operator!=(const QVariant &v1, const QVariant &v2); #else @@ -568,7 +568,7 @@ namespace QtPrivate { { static T metaType(const QVariant &v) { - const int vid = qMetaTypeId(static_cast(0)); + const int vid = qMetaTypeId(); if (vid == v.userType()) return *reinterpret_cast(v.constData()); if (vid < int(QMetaType::User)) { @@ -620,6 +620,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QVariant::Type); QT_END_NAMESPACE -QT_END_HEADER - #endif // QVARIANT_H diff --git a/src/corelib/kernel/qwineventnotifier.h b/src/corelib/kernel/qwineventnotifier.h index d5e4d0f..56605d9 100644 --- a/src/corelib/kernel/qwineventnotifier.h +++ b/src/corelib/kernel/qwineventnotifier.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,15 +42,10 @@ #ifndef QWINEVENTNOTIFIER_H #define QWINEVENTNOTIFIER_H -#if 0 -// inform syncqt -#pragma qt_no_master_include -#endif - #include "QtCore/qobject.h" -#include "QtCore/qt_windows.h" -QT_BEGIN_HEADER +#ifdef Q_OS_WIN +#include "QtCore/qt_windows.h" QT_BEGIN_NAMESPACE @@ -75,7 +70,7 @@ public Q_SLOTS: Q_SIGNALS: void activated(HANDLE hEvent -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); @@ -86,6 +81,6 @@ protected: QT_END_NAMESPACE -QT_END_HEADER +#endif // Q_OS_WIN #endif // QWINEVENTNOTIFIER_H diff --git a/src/corelib/mimetypes/qmimedatabase.h b/src/corelib/mimetypes/qmimedatabase.h index a1c1736..17684e4 100644 --- a/src/corelib/mimetypes/qmimedatabase.h +++ b/src/corelib/mimetypes/qmimedatabase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,7 +45,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QByteArray; @@ -90,6 +89,4 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QMIMEDATABASE_H diff --git a/src/corelib/mimetypes/qmimetype.h b/src/corelib/mimetypes/qmimetype.h index 150a799..24d043e 100644 --- a/src/corelib/mimetypes/qmimetype.h +++ b/src/corelib/mimetypes/qmimetype.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,7 +45,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE class QMimeTypePrivate; @@ -112,6 +111,4 @@ protected: Q_DECLARE_SHARED(QMimeType) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMIMETYPE_H diff --git a/src/corelib/plugin/qfactoryinterface.h b/src/corelib/plugin/qfactoryinterface.h index c0115d8..88fb1bf 100644 --- a/src/corelib/plugin/qfactoryinterface.h +++ b/src/corelib/plugin/qfactoryinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,6 +59,4 @@ Q_DECLARE_INTERFACE(QFactoryInterface, "org.qt-project.Qt.QFactoryInterface") QT_END_NAMESPACE -QT_END_HEADER - #endif // QFACTORYINTERFACE_H diff --git a/src/corelib/plugin/qlibrary.h b/src/corelib/plugin/qlibrary.h index 96ba661..865bb8c 100644 --- a/src/corelib/plugin/qlibrary.h +++ b/src/corelib/plugin/qlibrary.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,16 +44,8 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE - -#if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) -#undef QT_NO_LIBRARY -#pragma message("QT_NO_LIBRARY is not supported on Windows") -#endif - #ifndef QT_NO_LIBRARY class QLibraryPrivate; @@ -111,6 +103,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QLibrary::LoadHints) QT_END_NAMESPACE -QT_END_HEADER - #endif //QLIBRARY_H diff --git a/src/corelib/plugin/qplugin.h b/src/corelib/plugin/qplugin.h index f212eaa..b91a0e9 100644 --- a/src/corelib/plugin/qplugin.h +++ b/src/corelib/plugin/qplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ void Q_CORE_EXPORT qRegisterStaticPluginFunction(QStaticPlugin staticPlugin); QT_END_NAMESPACE -QT_END_HEADER - #endif // Q_PLUGIN_H diff --git a/src/corelib/plugin/qpluginloader.h b/src/corelib/plugin/qpluginloader.h index 46fc35a..8f8833e 100644 --- a/src/corelib/plugin/qpluginloader.h +++ b/src/corelib/plugin/qpluginloader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,15 +44,8 @@ #include -#if defined(QT_NO_LIBRARY) && defined(Q_OS_WIN) -#undef QT_NO_LIBRARY -#pragma message("QT_NO_LIBRARY is not supported on Windows") -#endif - #ifndef QT_NO_LIBRARY -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QLibraryPrivate; @@ -93,8 +86,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_LIBRARY #endif //QPLUGINLOADER_H diff --git a/src/corelib/plugin/quuid.h b/src/corelib/plugin/quuid.h index d1b5600..31b9890 100644 --- a/src/corelib/plugin/quuid.h +++ b/src/corelib/plugin/quuid.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - #if defined(Q_OS_WIN) #ifndef GUID_DEFINED #define GUID_DEFINED @@ -84,11 +82,11 @@ public: Sha1 = 5 // 0 1 0 1 }; -#ifdef Q_COMPILER_INITIALIZER_LISTS // UNIFORM_INITIALIZATION - Q_DECL_CONSTEXPR QUuid() - : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {} +#if defined(Q_COMPILER_INITIALIZER_LISTS) && !defined(Q_QDOC) + Q_DECL_CONSTEXPR QUuid() : data1(0), data2(0), data3(0), data4{0,0,0,0,0,0,0,0} {} - Q_DECL_CONSTEXPR QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) + Q_DECL_CONSTEXPR QUuid(uint l, ushort w1, ushort w2, uchar b1, uchar b2, uchar b3, + uchar b4, uchar b5, uchar b6, uchar b7, uchar b8) : data1(l), data2(w1), data3(w2), data4{b1, b2, b3, b4, b5, b6, b7, b8} {} #else QUuid() @@ -149,7 +147,7 @@ public: #if defined(Q_OS_WIN) // On Windows we have a type GUID that is used by the platform API, so we // provide convenience operators to cast from and to this type. -#ifdef Q_COMPILER_INITIALIZER_LISTS // UNIFORM_INITIALIZATION +#if defined(Q_COMPILER_INITIALIZER_LISTS) && !defined(Q_QDOC) Q_DECL_CONSTEXPR QUuid(const GUID &guid) : data1(guid.Data1), data2(guid.Data2), data3(guid.Data3), data4{guid.Data4[0], guid.Data4[1], guid.Data4[2], guid.Data4[3], @@ -227,6 +225,4 @@ Q_CORE_EXPORT uint qHash(const QUuid &uuid, uint seed = 0) Q_DECL_NOTHROW; QT_END_NAMESPACE -QT_END_HEADER - #endif // QUUID_H diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h index 370414e..a6ac248 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -66,12 +64,12 @@ public: Q_SIGNALS: void entered( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void exited( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -96,6 +94,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index f9790bc..a35ad4c 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -89,7 +87,7 @@ public: Q_SIGNALS: void triggered( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -113,6 +111,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index 84a72eb..f53a5e4 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -89,6 +87,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index 4540c0b..0343b99 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -74,6 +72,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index dfa6155..62278ac 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -89,6 +87,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index 81bf6e2..12f021d 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -84,6 +82,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index cad2691..a5f2509 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -101,12 +99,12 @@ public: Q_SIGNALS: void finished( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void propertiesAssigned( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -129,6 +127,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 256471e..9305676 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -154,12 +152,12 @@ public Q_SLOTS: Q_SIGNALS: void started( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void stopped( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -195,6 +193,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/thread/qatomic.h b/src/corelib/thread/qatomic.h index 1000180..1ccaecc 100644 --- a/src/corelib/thread/qatomic.h +++ b/src/corelib/thread/qatomic.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -81,7 +79,7 @@ public: return *this; } -#ifdef qdoc +#ifdef Q_QDOC int load() const; int loadAcquire() const; void store(int newValue); @@ -143,7 +141,7 @@ public: return *this; } -#ifdef qdoc +#ifdef Q_QDOC T *load() const; T *loadAcquire() const; void store(T *newValue); @@ -220,6 +218,4 @@ inline void qAtomicDetach(T *&d) } QT_END_NAMESPACE -QT_END_HEADER - #endif // QATOMIC_H diff --git a/src/corelib/thread/qbasicatomic.h b/src/corelib/thread/qbasicatomic.h index 4177ddb..cf0a6a5 100644 --- a/src/corelib/thread/qbasicatomic.h +++ b/src/corelib/thread/qbasicatomic.h @@ -39,12 +39,12 @@ ** ****************************************************************************/ +#include + #ifndef QBASICATOMIC_H #define QBASICATOMIC_H -#include - -#if defined(QT_MOC) || defined(QT_BUILD_QMAKE) || defined(QT_RCC) || defined(QT_UIC) || defined(QT_BOOTSTRAPPED) +#if defined(QT_BOOTSTRAPPED) # include // Compiler dependent implementation @@ -101,15 +101,11 @@ // Only include if the implementation has been ported to QAtomicOps #ifndef QOLDBASICATOMIC_H -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif @@ -117,10 +113,10 @@ QT_END_HEADER // New atomics #if defined(Q_COMPILER_CONSTEXPR) && defined(Q_COMPILER_DEFAULT_MEMBERS) && defined(Q_COMPILER_DELETE_MEMBERS) -# if defined(Q_CC_CLANG) && ((((__clang_major__ * 100) + __clang_minor__) < 302) \ +# if defined(Q_CC_CLANG) && ((((__clang_major__ * 100) + __clang_minor__) < 303) \ || defined(__apple_build_version__) \ ) - /* Do not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for "stock" clang before version 3.2. + /* Do not define QT_BASIC_ATOMIC_HAS_CONSTRUCTORS for "stock" clang before version 3.3. Apple's version has different (higher!) version numbers, so disable it for all of them for now. (The only way to distinguish between them seems to be a check for __apple_build_version__ .) @@ -271,8 +267,6 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QOLDBASICATOMIC_H #endif // QBASICATOMIC_H diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h index d24b291..accf0fc 100644 --- a/src/corelib/thread/qexception.h +++ b/src/corelib/thread/qexception.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -53,7 +53,6 @@ # include #endif -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -116,7 +115,6 @@ public: #endif // QT_NO_EXCEPTIONS QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_QFUTURE diff --git a/src/corelib/thread/qfuture.h b/src/corelib/thread/qfuture.h index 8b16f30..8071e80 100644 --- a/src/corelib/thread/qfuture.h +++ b/src/corelib/thread/qfuture.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,7 +49,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -269,7 +268,6 @@ QFuture qToVoidFuture(const QFuture &future) } QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_QFUTURE diff --git a/src/corelib/thread/qfutureinterface.h b/src/corelib/thread/qfutureinterface.h index ea39c86..e0a5969 100644 --- a/src/corelib/thread/qfutureinterface.h +++ b/src/corelib/thread/qfutureinterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,7 +50,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -235,7 +234,7 @@ inline void QFutureInterface::reportResults(const QVector &_results, int b this->reportResultsReady(resultCountBefore, store.count()); } else { const int insertIndex = store.addResults(beginIndex, &_results, count); - this->reportResultsReady(insertIndex, insertIndex + _results.count()); + this->reportResultsReady(insertIndex, insertIndex + _results.count()); } } @@ -310,8 +309,6 @@ public: }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QFUTURE #endif // QFUTUREINTERFACE_H diff --git a/src/corelib/thread/qfuturesynchronizer.h b/src/corelib/thread/qfuturesynchronizer.h index 12edcfb..39dbfc5 100644 --- a/src/corelib/thread/qfuturesynchronizer.h +++ b/src/corelib/thread/qfuturesynchronizer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,7 +46,6 @@ #ifndef QT_NO_QFUTURE -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -81,7 +80,7 @@ public: m_futures[i].cancel(); } } - + for (int i = 0; i < m_futures.count(); ++i) { m_futures[i].waitForFinished(); } @@ -113,8 +112,6 @@ protected: }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QFUTURE #endif // QFUTURESYNCHRONIZER_H diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h index 005a0b1..c78ed7a 100644 --- a/src/corelib/thread/qfuturewatcher.h +++ b/src/corelib/thread/qfuturewatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,7 +48,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -131,7 +130,7 @@ public: T result() const { return m_future.result(); } T resultAt(int index) const { return m_future.resultAt(index); } -#ifdef qdoc +#ifdef Q_QDOC int progressValue() const; int progressMinimum() const; int progressMaximum() const; @@ -215,8 +214,6 @@ Q_INLINE_TEMPLATE void QFutureWatcher::setFuture(const QFuture &_fut } QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_QFUTURE #endif // QFUTUREWATCHER_H diff --git a/src/corelib/thread/qgenericatomic.h b/src/corelib/thread/qgenericatomic.h index 90f0223..a0a851e 100644 --- a/src/corelib/thread/qgenericatomic.h +++ b/src/corelib/thread/qgenericatomic.h @@ -44,14 +44,12 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -241,6 +239,4 @@ template struct QGenericAtomicOps #undef always_inline QT_END_NAMESPACE -QT_END_HEADER - #endif // QGENERICATOMIC_H diff --git a/src/corelib/thread/qmutex.h b/src/corelib/thread/qmutex.h index 86b3db2..0bca0de 100644 --- a/src/corelib/thread/qmutex.h +++ b/src/corelib/thread/qmutex.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,12 +46,10 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE -#if !defined(QT_NO_THREAD) && !defined(qdoc) +#if !defined(QT_NO_THREAD) && !defined(Q_QDOC) #ifdef Q_OS_LINUX # define QT_MUTEX_LOCK_NOEXCEPT Q_DECL_NOTHROW @@ -173,7 +171,7 @@ private: quintptr val; }; -#else // QT_NO_THREAD or qdoc +#else // QT_NO_THREAD or Q_QDOC class Q_CORE_EXPORT QMutex { @@ -207,10 +205,8 @@ private: typedef QMutex QBasicMutex; -#endif // QT_NO_THREAD or qdoc +#endif // QT_NO_THREAD or Q_QDOC QT_END_NAMESPACE -QT_END_HEADER - #endif // QMUTEX_H diff --git a/src/corelib/thread/qoldbasicatomic.h b/src/corelib/thread/qoldbasicatomic.h index eac77ab..b755256 100644 --- a/src/corelib/thread/qoldbasicatomic.h +++ b/src/corelib/thread/qoldbasicatomic.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,16 +44,13 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #if 0 // silence syncqt warnings QT_END_NAMESPACE -QT_END_HEADER - +#pragma qt_sync_skip_header_check #pragma qt_no_master_include #pragma qt_sync_stop_processing #endif @@ -142,6 +139,5 @@ public: #define Q_BASIC_ATOMIC_INITIALIZER(a) { (a) } QT_END_NAMESPACE -QT_END_HEADER #endif // QOLDBASICATOMIC_H diff --git a/src/corelib/thread/qreadwritelock.h b/src/corelib/thread/qreadwritelock.h index 39c34a4..6815878 100644 --- a/src/corelib/thread/qreadwritelock.h +++ b/src/corelib/thread/qreadwritelock.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -231,6 +229,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QREADWRITELOCK_H diff --git a/src/corelib/thread/qresultstore.h b/src/corelib/thread/qresultstore.h index d084e24..11ce239 100644 --- a/src/corelib/thread/qresultstore.h +++ b/src/corelib/thread/qresultstore.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,7 +49,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -61,7 +60,7 @@ QT_BEGIN_NAMESPACE either individually or in batches. */ -#ifndef qdoc +#ifndef Q_QDOC namespace QtPrivate { @@ -149,7 +148,7 @@ protected: bool m_filterMode; QMap pendingResults; int filteredResults; - + }; template @@ -231,10 +230,9 @@ public: } // namespace QtPrivate -#endif //qdoc +#endif //Q_QDOC QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_QFUTURE diff --git a/src/corelib/thread/qrunnable.h b/src/corelib/thread/qrunnable.h index fbd241c..a6cc095 100644 --- a/src/corelib/thread/qrunnable.h +++ b/src/corelib/thread/qrunnable.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -67,6 +66,5 @@ public: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/corelib/thread/qsemaphore.h b/src/corelib/thread/qsemaphore.h index 067f900..4020015 100644 --- a/src/corelib/thread/qsemaphore.h +++ b/src/corelib/thread/qsemaphore.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSEMAPHORE_H diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index f7ae95f..19c0f82 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,12 +111,12 @@ public: Q_SIGNALS: void started( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); void finished( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -164,6 +162,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTHREAD_H diff --git a/src/corelib/thread/qthreadpool.h b/src/corelib/thread/qthreadpool.h index da7cf43..ffc16de 100644 --- a/src/corelib/thread/qthreadpool.h +++ b/src/corelib/thread/qthreadpool.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,7 +49,6 @@ #ifndef QT_NO_THREAD -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -87,7 +86,6 @@ public: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QT_NO_THREAD diff --git a/src/corelib/thread/qthreadstorage.h b/src/corelib/thread/qthreadstorage.h index 5c3d7f5..86285de 100644 --- a/src/corelib/thread/qthreadstorage.h +++ b/src/corelib/thread/qthreadstorage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #ifndef QT_NO_THREAD -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -156,8 +154,6 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_THREAD #endif // QTHREADSTORAGE_H diff --git a/src/corelib/thread/qwaitcondition.h b/src/corelib/thread/qwaitcondition.h index db36213..1468951 100644 --- a/src/corelib/thread/qwaitcondition.h +++ b/src/corelib/thread/qwaitcondition.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,6 +97,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QWAITCONDITION_H diff --git a/src/corelib/tools/qalgorithms.h b/src/corelib/tools/qalgorithms.h index 356f524..e3b7688 100644 --- a/src/corelib/tools/qalgorithms.h +++ b/src/corelib/tools/qalgorithms.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,7 +138,7 @@ inline void qCount(const Container &container, const T &value, Size &n) qCount(container.constBegin(), container.constEnd(), value, n); } -#ifdef qdoc +#ifdef Q_QDOC template LessThan qLess() { @@ -520,6 +518,4 @@ Q_OUTOFLINE_TEMPLATE RandomAccessIterator qBinaryFindHelper(RandomAccessIterator QT_END_NAMESPACE -QT_END_HEADER - #endif // QALGORITHMS_H diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h index 7fecbbb..27f2606 100644 --- a/src/corelib/tools/qarraydata.h +++ b/src/corelib/tools/qarraydata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE struct Q_CORE_EXPORT QArrayData @@ -361,6 +359,4 @@ namespace QtPrivate { QT_END_NAMESPACE -QT_END_HEADER - #endif // include guard diff --git a/src/corelib/tools/qarraydataops.h b/src/corelib/tools/qarraydataops.h index ceb65db..3cd8c51 100644 --- a/src/corelib/tools/qarraydataops.h +++ b/src/corelib/tools/qarraydataops.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QtPrivate { @@ -423,6 +421,4 @@ struct QArrayDataOps QT_END_NAMESPACE -QT_END_HEADER - #endif // include guard diff --git a/src/corelib/tools/qarraydatapointer.h b/src/corelib/tools/qarraydatapointer.h index 766d4a4..533f7a3 100644 --- a/src/corelib/tools/qarraydatapointer.h +++ b/src/corelib/tools/qarraydatapointer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE template @@ -219,6 +217,4 @@ namespace std } } -QT_END_HEADER - #endif // include guard diff --git a/src/corelib/tools/qbitarray.h b/src/corelib/tools/qbitarray.h index 133f829..1103712 100644 --- a/src/corelib/tools/qbitarray.h +++ b/src/corelib/tools/qbitarray.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -176,6 +174,4 @@ Q_DECLARE_SHARED(QBitArray) QT_END_NAMESPACE -QT_END_HEADER - #endif // QBITARRAY_H diff --git a/src/corelib/tools/qbytearray.h b/src/corelib/tools/qbytearray.h index 50e52a1..f3cc301 100644 --- a/src/corelib/tools/qbytearray.h +++ b/src/corelib/tools/qbytearray.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -66,8 +66,6 @@ #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -581,11 +579,11 @@ inline QByteArray &QByteArray::replace(const char *before, const char *after) { return replace(before, qstrlen(before), after, qstrlen(after)); } inline QByteArray &QByteArray::setNum(short n, int base) -{ return setNum(qlonglong(n), base); } +{ return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(ushort(n)), base); } inline QByteArray &QByteArray::setNum(ushort n, int base) { return setNum(qulonglong(n), base); } inline QByteArray &QByteArray::setNum(int n, int base) -{ return setNum(qlonglong(n), base); } +{ return base == 10 ? setNum(qlonglong(n), base) : setNum(qulonglong(uint(n)), base); } inline QByteArray &QByteArray::setNum(uint n, int base) { return setNum(qulonglong(n), base); } inline QByteArray &QByteArray::setNum(float n, char f, int prec) @@ -610,8 +608,6 @@ Q_DECLARE_SHARED(QByteArray) QT_END_NAMESPACE -QT_END_HEADER - #ifdef QT_USE_QSTRINGBUILDER #include #endif diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index ae03af1..da6a337 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,6 +95,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QBYTEARRAYMATCHER_H diff --git a/src/corelib/tools/qcache.h b/src/corelib/tools/qcache.h index 386deab..5890a94 100644 --- a/src/corelib/tools/qcache.h +++ b/src/corelib/tools/qcache.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -200,6 +198,4 @@ void QCache::trim(int m) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCACHE_H diff --git a/src/corelib/tools/qchar.h b/src/corelib/tools/qchar.h index aeb9848..8afa05b 100644 --- a/src/corelib/tools/qchar.h +++ b/src/corelib/tools/qchar.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -137,6 +135,130 @@ public: Symbol_Other // So }; + enum Script + { + Script_Unknown, + Script_Inherited, + Script_Common, + + Script_Latin, + Script_Greek, + Script_Cyrillic, + Script_Armenian, + Script_Hebrew, + Script_Arabic, + Script_Syriac, + Script_Thaana, + Script_Devanagari, + Script_Bengali, + Script_Gurmukhi, + Script_Gujarati, + Script_Oriya, + Script_Tamil, + Script_Telugu, + Script_Kannada, + Script_Malayalam, + Script_Sinhala, + Script_Thai, + Script_Lao, + Script_Tibetan, + Script_Myanmar, + Script_Georgian, + Script_Hangul, + Script_Ethiopic, + Script_Cherokee, + Script_CanadianAboriginal, + Script_Ogham, + Script_Runic, + Script_Khmer, + Script_Mongolian, + Script_Hiragana, + Script_Katakana, + Script_Bopomofo, + Script_Han, + Script_Yi, + Script_OldItalic, + Script_Gothic, + Script_Deseret, + Script_Tagalog, + Script_Hanunoo, + Script_Buhid, + Script_Tagbanwa, + Script_Coptic, + + // Unicode 4.0 additions + Script_Limbu, + Script_TaiLe, + Script_LinearB, + Script_Ugaritic, + Script_Shavian, + Script_Osmanya, + Script_Cypriot, + Script_Braille, + + // Unicode 4.1 additions + Script_Buginese, + Script_NewTaiLue, + Script_Glagolitic, + Script_Tifinagh, + Script_SylotiNagri, + Script_OldPersian, + Script_Kharoshthi, + + // Unicode 5.0 additions + Script_Balinese, + Script_Cuneiform, + Script_Phoenician, + Script_PhagsPa, + Script_Nko, + + // Unicode 5.1 additions + Script_Sundanese, + Script_Lepcha, + Script_OlChiki, + Script_Vai, + Script_Saurashtra, + Script_KayahLi, + Script_Rejang, + Script_Lycian, + Script_Carian, + Script_Lydian, + Script_Cham, + + // Unicode 5.2 additions + Script_TaiTham, + Script_TaiViet, + Script_Avestan, + Script_EgyptianHieroglyphs, + Script_Samaritan, + Script_Lisu, + Script_Bamum, + Script_Javanese, + Script_MeeteiMayek, + Script_ImperialAramaic, + Script_OldSouthArabian, + Script_InscriptionalParthian, + Script_InscriptionalPahlavi, + Script_OldTurkic, + Script_Kaithi, + + // Unicode 6.0 additions + Script_Batak, + Script_Brahmi, + Script_Mandaic, + + // Unicode 6.1 additions + Script_Chakma, + Script_MeroiticCursive, + Script_MeroiticHieroglyphs, + Script_Miao, + Script_Sharada, + Script_SoraSompeng, + Script_Takri, + + ScriptCount + }; + enum Direction { DirL, DirR, DirEN, DirES, DirET, DirAN, DirCS, DirB, DirS, DirWS, DirON, @@ -231,6 +353,8 @@ public: inline QChar toTitleCase() const { return QChar::toTitleCase(ucs); } inline QChar toCaseFolded() const { return QChar::toCaseFolded(ucs); } + inline Script script() const { return QChar::script(ucs); } + inline UnicodeVersion unicodeVersion() const { return QChar::unicodeVersion(ucs); } #if QT_DEPRECATED_SINCE(5, 0) @@ -316,6 +440,8 @@ public: static uint QT_FASTCALL toTitleCase(uint ucs4); static uint QT_FASTCALL toCaseFolded(uint ucs4); + static Script QT_FASTCALL script(uint ucs4); + static UnicodeVersion QT_FASTCALL unicodeVersion(uint ucs4); static UnicodeVersion QT_FASTCALL currentUnicodeVersion(); @@ -398,6 +524,4 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QChar &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QCHAR_H diff --git a/src/corelib/tools/qcontainerfwd.h b/src/corelib/tools/qcontainerfwd.h index 9cf063f..6b79e40 100644 --- a/src/corelib/tools/qcontainerfwd.h +++ b/src/corelib/tools/qcontainerfwd.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,6 +63,4 @@ template class QVector; QT_END_NAMESPACE -QT_END_HEADER - #endif // QCONTAINERFWD_H diff --git a/src/corelib/tools/qcontiguouscache.h b/src/corelib/tools/qcontiguouscache.h index e1cc65f..d601ddb 100644 --- a/src/corelib/tools/qcontiguouscache.h +++ b/src/corelib/tools/qcontiguouscache.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #undef QT_QCONTIGUOUSCACHE_DEBUG @@ -464,6 +462,4 @@ inline T QContiguousCache::takeLast() QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qcryptographichash.h b/src/corelib/tools/qcryptographichash.h index 177c5c9..d4e75c4 100644 --- a/src/corelib/tools/qcryptographichash.h +++ b/src/corelib/tools/qcryptographichash.h @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Richard J. Moore . ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +45,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -62,7 +61,11 @@ public: Sha224, Sha256, Sha384, - Sha512 + Sha512, + Sha3_224, + Sha3_256, + Sha3_384, + Sha3_512 }; explicit QCryptographicHash(Algorithm method); @@ -84,6 +87,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qdatetime.h b/src/corelib/tools/qdatetime.h index 22db5a4..5c16680 100644 --- a/src/corelib/tools/qdatetime.h +++ b/src/corelib/tools/qdatetime.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -264,6 +262,10 @@ public: private: friend class QDateTimePrivate; void detach(); + + // ### Qt6: Using a private here has high impact on runtime + // on users such as QFileInfo. In Qt 6, the data members + // should be inlined. QExplicitlySharedDataPointer d; #ifndef QT_NO_DATASTREAM @@ -296,6 +298,4 @@ Q_CORE_EXPORT uint qHash(const QTime &key, uint seed = 0) Q_DECL_NOTHROW; QT_END_NAMESPACE -QT_END_HEADER - #endif // QDATETIME_H diff --git a/src/corelib/tools/qeasingcurve.h b/src/corelib/tools/qeasingcurve.h index b00cdb0..2e65754 100644 --- a/src/corelib/tools/qeasingcurve.h +++ b/src/corelib/tools/qeasingcurve.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ # include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -142,6 +140,4 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QEasingCurve &); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qelapsedtimer.h b/src/corelib/tools/qelapsedtimer.h index 9729b72..b06afe4 100644 --- a/src/corelib/tools/qelapsedtimer.h +++ b/src/corelib/tools/qelapsedtimer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -89,6 +87,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QELAPSEDTIMER_H diff --git a/src/corelib/tools/qhash.h b/src/corelib/tools/qhash.h index 169b32a..e99a67d 100644 --- a/src/corelib/tools/qhash.h +++ b/src/corelib/tools/qhash.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,7 +48,9 @@ #include #include -QT_BEGIN_HEADER +#ifdef Q_COMPILER_INITIALIZER_LISTS +#include +#endif QT_BEGIN_NAMESPACE @@ -90,6 +92,7 @@ Q_CORE_EXPORT uint qHash(const QStringRef &key, uint seed = 0) Q_DECL_NOTHROW; Q_CORE_EXPORT uint qHash(const QBitArray &key, uint seed = 0) Q_DECL_NOTHROW; Q_CORE_EXPORT uint qHash(QLatin1String key, uint seed = 0) Q_DECL_NOTHROW; Q_CORE_EXPORT uint qt_hash(const QString &key) Q_DECL_NOTHROW; +Q_CORE_EXPORT uint qt_hash(const QStringRef &key) Q_DECL_NOTHROW; #if defined(Q_CC_MSVC) #pragma warning( push ) @@ -285,6 +288,15 @@ class QHash public: inline QHash() : d(const_cast(&QHashData::shared_null)) { } +#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QHash(std::initializer_list > list) + : d(const_cast(&QHashData::shared_null)) + { + reserve(list.size()); + for (typename std::initializer_list >::const_iterator it = list.begin(); it != list.end(); ++it) + insert(it->first, it->second); + } +#endif inline QHash(const QHash &other) : d(other.d) { d->ref.ref(); if (!d->sharable) detach(); } inline ~QHash() { if (!d->ref.deref()) freeData(d); } @@ -921,6 +933,14 @@ class QMultiHash : public QHash { public: QMultiHash() {} +#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QMultiHash(std::initializer_list > list) + { + this->reserve(list.size()); + for (typename std::initializer_list >::const_iterator it = list.begin(); it != list.end(); ++it) + insert(it->first, it->second); + } +#endif QMultiHash(const QHash &other) : QHash(other) {} inline void swap(QMultiHash &other) { QHash::swap(other); } // prevent QMultiHash<->QHash swaps @@ -1034,6 +1054,4 @@ Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR(Hash) QT_END_NAMESPACE -QT_END_HEADER - #endif // QHASH_H diff --git a/src/corelib/tools/qiterator.h b/src/corelib/tools/qiterator.h index 7775bb2..3b86edd 100644 --- a/src/corelib/tools/qiterator.h +++ b/src/corelib/tools/qiterator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define Q_DECLARE_SEQUENTIAL_ITERATOR(C) \ @@ -190,6 +188,4 @@ public: \ QT_END_NAMESPACE -QT_END_HEADER - #endif // QITERATOR_H diff --git a/src/corelib/tools/qline.h b/src/corelib/tools/qline.h index 989f430..69e8a82 100644 --- a/src/corelib/tools/qline.h +++ b/src/corelib/tools/qline.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -421,6 +419,4 @@ Q_CORE_EXPORT QDataStream &operator>>(QDataStream &, QLineF &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QLINE_H diff --git a/src/corelib/tools/qlinkedlist.h b/src/corelib/tools/qlinkedlist.h index 06ee5ce..b9ca1b9 100644 --- a/src/corelib/tools/qlinkedlist.h +++ b/src/corelib/tools/qlinkedlist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -501,6 +499,4 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(LinkedList) QT_END_NAMESPACE -QT_END_HEADER - #endif // QLINKEDLIST_H diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h index f5858bf..0592c24 100644 --- a/src/corelib/tools/qlist.h +++ b/src/corelib/tools/qlist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -57,8 +57,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -368,7 +366,7 @@ Q_INLINE_TEMPLATE void QList::node_construct(Node *n, const T &t) else *reinterpret_cast(n) = t; #else // This is always safe, but penaltizes unoptimized builds a lot. - else ::memcpy(n, &t, sizeof(T)); + else ::memcpy(n, static_cast(&t), sizeof(T)); #endif } @@ -910,6 +908,4 @@ Q_DECLARE_MUTABLE_SEQUENTIAL_ITERATOR(List) QT_END_NAMESPACE -QT_END_HEADER - #endif // QLIST_H diff --git a/src/corelib/tools/qlocale.h b/src/corelib/tools/qlocale.h index 6b6beef..78fa336 100644 --- a/src/corelib/tools/qlocale.h +++ b/src/corelib/tools/qlocale.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -67,7 +65,9 @@ class Q_CORE_EXPORT QLocale Q_GADGET Q_ENUMS(Language) Q_ENUMS(Country) + Q_ENUMS(MeasurementSystem) friend class QString; + friend class QStringRef; friend class QByteArray; friend class QIntValidator; friend class QDoubleValidatorPrivate; @@ -206,7 +206,7 @@ public: Turkish = 125, Turkmen = 126, Tahitian = 127, - Uigur = 128, + Uighur = 128, Ukrainian = 129, Urdu = 130, Uzbek = 131, @@ -339,6 +339,57 @@ public: Kako = 258, Meta = 259, Ngiemboon = 260, + Aragonese = 261, + Akkadian = 262, + AncientEgyptian = 263, + AncientGreek = 264, + Aramaic = 265, + Balinese = 266, + Bamun = 267, + BatakToba = 268, + Buginese = 269, + Buhid = 270, + Carian = 271, + Chakma = 272, + ClassicalMandaic = 273, + Coptic = 274, + Dogri = 275, + EasternCham = 276, + EasternKayah = 277, + Etruscan = 278, + Gothic = 279, + Hanunoo = 280, + Ingush = 281, + LargeFloweryMiao = 282, + Lepcha = 283, + Limbu = 284, + Lisu = 285, + Lu = 286, + Lycian = 287, + Lydian = 288, + Mandingo = 289, + Manipuri = 290, + Meroitic = 291, + NorthernThai = 292, + OldIrish = 293, + OldNorse = 294, + OldPersian = 295, + OldTurkish = 296, + Pahlavi = 297, + Parthian = 298, + Phoenician = 299, + PrakritLanguage = 300, + Rejang = 301, + Sabaean = 302, + Samaritan = 303, + Santali = 304, + Saurashtra = 305, + Sora = 306, + Sylheti = 307, + Tagbanwa = 308, + TaiDam = 309, + TaiNua = 310, + Ugaritic = 311, Norwegian = NorwegianBokmal, Moldavian = Romanian, SerboCroatian = Serbian, @@ -352,7 +403,8 @@ public: RhaetoRomance = Romansh, Chewa = Nyanja, Frisian = WesternFrisian, - LastLanguage = Ngiemboon + Uigur = Uighur, + LastLanguage = Ugaritic }; enum Script { @@ -392,9 +444,78 @@ public: SyriacScript = 33, YiScript = 34, VaiScript = 35, + AvestanScript = 36, + BalineseScript = 37, + BamumScript = 38, + BatakScript = 39, + BopomofoScript = 40, + BrahmiScript = 41, + BugineseScript = 42, + BuhidScript = 43, + CanadianAboriginalScript = 44, + CarianScript = 45, + ChakmaScript = 46, + ChamScript = 47, + CopticScript = 48, + CypriotScript = 49, + EgyptianHieroglyphsScript = 50, + FraserScript = 51, + GlagoliticScript = 52, + GothicScript = 53, + HanScript = 54, + HangulScript = 55, + HanunooScript = 56, + ImperialAramaicScript = 57, + InscriptionalPahlaviScript = 58, + InscriptionalParthianScript = 59, + JavaneseScript = 60, + KaithiScript = 61, + KatakanaScript = 62, + KayahLiScript = 63, + KharoshthiScript = 64, + LannaScript = 65, + LepchaScript = 66, + LimbuScript = 67, + LinearBScript = 68, + LycianScript = 69, + LydianScript = 70, + MandaeanScript = 71, + MeiteiMayekScript = 72, + MeroiticScript = 73, + MeroiticCursiveScript = 74, + NkoScript = 75, + NewTaiLueScript = 76, + OghamScript = 77, + OlChikiScript = 78, + OldItalicScript = 79, + OldPersianScript = 80, + OldSouthArabianScript = 81, + OrkhonScript = 82, + OsmanyaScript = 83, + PhagsPaScript = 84, + PhoenicianScript = 85, + PollardPhoneticScript = 86, + RejangScript = 87, + RunicScript = 88, + SamaritanScript = 89, + SaurashtraScript = 90, + SharadaScript = 91, + ShavianScript = 92, + SoraSompengScript = 93, + CuneiformScript = 94, + SundaneseScript = 95, + SylotiNagriScript = 96, + TagalogScript = 97, + TagbanwaScript = 98, + TaiLeScript = 99, + TaiVietScript = 100, + TakriScript = 101, + UgariticScript = 102, + BrailleScript = 103, + HiraganaScript = 104, SimplifiedChineseScript = SimplifiedHanScript, TraditionalChineseScript = TraditionalHanScript, - LastScript = VaiScript + LastScript = HiraganaScript }; enum Country { AnyCountry = 0, @@ -711,6 +832,15 @@ public: float toFloat(const QString &s, bool *ok = 0) const; double toDouble(const QString &s, bool *ok = 0) const; + short toShort(const QStringRef &s, bool *ok = 0) const; + ushort toUShort(const QStringRef &s, bool *ok = 0) const; + int toInt(const QStringRef &s, bool *ok = 0) const; + uint toUInt(const QStringRef &s, bool *ok = 0) const; + qlonglong toLongLong(const QStringRef &s, bool *ok = 0) const; + qulonglong toULongLong(const QStringRef &s, bool *ok = 0) const; + float toFloat(const QStringRef &s, bool *ok = 0) const; + double toDouble(const QStringRef &s, bool *ok = 0) const; + QString toString(qlonglong i) const; QString toString(qulonglong i) const; inline QString toString(short i) const; @@ -842,6 +972,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QLocale &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QLOCALE_H diff --git a/src/corelib/tools/qmap.h b/src/corelib/tools/qmap.h index d44a794..449fcbc 100644 --- a/src/corelib/tools/qmap.h +++ b/src/corelib/tools/qmap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,7 +54,9 @@ #include #include -QT_BEGIN_HEADER +#ifdef Q_COMPILER_INITIALIZER_LISTS +#include +#endif QT_BEGIN_NAMESPACE @@ -327,6 +329,14 @@ class QMap public: inline QMap() : d(static_cast *>(const_cast(&QMapDataBase::shared_null))) { } +#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QMap(std::initializer_list > list) + : d(static_cast *>(const_cast(&QMapDataBase::shared_null))) + { + for (typename std::initializer_list >::const_iterator it = list.begin(); it != list.end(); ++it) + insert(it->first, it->second); + } +#endif QMap(const QMap &other); inline ~QMap() { if (!d->ref.deref()) d->destroy(); } @@ -528,7 +538,9 @@ public: iterator upperBound(const Key &key); const_iterator upperBound(const Key &key) const; iterator insert(const Key &key, const T &value); + iterator insert(const_iterator pos, const Key &key, const T &value); iterator insertMulti(const Key &key, const T &value); + iterator insertMulti(const_iterator pos, const Key &akey, const T &avalue); QMap &unite(const QMap &other); // STL compatibility @@ -653,6 +665,72 @@ Q_INLINE_TEMPLATE typename QMap::iterator QMap::insert(const Key } template +typename QMap::iterator QMap::insert(const_iterator pos, const Key &akey, const T &avalue) +{ + if (d->ref.isShared()) + return this->insert(akey, avalue); + + if (pos == constEnd()) { + // Hint is that the Node is larger than (or equal to) the largest value. + Node *n = static_cast(pos.i->left); + if (n) { + while (n->right) + n = static_cast(n->right); + + if (!qMapLessThanKey(n->key, akey)) + return this->insert(akey, avalue); // ignore hint + // This can be optimized by checking equal too. + // we can overwrite if previous node key is strictly smaller + // (or there is no previous node) + + Node *z = d->createNode(akey, avalue, n, false); // insert right most + return iterator(z); + } + return this->insert(akey, avalue); + } else { + // Hint indicates that the node should be less (or equal to) the hint given + // but larger than the previous value. + Node *next = const_cast(pos.i); + if (qMapLessThanKey(next->key, akey)) + return this->insert(akey, avalue); // ignore hint + + if (pos == constBegin()) { + // There is no previous value + // Maybe overwrite left most value + if (!qMapLessThanKey(akey, next->key)) { + next->value = avalue; // overwrite current iterator + return iterator(next); + } + // insert left most. + Node *z = d->createNode(akey, avalue, begin().i, true); + return iterator(z); + } else { + Node *prev = const_cast(pos.i->previousNode()); + if (!qMapLessThanKey(prev->key, akey)) { + return this->insert(akey, avalue); // ignore hint + } + // Hint is ok + if (!qMapLessThanKey(akey, next->key)) { + next->value = avalue; // overwrite current iterator + return iterator(next); + } + + // we need to insert (not overwrite) + if (prev->right == 0) { + Node *z = d->createNode(akey, avalue, prev, false); + return iterator(z); + } + if (next->left == 0) { + Node *z = d->createNode(akey, avalue, next, true); + return iterator(z); + } + Q_ASSERT(false); // We should have prev->right == 0 or next->left == 0. + return this->insert(akey, avalue); + } + } +} + +template Q_INLINE_TEMPLATE typename QMap::iterator QMap::insertMulti(const Key &akey, const T &avalue) { @@ -670,6 +748,57 @@ Q_INLINE_TEMPLATE typename QMap::iterator QMap::insertMulti(cons } template +typename QMap::iterator QMap::insertMulti(const_iterator pos, const Key &akey, const T &avalue) +{ + if (d->ref.isShared()) + return this->insertMulti(akey, avalue); + + if (pos == constEnd()) { + // Hint is that the Node is larger than (or equal to) the largest value. + Node *n = static_cast(pos.i->left); + if (n) { + while (n->right) + n = static_cast(n->right); + + if (!qMapLessThanKey(n->key, akey)) + return this->insertMulti(akey, avalue); // ignore hint + Node *z = d->createNode(akey, avalue, n, false); // insert right most + return iterator(z); + } + return this->insertMulti(akey, avalue); + } else { + // Hint indicates that the node should be less (or equal to) the hint given + // but larger than the previous value. + Node *next = const_cast(pos.i); + if (qMapLessThanKey(next->key, akey)) + return this->insertMulti(akey, avalue); // ignore hint + + if (pos == constBegin()) { + // There is no previous value (insert left most) + Node *z = d->createNode(akey, avalue, begin().i, true); + return iterator(z); + } else { + Node *prev = const_cast(pos.i->previousNode()); + if (!qMapLessThanKey(prev->key, akey)) + return this->insertMulti(akey, avalue); // ignore hint + + // Hint is ok - do insert + if (prev->right == 0) { + Node *z = d->createNode(akey, avalue, prev, false); + return iterator(z); + } + if (next->left == 0) { + Node *z = d->createNode(akey, avalue, next, true); + return iterator(z); + } + Q_ASSERT(false); // We should have prev->right == 0 or next->left == 0. + return this->insertMulti(akey, avalue); + } + } +} + + +template Q_INLINE_TEMPLATE typename QMap::const_iterator QMap::constFind(const Key &akey) const { Node *n = d->findNode(akey); @@ -960,6 +1089,13 @@ class QMultiMap : public QMap { public: QMultiMap() {} +#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QMultiMap(std::initializer_list > list) + { + for (typename std::initializer_list >::const_iterator it = list.begin(); it != list.end(); ++it) + insert(it->first, it->second); + } +#endif QMultiMap(const QMap &other) : QMap(other) {} inline void swap(QMultiMap &other) { QMap::swap(other); } @@ -967,6 +1103,8 @@ public: { return QMap::insert(key, value); } inline typename QMap::iterator insert(const Key &key, const T &value) { return QMap::insertMulti(key, value); } + inline typename QMap::iterator insert(typename QMap::const_iterator pos, const Key &key, const T &value) + { return QMap::insertMulti(pos, key, value); } inline QMultiMap &operator+=(const QMultiMap &other) { this->unite(other); return *this; } @@ -1072,6 +1210,4 @@ Q_DECLARE_MUTABLE_ASSOCIATIVE_ITERATOR(Map) QT_END_NAMESPACE -QT_END_HEADER - #endif // QMAP_H diff --git a/src/corelib/tools/qmargins.h b/src/corelib/tools/qmargins.h index 8ceccd4..0d68be9 100644 --- a/src/corelib/tools/qmargins.h +++ b/src/corelib/tools/qmargins.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,9 +42,7 @@ #ifndef QMARGINS_H #define QMARGINS_H -#include - -QT_BEGIN_HEADER +#include QT_BEGIN_NAMESPACE @@ -67,6 +65,15 @@ public: void setRight(int right); void setBottom(int bottom); + QMargins &operator+=(const QMargins &margins); + QMargins &operator-=(const QMargins &margins); + QMargins &operator+=(int); + QMargins &operator-=(int); + QMargins &operator*=(int); + QMargins &operator/=(int); + QMargins &operator*=(qreal); + QMargins &operator/=(qreal); + private: int m_left; int m_top; @@ -142,12 +149,128 @@ Q_DECL_CONSTEXPR inline bool operator!=(const QMargins &m1, const QMargins &m2) m1.m_bottom != m2.m_bottom; } +Q_DECL_CONSTEXPR inline QRect operator+(const QRect &rectangle, const QMargins &margins) +{ + return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()), + QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom())); +} + +Q_DECL_CONSTEXPR inline QRect operator+(const QMargins &margins, const QRect &rectangle) +{ + return QRect(QPoint(rectangle.left() - margins.left(), rectangle.top() - margins.top()), + QPoint(rectangle.right() + margins.right(), rectangle.bottom() + margins.bottom())); +} + +inline QRect QRect::marginsAdded(const QMargins &margins) const +{ + return *this + margins; +} + +inline QRect QRect::marginsRemoved(const QMargins &margins) const +{ + return QRect(QPoint(x1 + margins.left(), y1 + margins.top()), + QPoint(x2 - margins.right(), y2 - margins.bottom())); +} + +inline QRect &QRect::operator+=(const QMargins &margins) +{ + *this = marginsAdded(margins); + return *this; +} + +inline QRect &QRect::operator-=(const QMargins &margins) +{ + *this = marginsRemoved(margins); + return *this; +} + +Q_DECL_CONSTEXPR inline QMargins operator+(const QMargins &m1, const QMargins &m2) +{ + return QMargins(m1.left() + m2.left(), m1.top() + m2.top(), + m1.right() + m2.right(), m1.bottom() + m2.bottom()); +} + +Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &m1, const QMargins &m2) +{ + return QMargins(m1.left() - m2.left(), m1.top() - m2.top(), + m1.right() - m2.right(), m1.bottom() - m2.bottom()); +} + +Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, int factor) +{ + return QMargins(margins.left() * factor, margins.top() * factor, + margins.right() * factor, margins.bottom() * factor); +} + +Q_DECL_CONSTEXPR inline QMargins operator*(int factor, const QMargins &margins) +{ + return QMargins(margins.left() * factor, margins.top() * factor, + margins.right() * factor, margins.bottom() * factor); +} + +Q_DECL_CONSTEXPR inline QMargins operator*(const QMargins &margins, qreal factor) +{ + return QMargins(qRound(margins.left() * factor), qRound(margins.top() * factor), + qRound(margins.right() * factor), qRound(margins.bottom() * factor)); +} + +Q_DECL_CONSTEXPR inline QMargins operator*(qreal factor, const QMargins &margins) +{ + return QMargins(qRound(margins.left() * factor), qRound(margins.top() * factor), + qRound(margins.right() * factor), qRound(margins.bottom() * factor)); +} + +Q_DECL_CONSTEXPR inline QMargins operator/(const QMargins &margins, int divisor) +{ + return QMargins(margins.left() / divisor, margins.top() / divisor, + margins.right() / divisor, margins.bottom() / divisor); +} + +Q_DECL_CONSTEXPR inline QMargins operator/(const QMargins &margins, qreal divisor) +{ + return QMargins(qRound(margins.left() / divisor), qRound(margins.top() / divisor), + qRound(margins.right() / divisor), qRound(margins.bottom() / divisor)); +} + +inline QMargins &QMargins::operator+=(const QMargins &margins) +{ + return *this = *this + margins; +} + +inline QMargins &QMargins::operator-=(const QMargins &margins) +{ + return *this = *this - margins; +} + +inline QMargins &QMargins::operator*=(int factor) +{ + return *this = *this * factor; +} + +inline QMargins &QMargins::operator/=(int divisor) +{ + return *this = *this / divisor; +} + +inline QMargins &QMargins::operator*=(qreal factor) +{ + return *this = *this * factor; +} + +inline QMargins &QMargins::operator/=(qreal divisor) +{ + return *this = *this / divisor; +} + +Q_DECL_CONSTEXPR inline QMargins operator-(const QMargins &margins) +{ + return QMargins(-margins.left(), -margins.top(), -margins.right(), -margins.bottom()); +} + #ifndef QT_NO_DEBUG_STREAM Q_CORE_EXPORT QDebug operator<<(QDebug, const QMargins &); #endif QT_END_NAMESPACE -QT_END_HEADER - #endif // QMARGINS_H diff --git a/src/corelib/tools/qpair.h b/src/corelib/tools/qpair.h index 224a2dc..96b1b65 100644 --- a/src/corelib/tools/qpair.h +++ b/src/corelib/tools/qpair.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -108,6 +106,4 @@ Q_OUTOFLINE_TEMPLATE QPair qMakePair(const T1 &x, const T2 &y) QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAIR_H diff --git a/src/corelib/tools/qpoint.h b/src/corelib/tools/qpoint.h index 16689fe..69403eb 100644 --- a/src/corelib/tools/qpoint.h +++ b/src/corelib/tools/qpoint.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,6 +74,9 @@ public: inline QPoint &operator/=(qreal divisor); + Q_DECL_CONSTEXPR static inline int dotProduct(const QPoint &p1, const QPoint &p2) + { return p1.xp * p2.xp + p1.yp * p2.yp; } + friend Q_DECL_CONSTEXPR inline bool operator==(const QPoint &, const QPoint &); friend Q_DECL_CONSTEXPR inline bool operator!=(const QPoint &, const QPoint &); friend Q_DECL_CONSTEXPR inline const QPoint operator+(const QPoint &, const QPoint &); @@ -233,6 +234,9 @@ public: inline QPointF &operator*=(qreal c); inline QPointF &operator/=(qreal c); + Q_DECL_CONSTEXPR static inline qreal dotProduct(const QPointF &p1, const QPointF &p2) + { return p1.xp * p2.xp + p1.yp * p2.yp; } + friend Q_DECL_CONSTEXPR inline bool operator==(const QPointF &, const QPointF &); friend Q_DECL_CONSTEXPR inline bool operator!=(const QPointF &, const QPointF &); friend Q_DECL_CONSTEXPR inline const QPointF operator+(const QPointF &, const QPointF &); @@ -393,6 +397,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug d, const QPointF &p); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPOINT_H diff --git a/src/corelib/tools/qqueue.h b/src/corelib/tools/qqueue.h index 5139525..b830214 100644 --- a/src/corelib/tools/qqueue.h +++ b/src/corelib/tools/qqueue.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -64,6 +62,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQUEUE_H diff --git a/src/corelib/tools/qrect.h b/src/corelib/tools/qrect.h index 6e1a819..62ebdd1 100644 --- a/src/corelib/tools/qrect.h +++ b/src/corelib/tools/qrect.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,10 +49,9 @@ #error qrect.h must be included before any header file that defines topLeft #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +class QMargins; class Q_CORE_EXPORT QRect { @@ -139,6 +138,11 @@ public: inline QRect intersected(const QRect &other) const; bool intersects(const QRect &r) const; + inline QRect marginsAdded(const QMargins &margins) const; + inline QRect marginsRemoved(const QMargins &margins) const; + inline QRect &operator+=(const QMargins &margins); + inline QRect &operator-=(const QMargins &margins); + #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED QRect unite(const QRect &r) const { return united(r); } QT_DEPRECATED QRect intersect(const QRect &r) const { return intersected(r); } @@ -786,6 +790,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QRectF &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QRECT_H diff --git a/src/corelib/tools/qrefcount.h b/src/corelib/tools/qrefcount.h index d45bcba..84314b1 100644 --- a/src/corelib/tools/qrefcount.h +++ b/src/corelib/tools/qrefcount.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -112,6 +110,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qregexp.h b/src/corelib/tools/qregexp.h index 870e377..26b0b78 100644 --- a/src/corelib/tools/qregexp.h +++ b/src/corelib/tools/qregexp.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,12 +42,12 @@ #ifndef QREGEXP_H #define QREGEXP_H +#include + #ifndef QT_NO_REGEXP #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -129,8 +129,6 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QRegExp &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_REGEXP #endif // QREGEXP_H diff --git a/src/corelib/tools/qregularexpression.h b/src/corelib/tools/qregularexpression.h index 4c95a5b..5059ea6 100644 --- a/src/corelib/tools/qregularexpression.h +++ b/src/corelib/tools/qregularexpression.h @@ -1,6 +1,7 @@ /**************************************************************************** ** ** Copyright (C) 2012 Giuseppe D'Angelo . +** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Giuseppe D'Angelo ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -42,14 +43,15 @@ #ifndef QREGULAREXPRESSION_H #define QREGULAREXPRESSION_H -#ifndef QT_NO_REGEXP +#include + +#ifndef QT_NO_REGULAREXPRESSION #include +#include #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QRegularExpressionMatch; @@ -95,11 +97,13 @@ public: QString errorString() const; int captureCount() const; + QStringList namedCaptureGroups() const; enum MatchType { NormalMatch = 0, PartialPreferCompleteMatch, - PartialPreferFirstMatch + PartialPreferFirstMatch, + NoMatch }; enum MatchOption { @@ -152,6 +156,7 @@ struct QRegularExpressionMatchPrivate; class Q_CORE_EXPORT QRegularExpressionMatch { public: + QRegularExpressionMatch(); ~QRegularExpressionMatch(); QRegularExpressionMatch(const QRegularExpressionMatch &match); QRegularExpressionMatch &operator=(const QRegularExpressionMatch &match); @@ -209,6 +214,7 @@ struct QRegularExpressionMatchIteratorPrivate; class Q_CORE_EXPORT QRegularExpressionMatchIterator { public: + QRegularExpressionMatchIterator(); ~QRegularExpressionMatchIterator(); QRegularExpressionMatchIterator(const QRegularExpressionMatchIterator &iterator); QRegularExpressionMatchIterator &operator=(const QRegularExpressionMatchIterator &iterator); @@ -239,8 +245,6 @@ Q_DECLARE_SHARED(QRegularExpressionMatchIterator) QT_END_NAMESPACE -QT_END_HEADER - -#endif // QT_NO_REGEXP +#endif // QT_NO_REGULAREXPRESSION #endif // QREGULAREXPRESSION_H diff --git a/src/corelib/tools/qscopedpointer.h b/src/corelib/tools/qscopedpointer.h index fbe2aa8..2155c56 100644 --- a/src/corelib/tools/qscopedpointer.h +++ b/src/corelib/tools/qscopedpointer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,7 +46,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE template @@ -97,7 +96,6 @@ public: { T *oldD = this->d; Cleanup::cleanup(oldD); - this->d = 0; } inline T &operator*() const @@ -239,6 +237,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QSCOPEDPOINTER_H diff --git a/src/corelib/tools/qscopedvaluerollback.h b/src/corelib/tools/qscopedvaluerollback.h index 755100d..dfaf198 100644 --- a/src/corelib/tools/qscopedvaluerollback.h +++ b/src/corelib/tools/qscopedvaluerollback.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE template @@ -75,6 +74,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QSCOPEDVALUEROLLBACK_H diff --git a/src/corelib/tools/qset.h b/src/corelib/tools/qset.h index 7541d80..d5c3637 100644 --- a/src/corelib/tools/qset.h +++ b/src/corelib/tools/qset.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -43,8 +43,9 @@ #define QSET_H #include - -QT_BEGIN_HEADER +#ifdef Q_COMPILER_INITIALIZER_LISTS +#include +#endif QT_BEGIN_NAMESPACE @@ -56,6 +57,14 @@ class QSet public: inline QSet() {} +#ifdef Q_COMPILER_INITIALIZER_LISTS + inline QSet(std::initializer_list list) + { + reserve(list.size()); + for (typename std::initializer_list::const_iterator it = list.begin(); it != list.end(); ++it) + insert(*it); + } +#endif inline QSet(const QSet &other) : q_hash(other.q_hash) {} inline QSet &operator=(const QSet &other) @@ -355,6 +364,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSET_H diff --git a/src/corelib/tools/qshareddata.h b/src/corelib/tools/qshareddata.h index bec5132..00bf4cb 100644 --- a/src/corelib/tools/qshareddata.h +++ b/src/corelib/tools/qshareddata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -281,6 +279,4 @@ template Q_DECLARE_TYPEINFO_BODY(QExplicitlySharedDataPointer, Q_ QT_END_NAMESPACE -QT_END_HEADER - #endif // QSHAREDDATA_H diff --git a/src/corelib/tools/qsharedpointer.h b/src/corelib/tools/qsharedpointer.h index cfc5cad..7d1f008 100644 --- a/src/corelib/tools/qsharedpointer.h +++ b/src/corelib/tools/qsharedpointer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ # include #else -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -95,6 +93,9 @@ public: template QSharedPointer dynamicCast() const; template QSharedPointer constCast() const; template QSharedPointer objectCast() const; + + static inline QSharedPointer create(); + static inline QSharedPointer create(...); }; template @@ -149,8 +150,6 @@ template QWeakPointer qWeakPointerCast(const QWeakPointer< QT_END_NAMESPACE -QT_END_HEADER - #endif // Q_QDOC #endif // QSHAREDPOINTER_H diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index 6f3e577..5e30cf3 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -46,14 +46,17 @@ #endif #if 0 +#pragma qt_sync_skip_header_check +#pragma qt_sync_stop_processing +#endif + +#if 0 // These macros are duplicated here to make syncqt not complain a about // this header, as we have a "qt_sync_stop_processing" below, which in turn // is here because this file contains a template mess and duplicates the // classes found in qsharedpointer.h -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER #pragma qt_sync_stop_processing #endif @@ -62,7 +65,9 @@ QT_END_HEADER #include // for qobject_cast #include // for qHash -QT_BEGIN_HEADER +#if defined(Q_COMPILER_RVALUE_REFS) && defined(Q_COMPILER_VARIADIC_TEMPLATES) +# include // for std::forward +#endif QT_BEGIN_NAMESPACE @@ -389,6 +394,28 @@ public: QWeakPointer toWeakRef() const; +#if defined(Q_COMPILER_RVALUE_REFS) && defined(Q_COMPILER_VARIADIC_TEMPLATES) + template + static QSharedPointer create(Args && ...arguments) + { + typedef QtSharedPointer::ExternalRefCountWithContiguousData Private; +# ifdef QT_SHAREDPOINTER_TRACK_POINTERS + typename Private::DestroyerFn destroy = &Private::safetyCheckDeleter; +# else + typename Private::DestroyerFn destroy = &Private::deleter; +# endif + QSharedPointer result(Qt::Uninitialized); + result.d = Private::create(&result.value, destroy); + + // now initialize the data + new (result.data()) T(std::forward(arguments)...); + result.d->setQObjectShared(result.value, true); +# ifdef QT_SHAREDPOINTER_TRACK_POINTERS + internalSafetyCheckAdd(result.d, result.value); +# endif + return result; + } +#else static inline QSharedPointer create() { typedef QtSharedPointer::ExternalRefCountWithContiguousData Private; @@ -408,6 +435,7 @@ public: result.d->setQObjectShared(result.value, true); return result; } +#endif private: explicit QSharedPointer(Qt::Initialization) {} @@ -616,7 +644,7 @@ private: public: #else template friend class QSharedPointer; - friend class QPointerBase; + template friend class QPointer; #endif template @@ -786,6 +814,8 @@ template Q_INLINE_TEMPLATE QSharedPointer qSharedPointerDynamicCast(const QSharedPointer &src) { register X *ptr = dynamic_cast(src.data()); // if you get an error in this line, the cast is invalid + if (!ptr) + return QSharedPointer(); return QtSharedPointer::copyAndSetPointer(ptr, src); } template @@ -860,6 +890,4 @@ template Q_DECLARE_TYPEINFO_BODY(QSharedPointer, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qsize.h b/src/corelib/tools/qsize.h index cde49a6..76f2ae0 100644 --- a/src/corelib/tools/qsize.h +++ b/src/corelib/tools/qsize.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -379,6 +377,4 @@ Q_CORE_EXPORT QDebug operator<<(QDebug, const QSizeF &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSIZE_H diff --git a/src/corelib/tools/qstack.h b/src/corelib/tools/qstack.h index ea3d9e4..135c4dd 100644 --- a/src/corelib/tools/qstack.h +++ b/src/corelib/tools/qstack.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,4 @@ inline const T &QStack::top() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTACK_H diff --git a/src/corelib/tools/qstring.h b/src/corelib/tools/qstring.h index 47cca0d..d8aaa92 100644 --- a/src/corelib/tools/qstring.h +++ b/src/corelib/tools/qstring.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,7 +49,7 @@ #include -#if defined(Q_OS_LINUX_ANDROID) +#if defined(Q_OS_ANDROID) // std::wstring is disabled on android's glibc, as bionic lacks certain features // that libstdc++ checks for (like mbcslen). namespace std @@ -64,14 +64,13 @@ namespace std #error qstring.h must be included before any header file that defines truncate #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QCharRef; class QRegExp; class QRegularExpression; +class QRegularExpressionMatch; class QString; class QStringList; class QTextCodec; @@ -299,12 +298,20 @@ public: QString &vsprintf(const char *format, va_list ap) #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 0))) +# else __attribute__ ((format (printf, 2, 0))) +# endif #endif ; QString &sprintf(const char *format, ...) #if defined(Q_CC_GNU) && !defined(__INSURE__) +# if defined(Q_CC_MINGW) && !defined(Q_CC_CLANG) + __attribute__ ((format (gnu_printf, 2, 3))) +# else __attribute__ ((format (printf, 2, 3))) +# endif #endif ; @@ -335,10 +342,11 @@ public: inline bool contains(QRegExp &rx) const { return indexOf(rx) != -1; } #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION int indexOf(const QRegularExpression &re, int from = 0) const; int lastIndexOf(const QRegularExpression &re, int from = -1) const; bool contains(const QRegularExpression &re) const; + bool contains(const QRegularExpression &re, QRegularExpressionMatch *match) const; // ### Qt 6: merge overloads int count(const QRegularExpression &re) const; #endif @@ -356,7 +364,7 @@ public: #ifndef QT_NO_REGEXP QString section(const QRegExp ®, int start, int end = -1, SectionFlags flags = SectionDefault) const; #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION QString section(const QRegularExpression &re, int start, int end = -1, SectionFlags flags = SectionDefault) const; #endif QString left(int n) const Q_REQUIRED_RESULT; @@ -432,7 +440,7 @@ public: inline QString &remove(const QRegExp &rx) { return replace(rx, QString()); } #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION QString &replace(const QRegularExpression &re, const QString &after); inline QString &remove(const QRegularExpression &re) { return replace(re, QString()); } @@ -447,7 +455,7 @@ public: #ifndef QT_NO_REGEXP QStringList split(const QRegExp &sep, SplitBehavior behavior = KeepEmptyParts) const Q_REQUIRED_RESULT; #endif -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION QStringList split(const QRegularExpression &sep, SplitBehavior behavior = KeepEmptyParts) const Q_REQUIRED_RESULT; #endif enum NormalizationForm { @@ -884,6 +892,8 @@ public: QChar::Decomposition decompositionTag() const { return QChar(*this).decompositionTag(); } uchar combiningClass() const { return QChar(*this).combiningClass(); } + inline QChar::Script script() const { return QChar(*this).script(); } + QChar::UnicodeVersion unicodeVersion() const { return QChar(*this).unicodeVersion(); } inline uchar cell() const { return QChar(*this).cell(); } @@ -1171,13 +1181,17 @@ class Q_CORE_EXPORT QStringRef { int m_position; int m_size; public: + // ### Qt 6: make this constructor constexpr, after the destructor is made trivial inline QStringRef():m_string(0), m_position(0), m_size(0){} inline QStringRef(const QString *string, int position, int size); inline QStringRef(const QString *string); + + // ### Qt 6: remove this copy constructor, the implicit one is fine inline QStringRef(const QStringRef &other) :m_string(other.m_string), m_position(other.m_position), m_size(other.m_size) {} + // ### Qt 6: remove this destructor, the implicit one is fine inline ~QStringRef(){} inline const QString *string() const { return m_string; } inline int position() const { return m_position; } @@ -1271,6 +1285,18 @@ public: int localeAwareCompare(const QStringRef &s) const; static int localeAwareCompare(const QStringRef &s1, const QString &s2); static int localeAwareCompare(const QStringRef &s1, const QStringRef &s2); + + QStringRef trimmed() const Q_REQUIRED_RESULT; + short toShort(bool *ok = 0, int base = 10) const; + ushort toUShort(bool *ok = 0, int base = 10) const; + int toInt(bool *ok = 0, int base = 10) const; + uint toUInt(bool *ok = 0, int base = 10) const; + long toLong(bool *ok = 0, int base = 10) const; + ulong toULong(bool *ok = 0, int base = 10) const; + qlonglong toLongLong(bool *ok = 0, int base = 10) const; + qulonglong toULongLong(bool *ok = 0, int base = 10) const; + float toFloat(bool *ok = 0) const; + double toDouble(bool *ok = 0) const; }; Q_DECLARE_TYPEINFO(QStringRef, Q_PRIMITIVE_TYPE); @@ -1386,8 +1412,6 @@ QT_DEPRECATED inline QString escape(const QString &plain) { QT_END_NAMESPACE -QT_END_HEADER - #if defined(QT_USE_FAST_OPERATOR_PLUS) || defined(QT_USE_QSTRINGBUILDER) #include #endif diff --git a/src/corelib/tools/qstringbuilder.h b/src/corelib/tools/qstringbuilder.h index a04910c..e09b02b 100644 --- a/src/corelib/tools/qstringbuilder.h +++ b/src/corelib/tools/qstringbuilder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -54,8 +54,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -429,6 +427,4 @@ QString &operator+=(QString &a, const QStringBuilder &b) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTRINGBUILDER_H diff --git a/src/corelib/tools/qstringlist.h b/src/corelib/tools/qstringlist.h index 2448081..a962b7c 100644 --- a/src/corelib/tools/qstringlist.h +++ b/src/corelib/tools/qstringlist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,12 +97,12 @@ public: #endif #ifndef QT_BOOTSTRAPPED -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION inline QStringList filter(const QRegularExpression &re) const; inline QStringList &replaceInStrings(const QRegularExpression &re, const QString &after); inline int indexOf(const QRegularExpression &re, int from = 0) const; inline int lastIndexOf(const QRegularExpression &re, int from = -1) const; -#endif // QT_NO_REGEXP +#endif // QT_NO_REGULAREXPRESSION #endif // QT_BOOTSTRAPPED #if !defined(Q_NO_USING_KEYWORD) @@ -141,12 +139,12 @@ namespace QtPrivate { #endif #ifndef QT_BOOTSTRAPPED -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION void Q_CORE_EXPORT QStringList_replaceInStrings(QStringList *that, const QRegularExpression &rx, const QString &after); QStringList Q_CORE_EXPORT QStringList_filter(const QStringList *that, const QRegularExpression &re); int Q_CORE_EXPORT QStringList_indexOf(const QStringList *that, const QRegularExpression &re, int from); int Q_CORE_EXPORT QStringList_lastIndexOf(const QStringList *that, const QRegularExpression &re, int from); -#endif // QT_NO_REGEXP +#endif // QT_NO_REGULAREXPRESSION #endif // QT_BOOTSTRAPPED } @@ -220,7 +218,7 @@ inline int QStringList::lastIndexOf(QRegExp &rx, int from) const #endif #ifndef QT_BOOTSTRAPPED -#ifndef QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION inline QStringList &QStringList::replaceInStrings(const QRegularExpression &rx, const QString &after) { QtPrivate::QStringList_replaceInStrings(this, rx, after); @@ -241,7 +239,7 @@ inline int QStringList::lastIndexOf(const QRegularExpression &rx, int from) cons { return QtPrivate::QStringList_lastIndexOf(this, rx, from); } -#endif // QT_NO_REGEXP +#endif // QT_NO_REGULAREXPRESSION #endif // QT_BOOTSTRAPPED #ifndef QT_NO_DATASTREAM @@ -257,6 +255,4 @@ inline QDataStream &operator<<(QDataStream &out, const QStringList &list) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTRINGLIST_H diff --git a/src/corelib/tools/qstringmatcher.h b/src/corelib/tools/qstringmatcher.h index 64c2894..792b975 100644 --- a/src/corelib/tools/qstringmatcher.h +++ b/src/corelib/tools/qstringmatcher.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,6 +95,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTRINGMATCHER_H diff --git a/src/corelib/tools/qtextboundaryfinder.h b/src/corelib/tools/qtextboundaryfinder.h index 745dc4e..81cd0dd 100644 --- a/src/corelib/tools/qtextboundaryfinder.h +++ b/src/corelib/tools/qtextboundaryfinder.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -111,7 +109,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QTextBoundaryFinder::BoundaryReasons) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index 04ad549..be2a4ae 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,22 +124,22 @@ public Q_SLOTS: Q_SIGNALS: void valueChanged(qreal x -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void frameChanged(int -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void stateChanged(QTimeLine::State newState -#if !defined(qdoc) +#if !defined(Q_QDOC) , QPrivateSignal #endif ); void finished( -#if !defined(qdoc) +#if !defined(Q_QDOC) QPrivateSignal #endif ); @@ -156,7 +154,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/corelib/tools/qvarlengtharray.h b/src/corelib/tools/qvarlengtharray.h index 0c5b61d..3a20280 100644 --- a/src/corelib/tools/qvarlengtharray.h +++ b/src/corelib/tools/qvarlengtharray.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -103,6 +101,7 @@ public: inline bool isEmpty() const { return (s == 0); } inline void resize(int size); inline void clear() { resize(0); } + inline void squeeze(); inline int capacity() const { return a; } inline void reserve(int size); @@ -244,6 +243,10 @@ Q_OUTOFLINE_TEMPLATE void QVarLengthArray::append(const T *abuf, in } template +Q_INLINE_TEMPLATE void QVarLengthArray::squeeze() +{ realloc(s, s); } + +template Q_OUTOFLINE_TEMPLATE void QVarLengthArray::realloc(int asize, int aalloc) { Q_ASSERT(aalloc >= asize); @@ -415,6 +418,4 @@ bool operator!=(const QVarLengthArray &l, const QVarLengthArray #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QRegion; @@ -140,6 +138,10 @@ public: void replace(int i, const T &t); void remove(int i); void remove(int i, int n); + inline void removeFirst() { Q_ASSERT(!isEmpty()); erase(d->begin()); } + inline void removeLast(); + inline T takeFirst() { Q_ASSERT(!isEmpty()); T r = first(); removeFirst(); return r; } + inline T takeLast() { Q_ASSERT(!isEmpty()); T r = last(); removeLast(); return r; } QVector &fill(const T &t, int size = -1); @@ -200,8 +202,8 @@ public: typedef int size_type; inline void push_back(const T &t) { append(t); } inline void push_front(const T &t) { prepend(t); } - void pop_back() { Q_ASSERT(!isEmpty()); erase(d->end() - 1); } - void pop_front() { Q_ASSERT(!isEmpty()); erase(d->begin()); } + void pop_back() { removeLast(); } + void pop_front() { removeFirst(); } inline bool empty() const { return d->size == 0; } inline T& front() { return first(); } @@ -491,7 +493,7 @@ void QVector::reallocData(const int asize, const int aalloc, QArrayData::Allo } x->capacityReserved = d->capacityReserved; } else { - Q_ASSERT(d->alloc == aalloc); // resize, without changing allocation size + Q_ASSERT(int(d->alloc) == aalloc); // resize, without changing allocation size Q_ASSERT(isDetached()); // can be done only on detached d Q_ASSERT(x == d); // in this case we do not need to allocate anything if (asize <= d->size) { @@ -506,8 +508,7 @@ void QVector::reallocData(const int asize, const int aalloc, QArrayData::Allo } if (d != x) { if (!d->ref.deref()) { - Q_ASSERT(!isShared); - if (QTypeInfo::isStatic || !aalloc) { + if (QTypeInfo::isStatic || !aalloc || (isShared && QTypeInfo::isComplex)) { // data was copy constructed, we need to call destructors // or if !alloc we did nothing to the old 'd'. freeData(d); @@ -557,6 +558,22 @@ void QVector::append(const T &t) } template +inline void QVector::removeLast() +{ + Q_ASSERT(!isEmpty()); + + if (d->alloc) { + if (d->ref.isShared()) { + reallocData(d->size - 1, int(d->alloc)); + return; + } + if (QTypeInfo::isComplex) + (d->data() + d->size - 1)->~T(); + --d->size; + } +} + +template typename QVector::iterator QVector::insert(iterator before, size_type n, const T &t) { int offset = std::distance(d->begin(), before); @@ -605,6 +622,7 @@ typename QVector::iterator QVector::erase(iterator abegin, iterator aend) // FIXME we could do a proper realloc, which copy constructs only needed data. // FIXME we ara about to delete data maybe it is good time to shrink? + // FIXME the shrink is also an issue in removeLast, that is just a copy + reduce of this. if (d->alloc) { detach(); abegin = d->begin() + itemsUntouched; @@ -814,6 +832,4 @@ Q_TEMPLATE_EXTERN template class Q_CORE_EXPORT QVector; QT_END_NAMESPACE -QT_END_HEADER - #endif // QVECTOR_H diff --git a/src/corelib/xml/qxmlstream.h b/src/corelib/xml/qxmlstream.h index 02f76ee..8a9c2fc 100644 --- a/src/corelib/xml/qxmlstream.h +++ b/src/corelib/xml/qxmlstream.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtCore module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -426,7 +424,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_XMLSTREAM #endif // QXMLSTREAM_H From thiago.macieira at intel.com Wed Jun 26 22:49:40 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:49:40 -0700 Subject: [Development] Header diff for QtGui In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <453bf0$9k2ea9@azsmga001.ch.intel.com> diff --git a/src/gui/accessible/qaccessible.h b/src/gui/accessible/qaccessible.h index 5f61634..6667cae 100644 --- a/src/gui/accessible/qaccessible.h +++ b/src/gui/accessible/qaccessible.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -39,9 +39,13 @@ ** ****************************************************************************/ +#include + +#ifndef QT_NO_ACCESSIBILITY #ifndef QACCESSIBLE_H #define QACCESSIBLE_H +#include #include #include #include @@ -53,23 +57,18 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE - class QAccessibleInterface; class QAccessibleEvent; class QWindow; +class QTextCursor; // We need to inherit QObject to expose the enums to QML. class Q_GUI_EXPORT QAccessible -#ifndef qdoc - :public QObject -#endif { - Q_OBJECT - Q_ENUMS(Role Event State) + Q_GADGET + Q_ENUMS(Role Event) public: enum Event { @@ -269,7 +268,7 @@ public: StaticText = 0x00000029, EditableText = 0x0000002A, // Editable, selectable, etc. Button = 0x0000002B, -#ifndef qdoc +#ifndef Q_QDOC PushButton = Button, // deprecated #endif CheckBox = 0x0000002C, @@ -284,10 +283,10 @@ public: Canvas = 0x00000035, Animation = 0x00000036, Equation = 0x00000037, - ButtonDropDown = 0x00000038, + ButtonDropDown = 0x00000038, // The object represents a button that expands a grid. ButtonMenu = 0x00000039, ButtonDropGrid = 0x0000003A, - Whitespace = 0x0000003B, + Whitespace = 0x0000003B, // The object represents blank space between other objects. PageTabList = 0x0000003C, Clock = 0x0000003D, Splitter = 0x0000003E, @@ -330,16 +329,33 @@ public: TableCellInterface }; + enum TextBoundaryType { + CharBoundary, + WordBoundary, + SentenceBoundary, + ParagraphBoundary, + LineBoundary, + NoBoundary + }; + typedef QAccessibleInterface*(*InterfaceFactory)(const QString &key, QObject*); typedef void(*UpdateHandler)(QAccessibleEvent *event); typedef void(*RootObjectHandler)(QObject*); + typedef unsigned Id; + static void installFactory(InterfaceFactory); static void removeFactory(InterfaceFactory); static UpdateHandler installUpdateHandler(UpdateHandler); static RootObjectHandler installRootObjectHandler(RootObjectHandler); static QAccessibleInterface *queryAccessibleInterface(QObject *); + static Id uniqueId(QAccessibleInterface *iface); + static QAccessibleInterface *accessibleInterface(Id uniqueId); + static Id registerAccessibleInterface(QAccessibleInterface *iface); + static void deleteAccessibleInterface(Id uniqueId); + + #if QT_DEPRECATED_SINCE(5, 0) QT_DEPRECATED static inline void updateAccessibility(QObject *object, int child, Event reason); #endif @@ -350,6 +366,8 @@ public: static void cleanup(); + static QPair< int, int > qAccessibleTextBoundaryHelper(const QTextCursor &cursor, TextBoundaryType boundaryType); + private: static UpdateHandler updateHandler; static RootObjectHandler rootObjectHandler; @@ -359,6 +377,8 @@ private: it is not supposed to be instantiated. */ QAccessible() {} + + friend class QAccessibleCache; }; Q_GUI_EXPORT bool operator==(const QAccessible::State &first, const QAccessible::State &second); @@ -376,8 +396,10 @@ class QAccessibleTableCellInterface; class Q_GUI_EXPORT QAccessibleInterface { +protected: + virtual ~QAccessibleInterface(); + public: - virtual ~QAccessibleInterface() {} // check for valid pointers virtual bool isValid() const = 0; virtual QObject *object() const = 0; @@ -430,7 +452,9 @@ public: virtual void *interface_cast(QAccessible::InterfaceType) { return 0; } -private: + +protected: + friend class QAccessibleCache; }; class Q_GUI_EXPORT QAccessibleEvent @@ -678,6 +702,5 @@ inline void QAccessible::updateAccessibility(QObject *object, int child, Event r QT_END_NAMESPACE -QT_END_HEADER - #endif // QACCESSIBLE_H +#endif //!QT_NO_ACCESSIBILITY diff --git a/src/gui/accessible/qaccessiblebridge.h b/src/gui/accessible/qaccessiblebridge.h index 90dbd1d..0a0002a 100644 --- a/src/gui/accessible/qaccessiblebridge.h +++ b/src/gui/accessible/qaccessiblebridge.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QACCESSIBLEBRIDGE_H diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h index 4391c44..4861af3 100644 --- a/src/gui/accessible/qaccessibleobject.h +++ b/src/gui/accessible/qaccessibleobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -43,9 +43,6 @@ #define QACCESSIBLEOBJECT_H #include -#include - -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -101,6 +98,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QACCESSIBLEOBJECT_H diff --git a/src/gui/accessible/qaccessibleplugin.h b/src/gui/accessible/qaccessibleplugin.h index 4a9a49e..ac56c83 100644 --- a/src/gui/accessible/qaccessibleplugin.h +++ b/src/gui/accessible/qaccessibleplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -73,6 +71,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QACCESSIBLEPLUGIN_H diff --git a/src/gui/image/qbitmap.h b/src/gui/image/qbitmap.h index fcff532..f8bd2fe 100644 --- a/src/gui/image/qbitmap.h +++ b/src/gui/image/qbitmap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,6 +78,4 @@ Q_DECLARE_SHARED(QBitmap) QT_END_NAMESPACE -QT_END_HEADER - #endif // QBITMAP_H diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h index 0722c05..e81bea6 100644 --- a/src/gui/image/qicon.h +++ b/src/gui/image/qicon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -81,8 +79,10 @@ public: { return pixmap(QSize(w, h), mode, state); } inline QPixmap pixmap(int extent, Mode mode = Normal, State state = Off) const { return pixmap(QSize(extent, extent), mode, state); } + QPixmap pixmap(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const; QSize actualSize(const QSize &size, Mode mode = Normal, State state = Off) const; + QSize actualSize(QWindow *window, const QSize &size, Mode mode = Normal, State state = Off) const; QString name() const; @@ -140,6 +140,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QIcon &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QICON_H diff --git a/src/gui/image/qiconengine.h b/src/gui/image/qiconengine.h index 8328fe9..9fb21ad 100644 --- a/src/gui/image/qiconengine.h +++ b/src/gui/image/qiconengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -90,6 +88,4 @@ typedef QIconEngine QIconEngineV2; QT_END_NAMESPACE -QT_END_HEADER - #endif // QICONENGINE_H diff --git a/src/gui/image/qiconengineplugin.h b/src/gui/image/qiconengineplugin.h index c869818..a62659f 100644 --- a/src/gui/image/qiconengineplugin.h +++ b/src/gui/image/qiconengineplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -66,6 +64,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QICONENGINEPLUGIN_H diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index 304d54a..50d4bc7 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -53,8 +53,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,7 +120,7 @@ public: Format_Grayscale2, Format_Grayscale2LSB #endif -#ifndef qdoc +#ifndef Q_QDOC NImageFormats #endif }; @@ -430,6 +428,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QImage &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QIMAGE_H diff --git a/src/gui/image/qimageiohandler.h b/src/gui/image/qimageiohandler.h index 1f94099..2ba99be 100644 --- a/src/gui/image/qimageiohandler.h +++ b/src/gui/image/qimageiohandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -142,6 +140,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QImageIOPlugin::Capabilities) QT_END_NAMESPACE -QT_END_HEADER - #endif // QIMAGEIOHANDLER_H diff --git a/src/gui/image/qimagereader.h b/src/gui/image/qimagereader.h index 932b931..4f3c93a 100644 --- a/src/gui/image/qimagereader.h +++ b/src/gui/image/qimagereader.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -133,6 +131,7 @@ public: static QByteArray imageFormat(const QString &fileName); static QByteArray imageFormat(QIODevice *device); static QList supportedImageFormats(); + static QList supportedMimeTypes(); private: Q_DISABLE_COPY(QImageReader) @@ -141,6 +140,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QIMAGEREADER_H diff --git a/src/gui/image/qimagewriter.h b/src/gui/image/qimagewriter.h index 0e19d94..3f5cf9c 100644 --- a/src/gui/image/qimagewriter.h +++ b/src/gui/image/qimagewriter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -102,6 +100,7 @@ public: bool supportsOption(QImageIOHandler::ImageOption option) const; static QList supportedImageFormats(); + static QList supportedMimeTypes(); private: Q_DISABLE_COPY(QImageWriter) @@ -110,6 +109,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QIMAGEWRITER_H diff --git a/src/gui/image/qmovie.h b/src/gui/image/qmovie.h index 2ebe40b..94d7c79 100644 --- a/src/gui/image/qmovie.h +++ b/src/gui/image/qmovie.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -146,8 +144,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_MOVIE #endif // QMOVIE_H diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index 6c0ac53..08445a3 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -193,6 +191,4 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPicture &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPICTURE_H diff --git a/src/gui/image/qpictureformatplugin.h b/src/gui/image/qpictureformatplugin.h index 08850af..30989c0 100644 --- a/src/gui/image/qpictureformatplugin.h +++ b/src/gui/image/qpictureformatplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,6 +74,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPICTUREFORMATPLUGIN_H diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index af141cd..f1fce03 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -245,6 +243,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QPixmap &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPIXMAP_H diff --git a/src/gui/image/qpixmapcache.h b/src/gui/image/qpixmapcache.h index 36ae00d..83e6610 100644 --- a/src/gui/image/qpixmapcache.h +++ b/src/gui/image/qpixmapcache.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -96,6 +94,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPIXMAPCACHE_H diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index e243085..f1820e1 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -332,6 +330,7 @@ public: int rowCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const; bool hasChildren(const QModelIndex &parent = QModelIndex()) const; + // Qt 6: Remove QModelIndex sibling(int row, int column, const QModelIndex &idx) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; @@ -453,6 +452,4 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item QT_END_NAMESPACE -QT_END_HEADER - #endif //QSTANDARDITEMMODEL_H diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h index cb478db..7235a03 100644 --- a/src/gui/kernel/qclipboard.h +++ b/src/gui/kernel/qclipboard.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -112,6 +110,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCLIPBOARD_H diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index 25c1aac..0bf4cc7 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -109,7 +107,7 @@ public: static void setPos(QScreen *screen, int x, int y); inline static void setPos(const QPoint &p) { setPos(p.x(), p.y()); } inline static void setPos(QScreen *screen, const QPoint &p) { setPos(screen, p.x(), p.y()); } - + private: QCursorData *d; }; @@ -130,6 +128,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QCursor &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QCURSOR_H diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h index 1800861..553b0e1 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/kernel/qdrag.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDRAG_H diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index 82d22ae..79dcc6d 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -58,8 +58,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -907,8 +905,16 @@ private: Qt::ScreenOrientation m_orientation; }; -QT_END_NAMESPACE +class Q_GUI_EXPORT QApplicationStateChangeEvent : public QEvent +{ +public: + explicit QApplicationStateChangeEvent(Qt::ApplicationState state); + Qt::ApplicationState applicationState() const; -QT_END_HEADER +private: + Qt::ApplicationState m_applicationState; +}; + +QT_END_NAMESPACE #endif // QEVENT_H diff --git a/src/gui/kernel/qgenericplugin.h b/src/gui/kernel/qgenericplugin.h index 11409cc..f00a532 100644 --- a/src/gui/kernel/qgenericplugin.h +++ b/src/gui/kernel/qgenericplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -68,6 +66,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGENERICPLUGIN_H diff --git a/src/gui/kernel/qgenericpluginfactory.h b/src/gui/kernel/qgenericpluginfactory.h index e298c0b..2443e67 100644 --- a/src/gui/kernel/qgenericpluginfactory.h +++ b/src/gui/kernel/qgenericpluginfactory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,6 +59,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGENERICPLUGINFACTORY_H diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 7c0dbbd..0e9d6f2 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -187,6 +185,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGUIAPPLICATION_H diff --git a/src/gui/kernel/qinputmethod.h b/src/gui/kernel/qinputmethod.h index d038542..fe6cc3f 100644 --- a/src/gui/kernel/qinputmethod.h +++ b/src/gui/kernel/qinputmethod.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QInputMethodPrivate; @@ -69,6 +67,9 @@ public: QTransform inputItemTransform() const; void setInputItemTransform(const QTransform &transform); + QRectF inputItemRectangle() const; + void setInputItemRectangle(const QRectF &rect); + // in window coordinates QRectF cursorRectangle() const; // ### what if we have rotations for the item? @@ -116,6 +117,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 2bb0c73..05460c6 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,7 +59,7 @@ Q_GUI_EXPORT QDataStream &operator<<(QDataStream &in, const QKeySequence &ks); Q_GUI_EXPORT QDataStream &operator>>(QDataStream &out, QKeySequence &ks); #endif -#ifdef qdoc +#ifdef Q_QDOC void qt_set_sequence_auto_mnemonic(bool b); #endif @@ -138,7 +136,8 @@ public: SaveAs, Preferences, Quit, - FullScreen + FullScreen, + Deselect }; enum SequenceFormat { @@ -165,6 +164,9 @@ public: QString toString(SequenceFormat format = PortableText) const; static QKeySequence fromString(const QString &str, SequenceFormat format = PortableText); + static QList listFromString(const QString &str, SequenceFormat format = PortableText); + static QString listToString(const QList &list, SequenceFormat format = PortableText); + SequenceMatch matches(const QKeySequence &seq) const; static QKeySequence mnemonic(const QString &text); static QList keyBindings(StandardKey key); @@ -231,6 +233,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QKEYSEQUENCE_H diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index 9ce76a9..bfdb892 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,6 +42,8 @@ #ifndef QOPENGLCONTEXT_H #define QOPENGLCONTEXT_H +#include + #ifndef QT_NO_OPENGL #include @@ -58,8 +60,10 @@ #endif #include +#include -QT_BEGIN_HEADER +#include +#include QT_BEGIN_NAMESPACE @@ -71,6 +75,50 @@ class QPlatformOpenGLContext; class QScreen; class QSurface; +class QOpenGLVersionProfilePrivate; + +class Q_GUI_EXPORT QOpenGLVersionProfile +{ +public: + QOpenGLVersionProfile(); + explicit QOpenGLVersionProfile(const QSurfaceFormat &format); + QOpenGLVersionProfile(const QOpenGLVersionProfile &other); + ~QOpenGLVersionProfile(); + + QOpenGLVersionProfile &operator=(const QOpenGLVersionProfile &rhs); + + QPair version() const; + void setVersion(int majorVersion, int minorVersion); + + QSurfaceFormat::OpenGLContextProfile profile() const; + void setProfile(QSurfaceFormat::OpenGLContextProfile profile); + + bool hasProfiles() const; + bool isLegacyVersion() const; + bool isValid() const; + +private: + QOpenGLVersionProfilePrivate* d; +}; + +inline uint qHash(const QOpenGLVersionProfile &v, uint seed = 0) +{ + return qHash(static_cast(v.profile() * 1000) + + v.version().first * 100 + v.version().second * 10, seed); +} + +inline bool operator==(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs) +{ + if (lhs.profile() != rhs.profile()) + return false; + return lhs.version() == rhs.version(); +} + +inline bool operator!=(const QOpenGLVersionProfile &lhs, const QOpenGLVersionProfile &rhs) +{ + return !operator==(lhs, rhs); +} + class Q_GUI_EXPORT QOpenGLContextGroup : public QObject { Q_OBJECT @@ -129,6 +177,15 @@ public: QOpenGLFunctions *functions() const; + QAbstractOpenGLFunctions *versionFunctions(const QOpenGLVersionProfile &versionProfile = QOpenGLVersionProfile()) const; + + template + TYPE *versionFunctions() const + { + QOpenGLVersionProfile v = TYPE::versionProfile(); + return static_cast(versionFunctions(v)); + } + QSet extensions() const; bool hasExtension(const QByteArray &extension) const; @@ -149,18 +206,22 @@ private: friend class QOpenGL2PaintEngineExPrivate; friend class QSGDistanceFieldGlyphCache; friend class QWidgetPrivate; + friend class QAbstractOpenGLFunctionsPrivate; void *qGLContextHandle() const; void setQGLContextHandle(void *handle,void (*qGLContextDeleteFunction)(void *)); void deleteQGLContext(); + QOpenGLVersionFunctionsBackend* functionsBackend(const QOpenGLVersionStatus &v) const; + void insertFunctionsBackend(const QOpenGLVersionStatus &v, + QOpenGLVersionFunctionsBackend *backend); + void removeFunctionsBackend(const QOpenGLVersionStatus &v); + void destroy(); }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QGUIGLCONTEXT_H diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index 6a7b91b..2248f67 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -210,6 +208,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QPalette &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPALETTE_H diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index fbbd886..9fe4379 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -52,8 +52,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -160,7 +158,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCREEN_H diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h index cf46434..a1cd874 100644 --- a/src/gui/kernel/qsessionmanager.h +++ b/src/gui/kernel/qsessionmanager.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -49,8 +49,6 @@ #ifndef QT_NO_SESSIONMANAGER -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -101,8 +99,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SESSIONMANAGER #endif // QSESSIONMANAGER_H diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h index 7cf1948..64ef182 100644 --- a/src/gui/kernel/qstylehints.h +++ b/src/gui/kernel/qstylehints.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -64,6 +62,7 @@ public: int cursorFlashTime() const; bool showIsFullScreen() const; int passwordMaskDelay() const; + QChar passwordMaskCharacter() const; qreal fontSmoothingGamma() const; bool useRtlExtensions() const; @@ -74,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qsurface.h b/src/gui/kernel/qsurface.h index 3f6fd2f..8dbc230 100644 --- a/src/gui/kernel/qsurface.h +++ b/src/gui/kernel/qsurface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -60,7 +58,8 @@ class Q_GUI_EXPORT QSurface { public: enum SurfaceClass { - Window + Window, + Offscreen }; enum SurfaceType { @@ -89,6 +88,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif //QSURFACE_H diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h index 90af54a..7c3c846 100644 --- a/src/gui/kernel/qsurfaceformat.h +++ b/src/gui/kernel/qsurfaceformat.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,8 +42,7 @@ #define QSURFACEFORMAT_H #include - -QT_BEGIN_HEADER +#include QT_BEGIN_NAMESPACE @@ -122,6 +121,9 @@ public: void setMinorVersion(int minorVersion); int minorVersion() const; + QPair version() const; + void setVersion(int major, int minor); + bool stereo() const; void setStereo(bool enable); @@ -156,6 +158,4 @@ inline bool QSurfaceFormat::stereo() const QT_END_NAMESPACE -QT_END_HEADER - #endif //QSURFACEFORMAT_H diff --git a/src/gui/kernel/qtouchdevice.h b/src/gui/kernel/qtouchdevice.h index 6ae8d93..312bdce 100644 --- a/src/gui/kernel/qtouchdevice.h +++ b/src/gui/kernel/qtouchdevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -90,6 +88,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QTouchDevice::Capabilities) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOUCHDEVICE_H diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index c1a8e79..efdfd49 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -59,8 +59,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -93,12 +91,18 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_OBJECT Q_DECLARE_PRIVATE(QWindow) + Q_ENUMS(Visibility) + // All properties which are declared here are inherited by QQuickWindow and therefore available in QML. // So please think carefully about what it does to the QML namespace if you add any new ones, // particularly the possible meanings these names might have in any specializations of Window. // For example "state" (meaning windowState) is not a good property to declare, because it has // a different meaning in QQuickItem, and users will tend to assume it is the same for Window. + // Any new properties which you add here MUST be versioned and MUST be documented both as + // C++ properties in qwindow.cpp AND as QML properties in qquickwindow.cpp. + // http://qt-project.org/doc/qt-5.0/qtqml/qtqml-cppintegration-definetypes.html#type-revisions-and-versions + Q_PROPERTY(QString title READ title WRITE setTitle) Q_PROPERTY(Qt::WindowModality modality READ modality WRITE setModality NOTIFY modalityChanged) Q_PROPERTY(Qt::WindowFlags flags READ flags WRITE setFlags) @@ -106,14 +110,25 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(int y READ y WRITE setY NOTIFY yChanged) Q_PROPERTY(int width READ width WRITE setWidth NOTIFY widthChanged) Q_PROPERTY(int height READ height WRITE setHeight NOTIFY heightChanged) - Q_PROPERTY(int minimumWidth READ minimumWidth WRITE setMinimumWidth NOTIFY minimumWidthChanged) - Q_PROPERTY(int minimumHeight READ minimumHeight WRITE setMinimumHeight NOTIFY minimumHeightChanged) - Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged) - Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged) + Q_PROPERTY(int minimumWidth READ minimumWidth WRITE setMinimumWidth NOTIFY minimumWidthChanged REVISION 1) + Q_PROPERTY(int minimumHeight READ minimumHeight WRITE setMinimumHeight NOTIFY minimumHeightChanged REVISION 1) + Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged REVISION 1) + Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged REVISION 1) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) - Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) + Q_PROPERTY(bool active READ isActive NOTIFY activeChanged REVISION 1) + Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged REVISION 1) + Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged REVISION 1) + Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged REVISION 1) public: + enum Visibility { + Hidden = 0, + AutomaticVisibility, + Windowed, + Minimized, + Maximized, + FullScreen + }; explicit QWindow(QScreen *screen = 0); explicit QWindow(QWindow *parent); @@ -124,6 +139,9 @@ public: bool isVisible() const; + Visibility visibility() const; + void setVisibility(Visibility v); + void create(); WId winId() const; @@ -148,7 +166,10 @@ public: QString title() const; void setOpacity(qreal level); - void requestActivate(); + qreal opacity() const; + + void setMask(const QRegion ®ion); + QRegion mask() const; bool isActive() const; @@ -239,7 +260,11 @@ public: void unsetCursor(); #endif + static QWindow *fromWinId(WId id); + public Q_SLOTS: + Q_REVISION(1) void requestActivate(); + void setVisible(bool visible); void show(); @@ -261,10 +286,12 @@ public Q_SLOTS: void setWidth(int arg); void setHeight(int arg); - void setMinimumWidth(int w); - void setMinimumHeight(int h); - void setMaximumWidth(int w); - void setMaximumHeight(int h); + Q_REVISION(1) void setMinimumWidth(int w); + Q_REVISION(1) void setMinimumHeight(int h); + Q_REVISION(1) void setMaximumWidth(int w); + Q_REVISION(1) void setMaximumHeight(int h); + + void alert(int msec); Q_SIGNALS: void screenChanged(QScreen *screen); @@ -277,16 +304,20 @@ Q_SIGNALS: void widthChanged(int arg); void heightChanged(int arg); - void minimumWidthChanged(int arg); - void minimumHeightChanged(int arg); - void maximumWidthChanged(int arg); - void maximumHeightChanged(int arg); + Q_REVISION(1) void minimumWidthChanged(int arg); + Q_REVISION(1) void minimumHeightChanged(int arg); + Q_REVISION(1) void maximumWidthChanged(int arg); + Q_REVISION(1) void maximumHeightChanged(int arg); void visibleChanged(bool arg); - void contentOrientationChanged(Qt::ScreenOrientation orientation); + Q_REVISION(1) void visibilityChanged(QWindow::Visibility visibility); + Q_REVISION(1) void activeChanged(); + Q_REVISION(1) void contentOrientationChanged(Qt::ScreenOrientation orientation); void focusObjectChanged(QObject *object); + Q_REVISION(1) void opacityChanged(qreal opacity); + private Q_SLOTS: void screenDestroyed(QObject *screen); @@ -299,6 +330,7 @@ protected: virtual void showEvent(QShowEvent *); virtual void hideEvent(QHideEvent *); + // TODO Qt 6 - add closeEvent virtual handler virtual bool event(QEvent *); virtual void keyPressEvent(QKeyEvent *); @@ -319,6 +351,7 @@ protected: QWindow(QWindowPrivate &dd, QWindow *parent); private: + Q_PRIVATE_SLOT(d_func(), void _q_clearAlert()) QPlatformSurface *surfaceHandle() const; Q_DISABLE_COPY(QWindow) @@ -330,6 +363,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QWINDOW_H diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h index 432b2d4..42f4bc7 100644 --- a/src/gui/kernel/qwindowdefs.h +++ b/src/gui/kernel/qwindowdefs.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,7 +46,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -88,7 +87,6 @@ typedef QList QWidgetList; typedef QList QWindowList; QT_END_NAMESPACE -QT_END_HEADER // Window system dependent definitions @@ -104,7 +102,6 @@ typedef QT_PREPEND_NAMESPACE(quintptr) WId; -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE template class QHash; @@ -114,7 +111,6 @@ template class QSet; typedef QSet QWidgetSet; QT_END_NAMESPACE -QT_END_HEADER #if defined(QT_NEEDS_QMAIN) #define main qMain diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h index 467ff64..fea995a 100644 --- a/src/gui/kernel/qwindowdefs_win.h +++ b/src/gui/kernel/qwindowdefs_win.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -124,6 +122,4 @@ Q_WIDGETS_EXPORT HDC qt_win_display_dc(); QT_END_NAMESPACE -QT_END_HEADER - #endif // QWINDOWDEFS_WIN_H diff --git a/src/gui/math3d/qgenericmatrix.h b/src/gui/math3d/qgenericmatrix.h index e63f300..c243647 100644 --- a/src/gui/math3d/qgenericmatrix.h +++ b/src/gui/math3d/qgenericmatrix.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -401,6 +399,4 @@ Q_DECLARE_METATYPE(QMatrix3x4) Q_DECLARE_METATYPE(QMatrix4x2) Q_DECLARE_METATYPE(QMatrix4x3) -QT_END_HEADER - #endif diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index df98f02..d4ba7d6 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -1119,6 +1117,4 @@ QT_DEPRECATED QGenericMatrix qGenericMatrixFromMatrix4x4(const QMat QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 0f154b1..c12b0f4 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -324,6 +322,4 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QQuaternion &); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/math3d/qvector2d.h b/src/gui/math3d/qvector2d.h index 1dd10f3..b3c2272 100644 --- a/src/gui/math3d/qvector2d.h +++ b/src/gui/math3d/qvector2d.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -84,6 +82,9 @@ public: QVector2D normalized() const; void normalize(); + float distanceToPoint(const QVector2D &point) const; + float distanceToLine(const QVector2D& point, const QVector2D& direction) const; + QVector2D &operator+=(const QVector2D &vector); QVector2D &operator-=(const QVector2D &vector); QVector2D &operator*=(float factor); @@ -252,6 +253,4 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector2D &); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/math3d/qvector3d.h b/src/gui/math3d/qvector3d.h index 93a0071..49d9ca6 100644 --- a/src/gui/math3d/qvector3d.h +++ b/src/gui/math3d/qvector3d.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,6 +97,7 @@ public: static QVector3D normal (const QVector3D& v1, const QVector3D& v2, const QVector3D& v3); + float distanceToPoint(const QVector3D& point) const; float distanceToPlane(const QVector3D& plane, const QVector3D& normal) const; float distanceToPlane(const QVector3D& plane1, const QVector3D& plane2, const QVector3D& plane3) const; float distanceToLine(const QVector3D& point, const QVector3D& direction) const; @@ -276,6 +275,4 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector3D &); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/math3d/qvector4d.h b/src/gui/math3d/qvector4d.h index 56e1610..4bd3822 100644 --- a/src/gui/math3d/qvector4d.h +++ b/src/gui/math3d/qvector4d.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -281,6 +279,4 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QVector4D &); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/opengl/qopengl.h b/src/gui/opengl/qopengl.h index 5928b0b..6e8be66 100644 --- a/src/gui/opengl/qopengl.h +++ b/src/gui/opengl/qopengl.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,18 +42,44 @@ #ifndef QOPENGL_H #define QOPENGL_H +#include + #ifndef QT_NO_OPENGL -#include +// Windows always needs this to ensure that APIENTRY gets defined +#if defined(Q_OS_WIN) +# include +#endif -QT_BEGIN_HEADER +// Note: Mac OSX is a "controlled platform" for OpenGL ABI so we +// use the system provided headers there. Controlled means that the +// headers always match the actual driver implementation so there +// is no possibility of drivers exposing additional functionality +// from the system headers. Also it means that the vendor can +// (and does) make different choices about some OpenGL types. For +// e.g. Apple uses void* for GLhandleARB whereas other platforms +// use unsigned int. +// +// For the "uncontrolled" Windows and Linux platforms we use the +// official Khronos headers. On these platforms this gives +// access to additional functionality the drivers may expose but +// which the system headers do not. #if defined(QT_OPENGL_ES_2) # if defined(Q_OS_MAC) # include -# else +# include + +/* + OES_EGL_image_external is not included in the Apple provided + system headers yet, but we define the missing typedef so that + the qopenglextensions.cpp code will magically work once Apple + include the extension in their drivers. +*/ +typedef void* GLeglImageOES; + +# else // "uncontrolled" platforms # include -# endif /* Some GLES2 implementations (like the one on Harmattan) are missing the @@ -63,27 +89,15 @@ QT_BEGIN_HEADER */ typedef char GLchar; -# include -# ifndef GL_DOUBLE -# define GL_DOUBLE GL_FLOAT -# endif -# ifndef GLdouble +# include +# ifndef GL_DOUBLE +# define GL_DOUBLE GL_FLOAT +# endif +# ifndef GLdouble typedef GLfloat GLdouble; -# endif +# endif +# endif // Q_OS_MAC #else -// Mac OSX is a "controlled platform" for OpenGL ABI so we use -// the system provided headers there. Controlled means that the -// headers always match the actual driver implementation so there -// is no possibility of drivers exposing additional functionality -// from the system headers. Also it means that the vendor can -// (and does) make different choices about some OpenGL types. For -// e.g. Apple uses void* for GLhandleARB whereas other platforms -// use unsigned int. -// -// For the "uncontrolled" Windows and Linux platforms we use the -// official Khronos glext.h header. On these platforms this gives -// access to additional functionality the drivers may expose but -// which the system headers do not. # if defined(Q_OS_MAC) # include # if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7 @@ -92,27 +106,175 @@ typedef GLfloat GLdouble; # endif # include # else -# if defined(Q_OS_WIN) -# include -# endif +# define GL_GLEXT_LEGACY // Prevents GL/gl.h form #including system glext.h # include # include # endif // Q_OS_MAC #endif // Desktops, apart from Mac OS X prior to 10.7 can support OpenGL 3 +// and desktops apart from Mac can support OpenGL 4 #if !defined(QT_OPENGL_ES_2) # if !defined(Q_OS_MAC) || (defined(Q_OS_MAC) && MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7) # define QT_OPENGL_3 +# define QT_OPENGL_3_2 # endif +#if !defined(Q_OS_MAC) +# define QT_OPENGL_4 +# define QT_OPENGL_4_3 +#endif #endif QT_BEGIN_NAMESPACE -QT_END_NAMESPACE +// When all else fails we provide sensible fallbacks - this is needed to +// allow compilation on OS X 10.6 +#if !defined(QT_OPENGL_ES_2) + +// OS X 10.6 doesn't define these which are needed below +// OS X 10.7 and later defien them in gl3.h +#ifndef APIENTRY +#define APIENTRY +#endif +#ifndef APIENTRYP +#define APIENTRYP APIENTRY * +#endif +#ifndef GLAPI +#define GLAPI extern +#endif + -QT_END_HEADER +// This block is copied from glext.h and defines the types needed by +// a few extension classes. + +#include +#ifndef GL_VERSION_2_0 +/* GL type for program/shader text */ +typedef char GLchar; +#endif + +#ifndef GL_VERSION_1_5 +/* GL types for handling large vertex buffer objects */ +typedef ptrdiff_t GLintptr; +typedef ptrdiff_t GLsizeiptr; +#endif + +#ifndef GL_ARB_vertex_buffer_object +/* GL types for handling large vertex buffer objects */ +typedef ptrdiff_t GLintptrARB; +typedef ptrdiff_t GLsizeiptrARB; +#endif + +#ifndef GL_ARB_shader_objects +/* GL types for program/shader text and shader object handles */ +typedef char GLcharARB; +typedef unsigned int GLhandleARB; +#endif + +/* GL type for "half" precision (s10e5) float data in host memory */ +#ifndef GL_ARB_half_float_pixel +typedef unsigned short GLhalfARB; +#endif + +#ifndef GL_NV_half_float +typedef unsigned short GLhalfNV; +#endif + +#ifndef GLEXT_64_TYPES_DEFINED +/* This code block is duplicated in glxext.h, so must be protected */ +#define GLEXT_64_TYPES_DEFINED +/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ +/* (as used in the GL_EXT_timer_query extension). */ +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L +#include +#elif defined(__sun__) || defined(__digital__) +#include +#if defined(__STDC__) +#if defined(__arch64__) || defined(_LP64) +typedef long int int64_t; +typedef unsigned long int uint64_t; +#else +typedef long long int int64_t; +typedef unsigned long long int uint64_t; +#endif /* __arch64__ */ +#endif /* __STDC__ */ +#elif defined( __VMS ) || defined(__sgi) +#include +#elif defined(__SCO__) || defined(__USLC__) +#include +#elif defined(__UNIXOS2__) || defined(__SOL64__) +typedef long int int32_t; +typedef long long int int64_t; +typedef unsigned long long int uint64_t; +#elif defined(_WIN32) && defined(__GNUC__) +#include +#elif defined(_WIN32) +typedef __int32 int32_t; +typedef __int64 int64_t; +typedef unsigned __int64 uint64_t; +#else +/* Fallback if nothing above works */ +#include +#endif +#endif + +#ifndef GL_EXT_timer_query +typedef int64_t GLint64EXT; +typedef uint64_t GLuint64EXT; +#endif + +#ifndef GL_ARB_sync +typedef int64_t GLint64; +typedef uint64_t GLuint64; +typedef struct __GLsync *GLsync; +#endif + +#ifndef GL_ARB_cl_event +/* These incomplete types let us declare types compatible with OpenCL's cl_context and cl_event */ +struct _cl_context; +struct _cl_event; +#endif + +#ifndef GL_ARB_debug_output +typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#endif + +#ifndef GL_AMD_debug_output +typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#endif + +#ifndef GL_KHR_debug +typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#endif + +#ifndef GL_NV_vdpau_interop +typedef GLintptr GLvdpauSurfaceNV; +#endif + +// End of block copied from glext.h +#endif + + +// Types that aren't defined in all system's gl.h files. +typedef ptrdiff_t qopengl_GLintptr; +typedef ptrdiff_t qopengl_GLsizeiptr; + + +#if defined(APIENTRY) && !defined(QOPENGLF_APIENTRY) +# define QOPENGLF_APIENTRY APIENTRY +#endif + +# ifndef QOPENGLF_APIENTRYP +# ifdef QOPENGLF_APIENTRY +# define QOPENGLF_APIENTRYP QOPENGLF_APIENTRY * +# else +# define QOPENGLF_APIENTRY +# define QOPENGLF_APIENTRYP * +# endif +# endif + +QT_END_NAMESPACE #endif // QT_NO_OPENGL diff --git a/src/gui/opengl/qopenglbuffer.h b/src/gui/opengl/qopenglbuffer.h index 3b87d48..ab564e9 100644 --- a/src/gui/opengl/qopenglbuffer.h +++ b/src/gui/opengl/qopenglbuffer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,13 +42,13 @@ #ifndef QOPENGLBUFFER_H #define QOPENGLBUFFER_H +#include + #ifndef QT_NO_OPENGL #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -128,8 +128,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif diff --git a/src/gui/opengl/qopengles2ext.h b/src/gui/opengl/qopengles2ext.h index 61bfb59..5926d5b 100644 --- a/src/gui/opengl/qopengles2ext.h +++ b/src/gui/opengl/qopengles2ext.h @@ -3,10 +3,11 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif -/* $Revision: 18481 $ on $Date:: 2012-07-11 18:07:26 -0700 #$ */ +/* $Revision: 20771 $ on $Date:: 2013-03-05 18:53:24 -0800 #$ */ #ifdef __cplusplus extern "C" { @@ -99,7 +100,23 @@ typedef void* GLeglImageOES; #endif /* GL_OES_required_internalformat */ -/* No new tokens introduced by this extension. */ +#ifndef GL_OES_required_internalformat +#define GL_ALPHA8_OES 0x803C +#define GL_DEPTH_COMPONENT16_OES 0x81A5 +/* reuse GL_DEPTH_COMPONENT24_OES */ +/* reuse GL_DEPTH24_STENCIL8_OES */ +/* reuse GL_DEPTH_COMPONENT32_OES */ +#define GL_LUMINANCE4_ALPHA4_OES 0x8043 +#define GL_LUMINANCE8_ALPHA8_OES 0x8045 +#define GL_LUMINANCE8_OES 0x8040 +#define GL_RGBA4_OES 0x8056 +#define GL_RGB5_A1_OES 0x8057 +#define GL_RGB565_OES 0x8D62 +/* reuse GL_RGB8_OES */ +/* reuse GL_RGBA8_OES */ +/* reuse GL_RGB10_EXT */ +/* reuse GL_RGB10_A2_EXT */ +#endif /* GL_OES_rgb8_rgba8 */ #ifndef GL_OES_rgb8_rgba8 @@ -122,6 +139,10 @@ typedef void* GLeglImageOES; #define GL_STENCIL_INDEX4_OES 0x8D47 #endif +#ifndef GL_OES_surfaceless_context +#define GL_FRAMEBUFFER_UNDEFINED_OES 0x8219 +#endif + /* GL_OES_texture_3D */ #ifndef GL_OES_texture_3D #define GL_TEXTURE_WRAP_R_OES 0x8072 @@ -164,6 +185,85 @@ typedef void* GLeglImageOES; #endif /*------------------------------------------------------------------------* + * KHR extension tokens + *------------------------------------------------------------------------*/ + +#ifndef GL_KHR_debug +typedef void (GL_APIENTRYP GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 +#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 +#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 +#define GL_DEBUG_SOURCE_API 0x8246 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 +#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 +#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 +#define GL_DEBUG_SOURCE_APPLICATION 0x824A +#define GL_DEBUG_SOURCE_OTHER 0x824B +#define GL_DEBUG_TYPE_ERROR 0x824C +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E +#define GL_DEBUG_TYPE_PORTABILITY 0x824F +#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 +#define GL_DEBUG_TYPE_OTHER 0x8251 +#define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_BUFFER 0x82E0 +#define GL_SHADER 0x82E1 +#define GL_PROGRAM 0x82E2 +#define GL_QUERY 0x82E3 +/* PROGRAM_PIPELINE only in GL */ +#define GL_SAMPLER 0x82E6 +/* DISPLAY_LIST only in GL */ +#define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 +#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 +#define GL_DEBUG_LOGGED_MESSAGES 0x9145 +#define GL_DEBUG_SEVERITY_HIGH 0x9146 +#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 +#define GL_DEBUG_SEVERITY_LOW 0x9148 +#define GL_DEBUG_OUTPUT 0x92E0 +#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 +#define GL_STACK_OVERFLOW 0x0503 +#define GL_STACK_UNDERFLOW 0x0504 +#endif + +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 +#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD +#endif + +/*------------------------------------------------------------------------* * AMD extension tokens *------------------------------------------------------------------------*/ @@ -200,6 +300,18 @@ typedef void* GLeglImageOES; * ANGLE extension tokens *------------------------------------------------------------------------*/ +/* GL_ANGLE_depth_texture */ +#ifndef GL_ANGLE_depth_texture +#define GL_DEPTH_COMPONENT 0x1902 +#define GL_DEPTH_STENCIL_OES 0x84F9 +#define GL_UNSIGNED_SHORT 0x1403 +#define GL_UNSIGNED_INT 0x1405 +#define GL_UNSIGNED_INT_24_8_OES 0x84FA +#define GL_DEPTH_COMPONENT16 0x81A5 +#define GL_DEPTH_COMPONENT32_OES 0x81A7 +#define GL_DEPTH24_STENCIL8_OES 0x88F0 +#endif + /* GL_ANGLE_framebuffer_blit */ #ifndef GL_ANGLE_framebuffer_blit #define GL_READ_FRAMEBUFFER_ANGLE 0x8CA8 @@ -216,33 +328,38 @@ typedef void* GLeglImageOES; #endif /* GL_ANGLE_instanced_arrays */ -#ifndef GL_ANGLE_instanced_arrays +#ifndef GL_ANGLE_instanced_arrays #define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_ANGLE 0x88FE #endif /* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order +#ifndef GL_ANGLE_pack_reverse_row_order #define GL_PACK_REVERSE_ROW_ORDER_ANGLE 0x93A4 #endif +/* GL_ANGLE_program_binary */ +#ifndef GL_ANGLE_program_binary +#define GL_PROGRAM_BINARY_ANGLE 0x93A6 +#endif + /* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 +#ifndef GL_ANGLE_texture_compression_dxt3 #define GL_COMPRESSED_RGBA_S3TC_DXT3_ANGLE 0x83F2 #endif /* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 +#ifndef GL_ANGLE_texture_compression_dxt5 #define GL_COMPRESSED_RGBA_S3TC_DXT5_ANGLE 0x83F3 #endif /* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage +#ifndef GL_ANGLE_texture_usage #define GL_TEXTURE_USAGE_ANGLE 0x93A2 #define GL_FRAMEBUFFER_ATTACHMENT_ANGLE 0x93A3 #endif /* GL_ANGLE_translated_shader_source */ -#ifndef GL_ANGLE_translated_shader_source +#ifndef GL_ANGLE_translated_shader_source #define GL_TRANSLATED_SHADER_SOURCE_LENGTH_ANGLE 0x93A0 #endif @@ -250,12 +367,8 @@ typedef void* GLeglImageOES; * APPLE extension tokens *------------------------------------------------------------------------*/ -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_RGB_422_APPLE 0x8A1F -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif +/* GL_APPLE_copy_texture_levels */ +/* No new tokens introduced by this extension. */ /* GL_APPLE_framebuffer_multisample */ #ifndef GL_APPLE_framebuffer_multisample @@ -268,6 +381,47 @@ typedef void* GLeglImageOES; #define GL_READ_FRAMEBUFFER_BINDING_APPLE 0x8CAA #endif +/* GL_APPLE_rgb_422 */ +#ifndef GL_APPLE_rgb_422 +#define GL_RGB_422_APPLE 0x8A1F +#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA +#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB +#endif + +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync + +#ifndef __gl3_h_ +/* These types are defined with reference to + * in the Apple extension spec, but here we use the Khronos + * portable types in khrplatform.h, and assume those types + * are always defined. + * If any other extensions using these types are defined, + * the typedefs must move out of this block and be shared. + */ +typedef khronos_int64_t GLint64; +typedef khronos_uint64_t GLuint64; +typedef struct __GLsync *GLsync; +#endif + +#define GL_SYNC_OBJECT_APPLE 0x8A53 +#define GL_MAX_SERVER_WAIT_TIMEOUT_APPLE 0x9111 +#define GL_OBJECT_TYPE_APPLE 0x9112 +#define GL_SYNC_CONDITION_APPLE 0x9113 +#define GL_SYNC_STATUS_APPLE 0x9114 +#define GL_SYNC_FLAGS_APPLE 0x9115 +#define GL_SYNC_FENCE_APPLE 0x9116 +#define GL_SYNC_GPU_COMMANDS_COMPLETE_APPLE 0x9117 +#define GL_UNSIGNALED_APPLE 0x9118 +#define GL_SIGNALED_APPLE 0x9119 +#define GL_ALREADY_SIGNALED_APPLE 0x911A +#define GL_TIMEOUT_EXPIRED_APPLE 0x911B +#define GL_CONDITION_SATISFIED_APPLE 0x911C +#define GL_WAIT_FAILED_APPLE 0x911D +#define GL_SYNC_FLUSH_COMMANDS_BIT_APPLE 0x00000001 +#define GL_TIMEOUT_IGNORED_APPLE 0xFFFFFFFFFFFFFFFFull +#endif + /* GL_APPLE_texture_format_BGRA8888 */ #ifndef GL_APPLE_texture_format_BGRA8888 #define GL_BGRA_EXT 0x80E1 @@ -282,6 +436,11 @@ typedef void* GLeglImageOES; * ARM extension tokens *------------------------------------------------------------------------*/ +/* GL_ARM_mali_program_binary */ +#ifndef GL_ARM_mali_program_binary +#define GL_MALI_PROGRAM_BINARY_ARM 0x8F61 +#endif + /* GL_ARM_mali_shader_binary */ #ifndef GL_ARM_mali_shader_binary #define GL_MALI_SHADER_BINARY_ARM 0x8F60 @@ -330,15 +489,34 @@ typedef void* GLeglImageOES; #define GL_STENCIL_EXT 0x1802 #endif +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_MAP_READ_BIT_EXT 0x0001 +#define GL_MAP_WRITE_BIT_EXT 0x0002 +#define GL_MAP_INVALIDATE_RANGE_BIT_EXT 0x0004 +#define GL_MAP_INVALIDATE_BUFFER_BIT_EXT 0x0008 +#define GL_MAP_FLUSH_EXPLICIT_BIT_EXT 0x0010 +#define GL_MAP_UNSYNCHRONIZED_BIT_EXT 0x0020 +#endif + /* GL_EXT_multisampled_render_to_texture */ #ifndef GL_EXT_multisampled_render_to_texture #define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_SAMPLES_EXT 0x8D6C -/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ +/* reuse values from GL_EXT_framebuffer_multisample (desktop extension) */ #define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 #define GL_MAX_SAMPLES_EXT 0x8D57 #endif +/* GL_EXT_multiview_draw_buffers */ +#ifndef GL_EXT_multiview_draw_buffers +#define GL_COLOR_ATTACHMENT_EXT 0x90F0 +#define GL_MULTIVIEW_EXT 0x90F1 +#define GL_DRAW_BUFFER_EXT 0x0C01 +#define GL_READ_BUFFER_EXT 0x0C02 +#define GL_MAX_MULTIVIEW_BUFFERS_EXT 0x90F2 +#endif + /* GL_EXT_multi_draw_arrays */ /* No new tokens introduced by this extension. */ @@ -380,6 +558,11 @@ typedef void* GLeglImageOES; #define GL_PROGRAM_PIPELINE_BINDING_EXT 0x825A #endif +/* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT 0x8A52 +#endif + /* GL_EXT_shader_texture_lod */ /* No new tokens introduced by this extension. */ @@ -427,10 +610,10 @@ typedef void* GLeglImageOES; /* GL_EXT_texture_storage */ #ifndef GL_EXT_texture_storage #define GL_TEXTURE_IMMUTABLE_FORMAT_EXT 0x912F -#define GL_ALPHA8_EXT 0x803C +#define GL_ALPHA8_EXT 0x803C #define GL_LUMINANCE8_EXT 0x8040 #define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_RGBA32F_EXT 0x8814 +#define GL_RGBA32F_EXT 0x8814 #define GL_RGB32F_EXT 0x8815 #define GL_ALPHA32F_EXT 0x8816 #define GL_LUMINANCE32F_EXT 0x8818 @@ -440,12 +623,12 @@ typedef void* GLeglImageOES; #define GL_ALPHA16F_EXT 0x881C #define GL_LUMINANCE16F_EXT 0x881E #define GL_LUMINANCE_ALPHA16F_EXT 0x881F -#define GL_RGB10_A2_EXT 0x8059 +#define GL_RGB10_A2_EXT 0x8059 #define GL_RGB10_EXT 0x8052 #define GL_BGRA8_EXT 0x93A1 #define GL_R8_EXT 0x8229 #define GL_RG8_EXT 0x822B -#define GL_R32F_EXT 0x822E +#define GL_R32F_EXT 0x822E #define GL_RG32F_EXT 0x8230 #define GL_R16F_EXT 0x822D #define GL_RG16F_EXT 0x822F @@ -458,9 +641,9 @@ typedef void* GLeglImageOES; /* GL_EXT_unpack_subimage */ #ifndef GL_EXT_unpack_subimage -#define GL_UNPACK_ROW_LENGTH 0x0CF2 -#define GL_UNPACK_SKIP_ROWS 0x0CF3 -#define GL_UNPACK_SKIP_PIXELS 0x0CF4 +#define GL_UNPACK_ROW_LENGTH_EXT 0x0CF2 +#define GL_UNPACK_SKIP_ROWS_EXT 0x0CF3 +#define GL_UNPACK_SKIP_PIXELS_EXT 0x0CF4 #endif /*------------------------------------------------------------------------* @@ -478,7 +661,7 @@ typedef void* GLeglImageOES; /* GL_FJ_shader_binary_GCCSO */ #ifndef GL_FJ_shader_binary_GCCSO -#define GCCSO_SHADER_BINARY_FJ 0x9260 +#define GL_GCCSO_SHADER_BINARY_F 0x9260 #endif /*------------------------------------------------------------------------* @@ -509,6 +692,12 @@ typedef void* GLeglImageOES; #define GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03 #endif +/* GL_IMG_texture_compression_pvrtc2 */ +#ifndef GL_IMG_texture_compression_pvrtc2 +#define GL_COMPRESSED_RGBA_PVRTC_2BPPV2_IMG 0x9137 +#define GL_COMPRESSED_RGBA_PVRTC_4BPPV2_IMG 0x9138 +#endif + /* GL_IMG_multisampled_render_to_texture */ #ifndef GL_IMG_multisampled_render_to_texture #define GL_RENDERBUFFER_SAMPLES_IMG 0x9133 @@ -576,6 +765,9 @@ typedef void* GLeglImageOES; #define GL_COLOR_ATTACHMENT15_NV 0x8CEF #endif +/* GL_NV_draw_instanced */ +/* No new tokens introduced by this extension. */ + /* GL_NV_fbo_color_attachments */ #ifndef GL_NV_fbo_color_attachments #define GL_MAX_COLOR_ATTACHMENTS_NV 0x8CDF @@ -589,6 +781,29 @@ typedef void* GLeglImageOES; #define GL_FENCE_CONDITION_NV 0x84F4 #endif +/* GL_NV_framebuffer_blit */ +#ifndef GL_NV_framebuffer_blit +#define GL_READ_FRAMEBUFFER_NV 0x8CA8 +#define GL_DRAW_FRAMEBUFFER_NV 0x8CA9 +#define GL_DRAW_FRAMEBUFFER_BINDING_NV 0x8CA6 +#define GL_READ_FRAMEBUFFER_BINDING_NV 0x8CAA +#endif + +/* GL_NV_framebuffer_multisample */ +#ifndef GL_NV_framebuffer_multisample +#define GL_RENDERBUFFER_SAMPLES_NV 0x8CAB +#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_NV 0x8D56 +#define GL_MAX_SAMPLES_NV 0x8D57 +#endif + +/* GL_NV_generate_mipmap_sRGB */ +/* No new tokens introduced by this extension. */ + +/* GL_NV_instanced_arrays */ +#ifndef GL_NV_instanced_arrays +#define GL_VERTEX_ATTRIB_ARRAY_DIVISOR_NV 0x88FE +#endif + /* GL_NV_read_buffer */ #ifndef GL_NV_read_buffer #define GL_READ_BUFFER_NV 0x0C02 @@ -606,6 +821,36 @@ typedef void* GLeglImageOES; /* GL_NV_read_stencil */ /* No new tokens introduced by this extension. */ +/* GL_NV_shadow_samplers_array */ +#ifndef GL_NV_shadow_samplers_array +#define GL_SAMPLER_2D_ARRAY_SHADOW_NV 0x8DC4 +#endif + +/* GL_NV_shadow_samplers_cube */ +#ifndef GL_NV_shadow_samplers_cube +#define GL_SAMPLER_CUBE_SHADOW_NV 0x8DC5 +#endif + +/* GL_NV_sRGB_formats */ +#ifndef GL_NV_sRGB_formats +#define GL_SLUMINANCE_NV 0x8C46 +#define GL_SLUMINANCE_ALPHA_NV 0x8C44 +#define GL_SRGB8_NV 0x8C41 +#define GL_SLUMINANCE8_NV 0x8C47 +#define GL_SLUMINANCE8_ALPHA8_NV 0x8C45 +#define GL_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E +#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F +#define GL_ETC1_SRGB8_NV 0x88EE +#endif + +/* GL_NV_texture_border_clamp */ +#ifndef GL_NV_texture_border_clamp +#define GL_TEXTURE_BORDER_COLOR_NV 0x1004 +#define GL_CLAMP_TO_BORDER_NV 0x812D +#endif + /* GL_NV_texture_compression_s3tc_update */ /* No new tokens introduced by this extension. */ @@ -623,6 +868,14 @@ typedef void* GLeglImageOES; #define GL_ALPHA_TEST_REF_QCOM 0x0BC2 #endif +/* GL_QCOM_binning_control */ +#ifndef GL_QCOM_binning_control +#define GL_BINNING_CONTROL_HINT_QCOM 0x8FB0 +#define GL_CPU_OPTIMIZED_QCOM 0x8FB1 +#define GL_GPU_OPTIMIZED_QCOM 0x8FB2 +#define GL_RENDER_DIRECT_TO_FRAMEBUFFER_QCOM 0x8FB3 +#endif + /* GL_QCOM_driver_control */ /* No new tokens introduced by this extension. */ @@ -818,6 +1071,10 @@ typedef void (GL_APIENTRYP PFNGLGETBUFFERPOINTERVOESPROC) (GLenum target, GLenum #define GL_OES_stencil4 1 #endif +#ifndef GL_OES_surfaceless_context +#define GL_OES_surfaceless_context 1 +#endif + /* GL_OES_texture_3D */ #ifndef GL_OES_texture_3D #define GL_OES_texture_3D 1 @@ -888,6 +1145,43 @@ typedef GLboolean (GL_APIENTRYP PFNGLISVERTEXARRAYOESPROC) (GLuint array); #endif /*------------------------------------------------------------------------* + * KHR extension functions + *------------------------------------------------------------------------*/ + +#ifndef GL_KHR_debug +#define GL_KHR_debug 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +GL_APICALL void GL_APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +GL_APICALL void GL_APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); +GL_APICALL GLuint GL_APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +GL_APICALL void GL_APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); +GL_APICALL void GL_APIENTRY glPopDebugGroup (void); +GL_APICALL void GL_APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +GL_APICALL void GL_APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); +GL_APICALL void GL_APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +GL_APICALL void GL_APIENTRY glGetPointerv (GLenum pname, void **params); +#endif +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +typedef void (GL_APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); +typedef GLuint (GL_APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +typedef void (GL_APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); +typedef void (GL_APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); +typedef void (GL_APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (GL_APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (GL_APIENTRYP PFNGLGETPOINTERVPROC) (GLenum pname, void **params); +#endif + +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_KHR_texture_compression_astc_ldr 1 +#endif + + +/*------------------------------------------------------------------------* * AMD extension functions *------------------------------------------------------------------------*/ @@ -939,6 +1233,11 @@ typedef void (GL_APIENTRYP PFNGLGETPERFMONITORCOUNTERDATAAMDPROC) (GLuint monito * ANGLE extension functions *------------------------------------------------------------------------*/ +/* GL_ANGLE_depth_texture */ +#ifndef GL_ANGLE_depth_texture +#define GL_ANGLE_depth_texture 1 +#endif + /* GL_ANGLE_framebuffer_blit */ #ifndef GL_ANGLE_framebuffer_blit #define GL_ANGLE_framebuffer_blit 1 @@ -957,52 +1256,62 @@ GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleANGLE (GLenum target typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEANGLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); #endif -#ifndef GL_ANGLE_instanced_arrays +#ifndef GL_ANGLE_instanced_arrays +#define GL_ANGLE_instanced_arrays 1 #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glDrawArraysInstancedANGLE (GLenum mode, GLint first, GLsizei count, GLsizei primcount); GL_APICALL void GL_APIENTRY glDrawElementsInstancedANGLE (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); GL_APICALL void GL_APIENTRY glVertexAttribDivisorANGLE (GLuint index, GLuint divisor); #endif -typedef void (GL_APIENTRYP PFLGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); -typedef void (GL_APIENTRYP PFLGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); +typedef void (GL_APIENTRYP PFNGLDRAWARRAYSINSTANCEDANGLEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDANGLEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount); +typedef void (GL_APIENTRYP PFNGLVERTEXATTRIBDIVISORANGLEPROC) (GLuint index, GLuint divisor); #endif /* GL_ANGLE_pack_reverse_row_order */ -#ifndef GL_ANGLE_pack_reverse_row_order +#ifndef GL_ANGLE_pack_reverse_row_order #define GL_ANGLE_pack_reverse_row_order 1 #endif +/* GL_ANGLE_program_binary */ +#ifndef GL_ANGLE_program_binary +#define GL_ANGLE_program_binary 1 +#endif + /* GL_ANGLE_texture_compression_dxt3 */ -#ifndef GL_ANGLE_texture_compression_dxt3 +#ifndef GL_ANGLE_texture_compression_dxt3 #define GL_ANGLE_texture_compression_dxt3 1 #endif /* GL_ANGLE_texture_compression_dxt5 */ -#ifndef GL_ANGLE_texture_compression_dxt5 +#ifndef GL_ANGLE_texture_compression_dxt5 #define GL_ANGLE_texture_compression_dxt5 1 #endif /* GL_ANGLE_texture_usage */ -#ifndef GL_ANGLE_texture_usage +#ifndef GL_ANGLE_texture_usage #define GL_ANGLE_texture_usage 1 #endif -#ifndef GL_ANGLE_translated_shader_source +#ifndef GL_ANGLE_translated_shader_source #define GL_ANGLE_translated_shader_source 1 #ifdef GL_GLEXT_PROTOTYPES GL_APICALL void GL_APIENTRY glGetTranslatedShaderSourceANGLE (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); #endif -typedef void (GL_APIENTRYP PFLGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); +typedef void (GL_APIENTRYP PFNGLGETTRANSLATEDSHADERSOURCEANGLEPROC) (GLuint shader, GLsizei bufsize, GLsizei *length, GLchar *source); #endif /*------------------------------------------------------------------------* * APPLE extension functions *------------------------------------------------------------------------*/ -/* GL_APPLE_rgb_422 */ -#ifndef GL_APPLE_rgb_422 -#define GL_APPLE_rgb_422 1 +/* GL_APPLE_copy_texture_levels */ +#ifndef GL_APPLE_copy_texture_levels +#define GL_APPLE_copy_texture_levels 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glCopyTextureLevelsAPPLE (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); +#endif +typedef void (GL_APIENTRYP PFNGLCOPYTEXTURELEVELSAPPLEPROC) (GLuint destinationTexture, GLuint sourceTexture, GLint sourceBaseLevel, GLsizei sourceLevelCount); #endif /* GL_APPLE_framebuffer_multisample */ @@ -1016,6 +1325,32 @@ typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEAPPLEPROC) (GLenum typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); #endif +/* GL_APPLE_rgb_422 */ +#ifndef GL_APPLE_rgb_422 +#define GL_APPLE_rgb_422 1 +#endif + +/* GL_APPLE_sync */ +#ifndef GL_APPLE_sync +#define GL_APPLE_sync 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL GLsync GL_APIENTRY glFenceSyncAPPLE (GLenum condition, GLbitfield flags); +GL_APICALL GLboolean GL_APIENTRY glIsSyncAPPLE (GLsync sync); +GL_APICALL void GL_APIENTRY glDeleteSyncAPPLE (GLsync sync); +GL_APICALL GLenum GL_APIENTRY glClientWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_APICALL void GL_APIENTRY glWaitSyncAPPLE (GLsync sync, GLbitfield flags, GLuint64 timeout); +GL_APICALL void GL_APIENTRY glGetInteger64vAPPLE (GLenum pname, GLint64 *params); +GL_APICALL void GL_APIENTRY glGetSyncivAPPLE (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif +typedef GLsync (GL_APIENTRYP PFNGLFENCESYNCAPPLEPROC) (GLenum condition, GLbitfield flags); +typedef GLboolean (GL_APIENTRYP PFNGLISSYNCAPPLEPROC) (GLsync sync); +typedef void (GL_APIENTRYP PFNGLDELETESYNCAPPLEPROC) (GLsync sync); +typedef GLenum (GL_APIENTRYP PFNGLCLIENTWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLWAITSYNCAPPLEPROC) (GLsync sync, GLbitfield flags, GLuint64 timeout); +typedef void (GL_APIENTRYP PFNGLGETINTEGER64VAPPLEPROC) (GLenum pname, GLint64 *params); +typedef void (GL_APIENTRYP PFNGLGETSYNCIVAPPLEPROC) (GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values); +#endif + /* GL_APPLE_texture_format_BGRA8888 */ #ifndef GL_APPLE_texture_format_BGRA8888 #define GL_APPLE_texture_format_BGRA8888 1 @@ -1030,6 +1365,11 @@ typedef void (GL_APIENTRYP PFNGLRESOLVEMULTISAMPLEFRAMEBUFFERAPPLEPROC) (void); * ARM extension functions *------------------------------------------------------------------------*/ +/* GL_ARM_mali_program_binary */ +#ifndef GL_ARM_mali_program_binary +#define GL_ARM_mali_program_binary 1 +#endif + /* GL_ARM_mali_shader_binary */ #ifndef GL_ARM_mali_shader_binary #define GL_ARM_mali_shader_binary 1 @@ -1087,6 +1427,17 @@ GL_APICALL void GL_APIENTRY glDiscardFramebufferEXT (GLenum target, GLsizei numA typedef void (GL_APIENTRYP PFNGLDISCARDFRAMEBUFFEREXTPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); #endif +/* GL_EXT_map_buffer_range */ +#ifndef GL_EXT_map_buffer_range +#define GL_EXT_map_buffer_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void* GL_APIENTRY glMapBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +GL_APICALL void GL_APIENTRY glFlushMappedBufferRangeEXT (GLenum target, GLintptr offset, GLsizeiptr length); +#endif +typedef void* (GL_APIENTRYP PFNGLMAPBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length, GLbitfield access); +typedef void (GL_APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEEXTPROC) (GLenum target, GLintptr offset, GLsizeiptr length); +#endif + /* GL_EXT_multisampled_render_to_texture */ #ifndef GL_EXT_multisampled_render_to_texture #define GL_EXT_multisampled_render_to_texture 1 @@ -1098,6 +1449,19 @@ typedef void (GL_APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC) (GLenum t typedef void (GL_APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DMULTISAMPLEEXTPROC) (GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLsizei samples); #endif +/* GL_EXT_multiview_draw_buffers */ +#ifndef GL_EXT_multiview_draw_buffers +#define GL_EXT_multiview_draw_buffers 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glReadBufferIndexedEXT (GLenum src, GLint index); +GL_APICALL void GL_APIENTRY glDrawBuffersIndexedEXT (GLint n, const GLenum *location, const GLint *indices); +GL_APICALL void GL_APIENTRY glGetIntegeri_vEXT (GLenum target, GLuint index, GLint *data); +#endif +typedef void (GL_APIENTRYP PFNGLREADBUFFERINDEXEDEXTPROC) (GLenum src, GLint index); +typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSINDEXEDEXTPROC) (GLint n, const GLenum *location, const GLint *indices); +typedef void (GL_APIENTRYP PFNGLGETINTEGERI_VEXTPROC) (GLenum target, GLuint index, GLint *data); +#endif + #ifndef GL_EXT_multi_draw_arrays #define GL_EXT_multi_draw_arrays 1 #ifdef GL_GLEXT_PROTOTYPES @@ -1216,6 +1580,11 @@ typedef void (GL_APIENTRYP PFNGLVALIDATEPROGRAMPIPELINEEXTPROC) (GLuint pipeline typedef void (GL_APIENTRYP PFNGLGETPROGRAMPIPELINEINFOLOGEXTPROC) (GLuint pipeline, GLsizei bufSize, GLsizei *length, GLchar *infoLog); #endif +/* GL_EXT_shader_framebuffer_fetch */ +#ifndef GL_EXT_shader_framebuffer_fetch +#define GL_EXT_shader_framebuffer_fetch 1 +#endif + /* GL_EXT_shader_texture_lod */ #ifndef GL_EXT_shader_texture_lod #define GL_EXT_shader_texture_lod 1 @@ -1322,6 +1691,11 @@ typedef void (GL_APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum #define GL_IMG_texture_compression_pvrtc 1 #endif +/* GL_IMG_texture_compression_pvrtc2 */ +#ifndef GL_IMG_texture_compression_pvrtc2 +#define GL_IMG_texture_compression_pvrtc2 1 +#endif + /* GL_IMG_multisampled_render_to_texture */ #ifndef GL_IMG_multisampled_render_to_texture #define GL_IMG_multisampled_render_to_texture 1 @@ -1362,6 +1736,17 @@ GL_APICALL void GL_APIENTRY glDrawBuffersNV (GLsizei n, const GLenum *bufs); typedef void (GL_APIENTRYP PFNGLDRAWBUFFERSNVPROC) (GLsizei n, const GLenum *bufs); #endif +/* GL_NV_draw_instanced */ +#ifndef GL_NV_draw_instanced +#define GL_NV_draw_instanced 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glDrawArraysInstancedNV (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +GL_APICALL void GL_APIENTRY glDrawElementsInstancedNV (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +#endif +typedef void (GL_APIENTRYP PFNDRAWARRAYSINSTANCEDNVPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); +typedef void (GL_APIENTRYP PFNDRAWELEMENTSINSTANCEDNVPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +#endif + /* GL_NV_fbo_color_attachments */ #ifndef GL_NV_fbo_color_attachments #define GL_NV_fbo_color_attachments 1 @@ -1388,6 +1773,38 @@ typedef void (GL_APIENTRYP PFNGLFINISHFENCENVPROC) (GLuint fence); typedef void (GL_APIENTRYP PFNGLSETFENCENVPROC) (GLuint fence, GLenum condition); #endif +/* GL_NV_framebuffer_blit */ +#ifndef GL_NV_framebuffer_blit +#define GL_NV_framebuffer_blit 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glBlitFramebufferNV (int srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif +typedef void (GL_APIENTRYP PFNBLITFRAMEBUFFERNVPROC) (GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); +#endif + +/* GL_NV_framebuffer_multisample */ +#ifndef GL_NV_framebuffer_multisample +#define GL_NV_framebuffer_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glRenderbufferStorageMultisampleNV ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +#endif +typedef void (GL_APIENTRYP PFNRENDERBUFFERSTORAGEMULTISAMPLENVPROC) ( GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); +#endif + +/* GL_NV_generate_mipmap_sRGB */ +#ifndef GL_NV_generate_mipmap_sRGB +#define GL_NV_generate_mipmap_sRGB 1 +#endif + +/* GL_NV_instanced_arrays */ +#ifndef GL_NV_instanced_arrays +#define GL_NV_instanced_arrays 1 +#ifdef GL_GLEXT_PROTOTYPES +GL_APICALL void GL_APIENTRY glVertexAttribDivisorNV (GLuint index, GLuint divisor); +#endif +typedef void (GL_APIENTRYP PFNVERTEXATTRIBDIVISORNVPROC) (GLuint index, GLuint divisor); +#endif + /* GL_NV_read_buffer */ #ifndef GL_NV_read_buffer #define GL_NV_read_buffer 1 @@ -1417,6 +1834,26 @@ typedef void (GL_APIENTRYP PFNGLREADBUFFERNVPROC) (GLenum mode); #define GL_NV_read_stencil 1 #endif +/* GL_NV_shadow_samplers_array */ +#ifndef GL_NV_shadow_samplers_array +#define GL_NV_shadow_samplers_array 1 +#endif + +/* GL_NV_shadow_samplers_cube */ +#ifndef GL_NV_shadow_samplers_cube +#define GL_NV_shadow_samplers_cube 1 +#endif + +/* GL_NV_sRGB_formats */ +#ifndef GL_NV_sRGB_formats +#define GL_NV_sRGB_formats 1 +#endif + +/* GL_NV_texture_border_clamp */ +#ifndef GL_NV_texture_border_clamp +#define GL_NV_texture_border_clamp 1 +#endif + /* GL_NV_texture_compression_s3tc_update */ #ifndef GL_NV_texture_compression_s3tc_update #define GL_NV_texture_compression_s3tc_update 1 @@ -1440,6 +1877,11 @@ GL_APICALL void GL_APIENTRY glAlphaFuncQCOM (GLenum func, GLclampf ref); typedef void (GL_APIENTRYP PFNGLALPHAFUNCQCOMPROC) (GLenum func, GLclampf ref); #endif +/* GL_QCOM_binning_control */ +#ifndef GL_QCOM_binning_control +#define GL_QCOM_binning_control 1 +#endif + /* GL_QCOM_driver_control */ #ifndef GL_QCOM_driver_control #define GL_QCOM_driver_control 1 diff --git a/src/gui/opengl/qopenglext.h b/src/gui/opengl/qopenglext.h index 5d21cb6..dfdb824 100644 --- a/src/gui/opengl/qopenglext.h +++ b/src/gui/opengl/qopenglext.h @@ -3,6 +3,7 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_skip_header_check #pragma qt_sync_stop_processing #endif @@ -12,7 +13,7 @@ extern "C" { /* ** Copyright (c) 2007-2012 The Khronos Group Inc. -** +** ** Permission is hereby granted, free of charge, to any person obtaining a ** copy of this software and/or associated documentation files (the ** "Materials"), to deal in the Materials without restriction, including @@ -20,10 +21,10 @@ extern "C" { ** distribute, sublicense, and/or sell copies of the Materials, and to ** permit persons to whom the Materials are furnished to do so, subject to ** the following conditions: -** +** ** The above copyright notice and this permission notice shall be included ** in all copies or substantial portions of the Materials. -** +** ** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, ** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF ** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. @@ -34,9 +35,9 @@ extern "C" { */ /* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated $Date: 2012-06-18 11:26:35 -0700 (Mon, 18 Jun 2012) $ */ +/* glext.h last updated $Date: 2013-02-07 01:42:49 -0800 (Thu, 07 Feb 2013) $ */ /* Current version at http://www.opengl.org/registry/ */ -#define GL_GLEXT_VERSION 82 +#define GL_GLEXT_VERSION 86 /* Function declaration macros - to move into glplatform.h */ #if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) @@ -93,9 +94,6 @@ extern "C" { #define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 #define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 #define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED #define GL_RESCALE_NORMAL 0x803A #define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 #define GL_SINGLE_COLOR 0x81F9 @@ -115,9 +113,6 @@ extern "C" { #define GL_BLEND_EQUATION 0x8009 #define GL_FUNC_SUBTRACT 0x800A #define GL_FUNC_REVERSE_SUBTRACT 0x800B -#endif - -#ifndef GL_ARB_imaging_DEPRECATED #define GL_CONVOLUTION_1D 0x8010 #define GL_CONVOLUTION_2D 0x8011 #define GL_SEPARABLE_2D 0x8012 @@ -244,9 +239,6 @@ extern "C" { #define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 #define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 #define GL_CLAMP_TO_BORDER 0x812D -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED #define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 #define GL_MAX_TEXTURE_UNITS 0x84E2 #define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 @@ -303,9 +295,6 @@ extern "C" { #define GL_TEXTURE_DEPTH_SIZE 0x884A #define GL_TEXTURE_COMPARE_MODE 0x884C #define GL_TEXTURE_COMPARE_FUNC 0x884D -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED #define GL_POINT_SIZE_MIN 0x8126 #define GL_POINT_SIZE_MAX 0x8127 #define GL_POINT_DISTANCE_ATTENUATION 0x8129 @@ -359,9 +348,7 @@ extern "C" { #define GL_DYNAMIC_READ 0x88E9 #define GL_DYNAMIC_COPY 0x88EA #define GL_SAMPLES_PASSED 0x8914 -#endif - -#ifndef GL_VERSION_1_5_DEPRECATED +#define GL_SRC1_ALPHA 0x8589 #define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 #define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 #define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 @@ -383,7 +370,6 @@ extern "C" { #define GL_SRC1_RGB 0x8581 #define GL_SRC2_RGB 0x8582 #define GL_SRC0_ALPHA 0x8588 -#define GL_SRC1_ALPHA 0x8589 #define GL_SRC2_ALPHA 0x858A #endif @@ -468,9 +454,6 @@ extern "C" { #define GL_STENCIL_BACK_REF 0x8CA3 #define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 #define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_VERSION_2_0_DEPRECATED #define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 #define GL_POINT_SPRITE 0x8861 #define GL_COORD_REPLACE 0x8862 @@ -494,9 +477,6 @@ extern "C" { #define GL_SRGB8_ALPHA8 0x8C43 #define GL_COMPRESSED_SRGB 0x8C48 #define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#endif - -#ifndef GL_VERSION_2_1_DEPRECATED #define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F #define GL_SLUMINANCE_ALPHA 0x8C44 #define GL_SLUMINANCE8_ALPHA8 0x8C45 @@ -731,9 +711,6 @@ extern "C" { /* reuse GL_RG32UI */ /* Reuse tokens from ARB_vertex_array_object */ /* reuse GL_VERTEX_ARRAY_BINDING */ -#endif - -#ifndef GL_VERSION_3_0_DEPRECATED #define GL_CLAMP_VERTEX_COLOR 0x891A #define GL_CLAMP_FRAGMENT_COLOR 0x891B #define GL_ALPHA_INTEGER 0x8D97 @@ -754,7 +731,6 @@ extern "C" { #define GL_MAX_TEXTURE_BUFFER_SIZE 0x8C2B #define GL_TEXTURE_BINDING_BUFFER 0x8C2C #define GL_TEXTURE_BUFFER_DATA_STORE_BINDING 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT 0x8C2E #define GL_TEXTURE_RECTANGLE 0x84F5 #define GL_TEXTURE_BINDING_RECTANGLE 0x84F6 #define GL_PROXY_TEXTURE_RECTANGLE 0x84F7 @@ -1020,6 +996,7 @@ extern "C" { /* reuse GL_MEDIUM_INT */ /* reuse GL_HIGH_INT */ /* reuse GL_SHADER_COMPILER */ +/* reuse GL_SHADER_BINARY_FORMATS */ /* reuse GL_NUM_SHADER_BINARY_FORMATS */ /* reuse GL_MAX_VERTEX_UNIFORM_VECTORS */ /* reuse GL_MAX_VARYING_VECTORS */ @@ -1169,6 +1146,290 @@ extern "C" { /* reuse GL_TEXTURE_IMMUTABLE_FORMAT */ #endif +#ifndef GL_VERSION_4_3 +#define GL_NUM_SHADING_LANGUAGE_VERSIONS 0x82E9 +#define GL_VERTEX_ATTRIB_ARRAY_LONG 0x874E +/* Reuse tokens from ARB_arrays_of_arrays (none, GLSL only) */ +/* Reuse tokens from ARB_fragment_layer_viewport (none, GLSL only) */ +/* Reuse tokens from ARB_shader_image_size (none, GLSL only) */ +/* Reuse tokens from ARB_ES3_compatibility */ +/* reuse GL_COMPRESSED_RGB8_ETC2 */ +/* reuse GL_COMPRESSED_SRGB8_ETC2 */ +/* reuse GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 */ +/* reuse GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 */ +/* reuse GL_COMPRESSED_RGBA8_ETC2_EAC */ +/* reuse GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC */ +/* reuse GL_COMPRESSED_R11_EAC */ +/* reuse GL_COMPRESSED_SIGNED_R11_EAC */ +/* reuse GL_COMPRESSED_RG11_EAC */ +/* reuse GL_COMPRESSED_SIGNED_RG11_EAC */ +/* reuse GL_PRIMITIVE_RESTART_FIXED_INDEX */ +/* reuse GL_ANY_SAMPLES_PASSED_CONSERVATIVE */ +/* reuse GL_MAX_ELEMENT_INDEX */ +/* Reuse tokens from ARB_clear_buffer_object (none) */ +/* Reuse tokens from ARB_compute_shader */ +/* reuse GL_COMPUTE_SHADER */ +/* reuse GL_MAX_COMPUTE_UNIFORM_BLOCKS */ +/* reuse GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS */ +/* reuse GL_MAX_COMPUTE_IMAGE_UNIFORMS */ +/* reuse GL_MAX_COMPUTE_SHARED_MEMORY_SIZE */ +/* reuse GL_MAX_COMPUTE_UNIFORM_COMPONENTS */ +/* reuse GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS */ +/* reuse GL_MAX_COMPUTE_ATOMIC_COUNTERS */ +/* reuse GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS */ +/* reuse GL_MAX_COMPUTE_LOCAL_INVOCATIONS */ +/* reuse GL_MAX_COMPUTE_WORK_GROUP_COUNT */ +/* reuse GL_MAX_COMPUTE_WORK_GROUP_SIZE */ +/* reuse GL_COMPUTE_LOCAL_WORK_SIZE */ +/* reuse GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER */ +/* reuse GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER */ +/* reuse GL_DISPATCH_INDIRECT_BUFFER */ +/* reuse GL_DISPATCH_INDIRECT_BUFFER_BINDING */ +/* Reuse tokens from ARB_copy_image (none) */ +/* Reuse tokens from KHR_debug */ +/* reuse GL_DEBUG_OUTPUT_SYNCHRONOUS */ +/* reuse GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH */ +/* reuse GL_DEBUG_CALLBACK_FUNCTION */ +/* reuse GL_DEBUG_CALLBACK_USER_PARAM */ +/* reuse GL_DEBUG_SOURCE_API */ +/* reuse GL_DEBUG_SOURCE_WINDOW_SYSTEM */ +/* reuse GL_DEBUG_SOURCE_SHADER_COMPILER */ +/* reuse GL_DEBUG_SOURCE_THIRD_PARTY */ +/* reuse GL_DEBUG_SOURCE_APPLICATION */ +/* reuse GL_DEBUG_SOURCE_OTHER */ +/* reuse GL_DEBUG_TYPE_ERROR */ +/* reuse GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR */ +/* reuse GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR */ +/* reuse GL_DEBUG_TYPE_PORTABILITY */ +/* reuse GL_DEBUG_TYPE_PERFORMANCE */ +/* reuse GL_DEBUG_TYPE_OTHER */ +/* reuse GL_MAX_DEBUG_MESSAGE_LENGTH */ +/* reuse GL_MAX_DEBUG_LOGGED_MESSAGES */ +/* reuse GL_DEBUG_LOGGED_MESSAGES */ +/* reuse GL_DEBUG_SEVERITY_HIGH */ +/* reuse GL_DEBUG_SEVERITY_MEDIUM */ +/* reuse GL_DEBUG_SEVERITY_LOW */ +/* reuse GL_DEBUG_TYPE_MARKER */ +/* reuse GL_DEBUG_TYPE_PUSH_GROUP */ +/* reuse GL_DEBUG_TYPE_POP_GROUP */ +/* reuse GL_DEBUG_SEVERITY_NOTIFICATION */ +/* reuse GL_MAX_DEBUG_GROUP_STACK_DEPTH */ +/* reuse GL_DEBUG_GROUP_STACK_DEPTH */ +/* reuse GL_BUFFER */ +/* reuse GL_SHADER */ +/* reuse GL_PROGRAM */ +/* reuse GL_QUERY */ +/* reuse GL_PROGRAM_PIPELINE */ +/* reuse GL_SAMPLER */ +/* reuse GL_DISPLAY_LIST */ +/* reuse GL_MAX_LABEL_LENGTH */ +/* reuse GL_DEBUG_OUTPUT */ +/* reuse GL_CONTEXT_FLAG_DEBUG_BIT */ +/* reuse GL_STACK_UNDERFLOW */ +/* reuse GL_STACK_OVERFLOW */ +/* Reuse tokens from ARB_explicit_uniform_location */ +/* reuse GL_MAX_UNIFORM_LOCATIONS */ +/* Reuse tokens from ARB_framebuffer_no_attachments */ +/* reuse GL_FRAMEBUFFER_DEFAULT_WIDTH */ +/* reuse GL_FRAMEBUFFER_DEFAULT_HEIGHT */ +/* reuse GL_FRAMEBUFFER_DEFAULT_LAYERS */ +/* reuse GL_FRAMEBUFFER_DEFAULT_SAMPLES */ +/* reuse GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS */ +/* reuse GL_MAX_FRAMEBUFFER_WIDTH */ +/* reuse GL_MAX_FRAMEBUFFER_HEIGHT */ +/* reuse GL_MAX_FRAMEBUFFER_LAYERS */ +/* reuse GL_MAX_FRAMEBUFFER_SAMPLES */ +/* Reuse tokens from ARB_internalformat_query2 */ +/* reuse GL_INTERNALFORMAT_SUPPORTED */ +/* reuse GL_INTERNALFORMAT_PREFERRED */ +/* reuse GL_INTERNALFORMAT_RED_SIZE */ +/* reuse GL_INTERNALFORMAT_GREEN_SIZE */ +/* reuse GL_INTERNALFORMAT_BLUE_SIZE */ +/* reuse GL_INTERNALFORMAT_ALPHA_SIZE */ +/* reuse GL_INTERNALFORMAT_DEPTH_SIZE */ +/* reuse GL_INTERNALFORMAT_STENCIL_SIZE */ +/* reuse GL_INTERNALFORMAT_SHARED_SIZE */ +/* reuse GL_INTERNALFORMAT_RED_TYPE */ +/* reuse GL_INTERNALFORMAT_GREEN_TYPE */ +/* reuse GL_INTERNALFORMAT_BLUE_TYPE */ +/* reuse GL_INTERNALFORMAT_ALPHA_TYPE */ +/* reuse GL_INTERNALFORMAT_DEPTH_TYPE */ +/* reuse GL_INTERNALFORMAT_STENCIL_TYPE */ +/* reuse GL_MAX_WIDTH */ +/* reuse GL_MAX_HEIGHT */ +/* reuse GL_MAX_DEPTH */ +/* reuse GL_MAX_LAYERS */ +/* reuse GL_MAX_COMBINED_DIMENSIONS */ +/* reuse GL_COLOR_COMPONENTS */ +/* reuse GL_DEPTH_COMPONENTS */ +/* reuse GL_STENCIL_COMPONENTS */ +/* reuse GL_COLOR_RENDERABLE */ +/* reuse GL_DEPTH_RENDERABLE */ +/* reuse GL_STENCIL_RENDERABLE */ +/* reuse GL_FRAMEBUFFER_RENDERABLE */ +/* reuse GL_FRAMEBUFFER_RENDERABLE_LAYERED */ +/* reuse GL_FRAMEBUFFER_BLEND */ +/* reuse GL_READ_PIXELS */ +/* reuse GL_READ_PIXELS_FORMAT */ +/* reuse GL_READ_PIXELS_TYPE */ +/* reuse GL_TEXTURE_IMAGE_FORMAT */ +/* reuse GL_TEXTURE_IMAGE_TYPE */ +/* reuse GL_GET_TEXTURE_IMAGE_FORMAT */ +/* reuse GL_GET_TEXTURE_IMAGE_TYPE */ +/* reuse GL_MIPMAP */ +/* reuse GL_MANUAL_GENERATE_MIPMAP */ +/* reuse GL_AUTO_GENERATE_MIPMAP */ +/* reuse GL_COLOR_ENCODING */ +/* reuse GL_SRGB_READ */ +/* reuse GL_SRGB_WRITE */ +/* reuse GL_FILTER */ +/* reuse GL_VERTEX_TEXTURE */ +/* reuse GL_TESS_CONTROL_TEXTURE */ +/* reuse GL_TESS_EVALUATION_TEXTURE */ +/* reuse GL_GEOMETRY_TEXTURE */ +/* reuse GL_FRAGMENT_TEXTURE */ +/* reuse GL_COMPUTE_TEXTURE */ +/* reuse GL_TEXTURE_SHADOW */ +/* reuse GL_TEXTURE_GATHER */ +/* reuse GL_TEXTURE_GATHER_SHADOW */ +/* reuse GL_SHADER_IMAGE_LOAD */ +/* reuse GL_SHADER_IMAGE_STORE */ +/* reuse GL_SHADER_IMAGE_ATOMIC */ +/* reuse GL_IMAGE_TEXEL_SIZE */ +/* reuse GL_IMAGE_COMPATIBILITY_CLASS */ +/* reuse GL_IMAGE_PIXEL_FORMAT */ +/* reuse GL_IMAGE_PIXEL_TYPE */ +/* reuse GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST */ +/* reuse GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST */ +/* reuse GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE */ +/* reuse GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE */ +/* reuse GL_TEXTURE_COMPRESSED_BLOCK_WIDTH */ +/* reuse GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT */ +/* reuse GL_TEXTURE_COMPRESSED_BLOCK_SIZE */ +/* reuse GL_CLEAR_BUFFER */ +/* reuse GL_TEXTURE_VIEW */ +/* reuse GL_VIEW_COMPATIBILITY_CLASS */ +/* reuse GL_FULL_SUPPORT */ +/* reuse GL_CAVEAT_SUPPORT */ +/* reuse GL_IMAGE_CLASS_4_X_32 */ +/* reuse GL_IMAGE_CLASS_2_X_32 */ +/* reuse GL_IMAGE_CLASS_1_X_32 */ +/* reuse GL_IMAGE_CLASS_4_X_16 */ +/* reuse GL_IMAGE_CLASS_2_X_16 */ +/* reuse GL_IMAGE_CLASS_1_X_16 */ +/* reuse GL_IMAGE_CLASS_4_X_8 */ +/* reuse GL_IMAGE_CLASS_2_X_8 */ +/* reuse GL_IMAGE_CLASS_1_X_8 */ +/* reuse GL_IMAGE_CLASS_11_11_10 */ +/* reuse GL_IMAGE_CLASS_10_10_10_2 */ +/* reuse GL_VIEW_CLASS_128_BITS */ +/* reuse GL_VIEW_CLASS_96_BITS */ +/* reuse GL_VIEW_CLASS_64_BITS */ +/* reuse GL_VIEW_CLASS_48_BITS */ +/* reuse GL_VIEW_CLASS_32_BITS */ +/* reuse GL_VIEW_CLASS_24_BITS */ +/* reuse GL_VIEW_CLASS_16_BITS */ +/* reuse GL_VIEW_CLASS_8_BITS */ +/* reuse GL_VIEW_CLASS_S3TC_DXT1_RGB */ +/* reuse GL_VIEW_CLASS_S3TC_DXT1_RGBA */ +/* reuse GL_VIEW_CLASS_S3TC_DXT3_RGBA */ +/* reuse GL_VIEW_CLASS_S3TC_DXT5_RGBA */ +/* reuse GL_VIEW_CLASS_RGTC1_RED */ +/* reuse GL_VIEW_CLASS_RGTC2_RG */ +/* reuse GL_VIEW_CLASS_BPTC_UNORM */ +/* reuse GL_VIEW_CLASS_BPTC_FLOAT */ +/* Reuse tokens from ARB_invalidate_subdata (none) */ +/* Reuse tokens from ARB_multi_draw_indirect (none) */ +/* Reuse tokens from ARB_program_interface_query */ +/* reuse GL_UNIFORM */ +/* reuse GL_UNIFORM_BLOCK */ +/* reuse GL_PROGRAM_INPUT */ +/* reuse GL_PROGRAM_OUTPUT */ +/* reuse GL_BUFFER_VARIABLE */ +/* reuse GL_SHADER_STORAGE_BLOCK */ +/* reuse GL_VERTEX_SUBROUTINE */ +/* reuse GL_TESS_CONTROL_SUBROUTINE */ +/* reuse GL_TESS_EVALUATION_SUBROUTINE */ +/* reuse GL_GEOMETRY_SUBROUTINE */ +/* reuse GL_FRAGMENT_SUBROUTINE */ +/* reuse GL_COMPUTE_SUBROUTINE */ +/* reuse GL_VERTEX_SUBROUTINE_UNIFORM */ +/* reuse GL_TESS_CONTROL_SUBROUTINE_UNIFORM */ +/* reuse GL_TESS_EVALUATION_SUBROUTINE_UNIFORM */ +/* reuse GL_GEOMETRY_SUBROUTINE_UNIFORM */ +/* reuse GL_FRAGMENT_SUBROUTINE_UNIFORM */ +/* reuse GL_COMPUTE_SUBROUTINE_UNIFORM */ +/* reuse GL_TRANSFORM_FEEDBACK_VARYING */ +/* reuse GL_ACTIVE_RESOURCES */ +/* reuse GL_MAX_NAME_LENGTH */ +/* reuse GL_MAX_NUM_ACTIVE_VARIABLES */ +/* reuse GL_MAX_NUM_COMPATIBLE_SUBROUTINES */ +/* reuse GL_NAME_LENGTH */ +/* reuse GL_TYPE */ +/* reuse GL_ARRAY_SIZE */ +/* reuse GL_OFFSET */ +/* reuse GL_BLOCK_INDEX */ +/* reuse GL_ARRAY_STRIDE */ +/* reuse GL_MATRIX_STRIDE */ +/* reuse GL_IS_ROW_MAJOR */ +/* reuse GL_ATOMIC_COUNTER_BUFFER_INDEX */ +/* reuse GL_BUFFER_BINDING */ +/* reuse GL_BUFFER_DATA_SIZE */ +/* reuse GL_NUM_ACTIVE_VARIABLES */ +/* reuse GL_ACTIVE_VARIABLES */ +/* reuse GL_REFERENCED_BY_VERTEX_SHADER */ +/* reuse GL_REFERENCED_BY_TESS_CONTROL_SHADER */ +/* reuse GL_REFERENCED_BY_TESS_EVALUATION_SHADER */ +/* reuse GL_REFERENCED_BY_GEOMETRY_SHADER */ +/* reuse GL_REFERENCED_BY_FRAGMENT_SHADER */ +/* reuse GL_REFERENCED_BY_COMPUTE_SHADER */ +/* reuse GL_TOP_LEVEL_ARRAY_SIZE */ +/* reuse GL_TOP_LEVEL_ARRAY_STRIDE */ +/* reuse GL_LOCATION */ +/* reuse GL_LOCATION_INDEX */ +/* reuse GL_IS_PER_PATCH */ +/* Reuse tokens from ARB_robust_buffer_access_behavior (none) */ +/* Reuse tokens from ARB_shader_storage_buffer_object */ +/* reuse GL_SHADER_STORAGE_BUFFER */ +/* reuse GL_SHADER_STORAGE_BUFFER_BINDING */ +/* reuse GL_SHADER_STORAGE_BUFFER_START */ +/* reuse GL_SHADER_STORAGE_BUFFER_SIZE */ +/* reuse GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS */ +/* reuse GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS */ +/* reuse GL_MAX_SHADER_STORAGE_BLOCK_SIZE */ +/* reuse GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT */ +/* reuse GL_SHADER_STORAGE_BARRIER_BIT */ +/* reuse GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES */ +/* Reuse tokens from ARB_stencil_texturing */ +/* reuse GL_DEPTH_STENCIL_TEXTURE_MODE */ +/* Reuse tokens from ARB_texture_buffer_range */ +/* reuse GL_TEXTURE_BUFFER_OFFSET */ +/* reuse GL_TEXTURE_BUFFER_SIZE */ +/* reuse GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT */ +/* Reuse tokens from ARB_texture_query_levels (none) */ +/* Reuse tokens from ARB_texture_storage_multisample (none) */ +/* Reuse tokens from ARB_texture_view */ +/* reuse GL_TEXTURE_VIEW_MIN_LEVEL */ +/* reuse GL_TEXTURE_VIEW_NUM_LEVELS */ +/* reuse GL_TEXTURE_VIEW_MIN_LAYER */ +/* reuse GL_TEXTURE_VIEW_NUM_LAYERS */ +/* reuse GL_TEXTURE_IMMUTABLE_LEVELS */ +/* Reuse tokens from ARB_vertex_attrib_binding */ +/* reuse GL_VERTEX_ATTRIB_BINDING */ +/* reuse GL_VERTEX_ATTRIB_RELATIVE_OFFSET */ +/* reuse GL_VERTEX_BINDING_DIVISOR */ +/* reuse GL_VERTEX_BINDING_OFFSET */ +/* reuse GL_VERTEX_BINDING_STRIDE */ +/* reuse GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET */ +/* reuse GL_MAX_VERTEX_ATTRIB_BINDINGS */ +#endif + #ifndef GL_ARB_multitexture #define GL_TEXTURE0_ARB 0x84C0 #define GL_TEXTURE1_ARB 0x84C1 @@ -1751,9 +2012,6 @@ extern "C" { #define GL_RENDERBUFFER_STENCIL_SIZE 0x8D55 #define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE 0x8D56 #define GL_MAX_SAMPLES 0x8D57 -#endif - -#ifndef GL_ARB_framebuffer_object_DEPRECATED #define GL_INDEX 0x8222 #define GL_TEXTURE_LUMINANCE_TYPE 0x8C14 #define GL_TEXTURE_INTENSITY_TYPE 0x8C15 @@ -1985,6 +2243,7 @@ extern "C" { #ifndef GL_ARB_texture_gather #define GL_MIN_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5E #define GL_MAX_PROGRAM_TEXTURE_GATHER_OFFSET_ARB 0x8E5F +#define GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS_ARB 0x8F9F #endif #ifndef GL_ARB_texture_query_lod @@ -2162,6 +2421,7 @@ extern "C" { #define GL_MEDIUM_INT 0x8DF4 #define GL_HIGH_INT 0x8DF5 #define GL_SHADER_COMPILER 0x8DFA +#define GL_SHADER_BINARY_FORMATS 0x8DF8 #define GL_NUM_SHADER_BINARY_FORMATS 0x8DF9 #define GL_MAX_VERTEX_UNIFORM_VECTORS 0x8DFB #define GL_MAX_VARYING_VECTORS 0x8DFC @@ -2404,6 +2664,386 @@ extern "C" { #define GL_TEXTURE_IMMUTABLE_FORMAT 0x912F #endif +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_COMPRESSED_RGBA_ASTC_4x4_KHR 0x93B0 +#define GL_COMPRESSED_RGBA_ASTC_5x4_KHR 0x93B1 +#define GL_COMPRESSED_RGBA_ASTC_5x5_KHR 0x93B2 +#define GL_COMPRESSED_RGBA_ASTC_6x5_KHR 0x93B3 +#define GL_COMPRESSED_RGBA_ASTC_6x6_KHR 0x93B4 +#define GL_COMPRESSED_RGBA_ASTC_8x5_KHR 0x93B5 +#define GL_COMPRESSED_RGBA_ASTC_8x6_KHR 0x93B6 +#define GL_COMPRESSED_RGBA_ASTC_8x8_KHR 0x93B7 +#define GL_COMPRESSED_RGBA_ASTC_10x5_KHR 0x93B8 +#define GL_COMPRESSED_RGBA_ASTC_10x6_KHR 0x93B9 +#define GL_COMPRESSED_RGBA_ASTC_10x8_KHR 0x93BA +#define GL_COMPRESSED_RGBA_ASTC_10x10_KHR 0x93BB +#define GL_COMPRESSED_RGBA_ASTC_12x10_KHR 0x93BC +#define GL_COMPRESSED_RGBA_ASTC_12x12_KHR 0x93BD +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR 0x93D0 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR 0x93D1 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR 0x93D2 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR 0x93D3 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR 0x93D4 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR 0x93D5 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR 0x93D6 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR 0x93D7 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR 0x93D8 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR 0x93D9 +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR 0x93DA +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR 0x93DB +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR 0x93DC +#define GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR 0x93DD +#endif + +#ifndef GL_KHR_debug +#define GL_DEBUG_OUTPUT_SYNCHRONOUS 0x8242 +#define GL_DEBUG_NEXT_LOGGED_MESSAGE_LENGTH 0x8243 +#define GL_DEBUG_CALLBACK_FUNCTION 0x8244 +#define GL_DEBUG_CALLBACK_USER_PARAM 0x8245 +#define GL_DEBUG_SOURCE_API 0x8246 +#define GL_DEBUG_SOURCE_WINDOW_SYSTEM 0x8247 +#define GL_DEBUG_SOURCE_SHADER_COMPILER 0x8248 +#define GL_DEBUG_SOURCE_THIRD_PARTY 0x8249 +#define GL_DEBUG_SOURCE_APPLICATION 0x824A +#define GL_DEBUG_SOURCE_OTHER 0x824B +#define GL_DEBUG_TYPE_ERROR 0x824C +#define GL_DEBUG_TYPE_DEPRECATED_BEHAVIOR 0x824D +#define GL_DEBUG_TYPE_UNDEFINED_BEHAVIOR 0x824E +#define GL_DEBUG_TYPE_PORTABILITY 0x824F +#define GL_DEBUG_TYPE_PERFORMANCE 0x8250 +#define GL_DEBUG_TYPE_OTHER 0x8251 +#define GL_DEBUG_TYPE_MARKER 0x8268 +#define GL_DEBUG_TYPE_PUSH_GROUP 0x8269 +#define GL_DEBUG_TYPE_POP_GROUP 0x826A +#define GL_DEBUG_SEVERITY_NOTIFICATION 0x826B +#define GL_MAX_DEBUG_GROUP_STACK_DEPTH 0x826C +#define GL_DEBUG_GROUP_STACK_DEPTH 0x826D +#define GL_BUFFER 0x82E0 +#define GL_SHADER 0x82E1 +#define GL_PROGRAM 0x82E2 +#define GL_QUERY 0x82E3 +#define GL_PROGRAM_PIPELINE 0x82E4 +#define GL_SAMPLER 0x82E6 +#define GL_DISPLAY_LIST 0x82E7 +/* DISPLAY_LIST used in compatibility profile only */ +#define GL_MAX_LABEL_LENGTH 0x82E8 +#define GL_MAX_DEBUG_MESSAGE_LENGTH 0x9143 +#define GL_MAX_DEBUG_LOGGED_MESSAGES 0x9144 +#define GL_DEBUG_LOGGED_MESSAGES 0x9145 +#define GL_DEBUG_SEVERITY_HIGH 0x9146 +#define GL_DEBUG_SEVERITY_MEDIUM 0x9147 +#define GL_DEBUG_SEVERITY_LOW 0x9148 +#define GL_DEBUG_OUTPUT 0x92E0 +#define GL_CONTEXT_FLAG_DEBUG_BIT 0x00000002 +/* reuse GL_STACK_UNDERFLOW */ +/* reuse GL_STACK_OVERFLOW */ +#endif + +#ifndef GL_ARB_arrays_of_arrays +#endif + +#ifndef GL_ARB_clear_buffer_object +#endif + +#ifndef GL_ARB_compute_shader +#define GL_COMPUTE_SHADER 0x91B9 +#define GL_MAX_COMPUTE_UNIFORM_BLOCKS 0x91BB +#define GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS 0x91BC +#define GL_MAX_COMPUTE_IMAGE_UNIFORMS 0x91BD +#define GL_MAX_COMPUTE_SHARED_MEMORY_SIZE 0x8262 +#define GL_MAX_COMPUTE_UNIFORM_COMPONENTS 0x8263 +#define GL_MAX_COMPUTE_ATOMIC_COUNTER_BUFFERS 0x8264 +#define GL_MAX_COMPUTE_ATOMIC_COUNTERS 0x8265 +#define GL_MAX_COMBINED_COMPUTE_UNIFORM_COMPONENTS 0x8266 +#define GL_MAX_COMPUTE_LOCAL_INVOCATIONS 0x90EB +#define GL_MAX_COMPUTE_WORK_GROUP_COUNT 0x91BE +#define GL_MAX_COMPUTE_WORK_GROUP_SIZE 0x91BF +#define GL_COMPUTE_LOCAL_WORK_SIZE 0x8267 +#define GL_UNIFORM_BLOCK_REFERENCED_BY_COMPUTE_SHADER 0x90EC +#define GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_COMPUTE_SHADER 0x90ED +#define GL_DISPATCH_INDIRECT_BUFFER 0x90EE +#define GL_DISPATCH_INDIRECT_BUFFER_BINDING 0x90EF +#define GL_COMPUTE_SHADER_BIT 0x00000020 +#endif + +#ifndef GL_ARB_copy_image +#endif + +#ifndef GL_ARB_texture_view +#define GL_TEXTURE_VIEW_MIN_LEVEL 0x82DB +#define GL_TEXTURE_VIEW_NUM_LEVELS 0x82DC +#define GL_TEXTURE_VIEW_MIN_LAYER 0x82DD +#define GL_TEXTURE_VIEW_NUM_LAYERS 0x82DE +#define GL_TEXTURE_IMMUTABLE_LEVELS 0x82DF +#endif + +#ifndef GL_ARB_vertex_attrib_binding +#define GL_VERTEX_ATTRIB_BINDING 0x82D4 +#define GL_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D5 +#define GL_VERTEX_BINDING_DIVISOR 0x82D6 +#define GL_VERTEX_BINDING_OFFSET 0x82D7 +#define GL_VERTEX_BINDING_STRIDE 0x82D8 +#define GL_MAX_VERTEX_ATTRIB_RELATIVE_OFFSET 0x82D9 +#define GL_MAX_VERTEX_ATTRIB_BINDINGS 0x82DA +#endif + +#ifndef GL_ARB_robustness_isolation +#endif + +#ifndef GL_ARB_ES3_compatibility +#define GL_COMPRESSED_RGB8_ETC2 0x9274 +#define GL_COMPRESSED_SRGB8_ETC2 0x9275 +#define GL_COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9276 +#define GL_COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2 0x9277 +#define GL_COMPRESSED_RGBA8_ETC2_EAC 0x9278 +#define GL_COMPRESSED_SRGB8_ALPHA8_ETC2_EAC 0x9279 +#define GL_COMPRESSED_R11_EAC 0x9270 +#define GL_COMPRESSED_SIGNED_R11_EAC 0x9271 +#define GL_COMPRESSED_RG11_EAC 0x9272 +#define GL_COMPRESSED_SIGNED_RG11_EAC 0x9273 +#define GL_PRIMITIVE_RESTART_FIXED_INDEX 0x8D69 +#define GL_ANY_SAMPLES_PASSED_CONSERVATIVE 0x8D6A +#define GL_MAX_ELEMENT_INDEX 0x8D6B +#endif + +#ifndef GL_ARB_explicit_uniform_location +#define GL_MAX_UNIFORM_LOCATIONS 0x826E +#endif + +#ifndef GL_ARB_fragment_layer_viewport +#endif + +#ifndef GL_ARB_framebuffer_no_attachments +#define GL_FRAMEBUFFER_DEFAULT_WIDTH 0x9310 +#define GL_FRAMEBUFFER_DEFAULT_HEIGHT 0x9311 +#define GL_FRAMEBUFFER_DEFAULT_LAYERS 0x9312 +#define GL_FRAMEBUFFER_DEFAULT_SAMPLES 0x9313 +#define GL_FRAMEBUFFER_DEFAULT_FIXED_SAMPLE_LOCATIONS 0x9314 +#define GL_MAX_FRAMEBUFFER_WIDTH 0x9315 +#define GL_MAX_FRAMEBUFFER_HEIGHT 0x9316 +#define GL_MAX_FRAMEBUFFER_LAYERS 0x9317 +#define GL_MAX_FRAMEBUFFER_SAMPLES 0x9318 +#endif + +#ifndef GL_ARB_internalformat_query2 +/* reuse GL_IMAGE_FORMAT_COMPATIBILITY_TYPE */ +/* reuse GL_NUM_SAMPLE_COUNTS */ +/* reuse GL_RENDERBUFFER */ +/* reuse GL_SAMPLES */ +/* reuse GL_TEXTURE_1D */ +/* reuse GL_TEXTURE_1D_ARRAY */ +/* reuse GL_TEXTURE_2D */ +/* reuse GL_TEXTURE_2D_ARRAY */ +/* reuse GL_TEXTURE_3D */ +/* reuse GL_TEXTURE_CUBE_MAP */ +/* reuse GL_TEXTURE_CUBE_MAP_ARRAY */ +/* reuse GL_TEXTURE_RECTANGLE */ +/* reuse GL_TEXTURE_BUFFER */ +/* reuse GL_TEXTURE_2D_MULTISAMPLE */ +/* reuse GL_TEXTURE_2D_MULTISAMPLE_ARRAY */ +/* reuse GL_TEXTURE_COMPRESSED */ +#define GL_INTERNALFORMAT_SUPPORTED 0x826F +#define GL_INTERNALFORMAT_PREFERRED 0x8270 +#define GL_INTERNALFORMAT_RED_SIZE 0x8271 +#define GL_INTERNALFORMAT_GREEN_SIZE 0x8272 +#define GL_INTERNALFORMAT_BLUE_SIZE 0x8273 +#define GL_INTERNALFORMAT_ALPHA_SIZE 0x8274 +#define GL_INTERNALFORMAT_DEPTH_SIZE 0x8275 +#define GL_INTERNALFORMAT_STENCIL_SIZE 0x8276 +#define GL_INTERNALFORMAT_SHARED_SIZE 0x8277 +#define GL_INTERNALFORMAT_RED_TYPE 0x8278 +#define GL_INTERNALFORMAT_GREEN_TYPE 0x8279 +#define GL_INTERNALFORMAT_BLUE_TYPE 0x827A +#define GL_INTERNALFORMAT_ALPHA_TYPE 0x827B +#define GL_INTERNALFORMAT_DEPTH_TYPE 0x827C +#define GL_INTERNALFORMAT_STENCIL_TYPE 0x827D +#define GL_MAX_WIDTH 0x827E +#define GL_MAX_HEIGHT 0x827F +#define GL_MAX_DEPTH 0x8280 +#define GL_MAX_LAYERS 0x8281 +#define GL_MAX_COMBINED_DIMENSIONS 0x8282 +#define GL_COLOR_COMPONENTS 0x8283 +#define GL_DEPTH_COMPONENTS 0x8284 +#define GL_STENCIL_COMPONENTS 0x8285 +#define GL_COLOR_RENDERABLE 0x8286 +#define GL_DEPTH_RENDERABLE 0x8287 +#define GL_STENCIL_RENDERABLE 0x8288 +#define GL_FRAMEBUFFER_RENDERABLE 0x8289 +#define GL_FRAMEBUFFER_RENDERABLE_LAYERED 0x828A +#define GL_FRAMEBUFFER_BLEND 0x828B +#define GL_READ_PIXELS 0x828C +#define GL_READ_PIXELS_FORMAT 0x828D +#define GL_READ_PIXELS_TYPE 0x828E +#define GL_TEXTURE_IMAGE_FORMAT 0x828F +#define GL_TEXTURE_IMAGE_TYPE 0x8290 +#define GL_GET_TEXTURE_IMAGE_FORMAT 0x8291 +#define GL_GET_TEXTURE_IMAGE_TYPE 0x8292 +#define GL_MIPMAP 0x8293 +#define GL_MANUAL_GENERATE_MIPMAP 0x8294 +#define GL_AUTO_GENERATE_MIPMAP 0x8295 +#define GL_COLOR_ENCODING 0x8296 +#define GL_SRGB_READ 0x8297 +#define GL_SRGB_WRITE 0x8298 +#define GL_SRGB_DECODE_ARB 0x8299 +#define GL_FILTER 0x829A +#define GL_VERTEX_TEXTURE 0x829B +#define GL_TESS_CONTROL_TEXTURE 0x829C +#define GL_TESS_EVALUATION_TEXTURE 0x829D +#define GL_GEOMETRY_TEXTURE 0x829E +#define GL_FRAGMENT_TEXTURE 0x829F +#define GL_COMPUTE_TEXTURE 0x82A0 +#define GL_TEXTURE_SHADOW 0x82A1 +#define GL_TEXTURE_GATHER 0x82A2 +#define GL_TEXTURE_GATHER_SHADOW 0x82A3 +#define GL_SHADER_IMAGE_LOAD 0x82A4 +#define GL_SHADER_IMAGE_STORE 0x82A5 +#define GL_SHADER_IMAGE_ATOMIC 0x82A6 +#define GL_IMAGE_TEXEL_SIZE 0x82A7 +#define GL_IMAGE_COMPATIBILITY_CLASS 0x82A8 +#define GL_IMAGE_PIXEL_FORMAT 0x82A9 +#define GL_IMAGE_PIXEL_TYPE 0x82AA +#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_TEST 0x82AC +#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_TEST 0x82AD +#define GL_SIMULTANEOUS_TEXTURE_AND_DEPTH_WRITE 0x82AE +#define GL_SIMULTANEOUS_TEXTURE_AND_STENCIL_WRITE 0x82AF +#define GL_TEXTURE_COMPRESSED_BLOCK_WIDTH 0x82B1 +#define GL_TEXTURE_COMPRESSED_BLOCK_HEIGHT 0x82B2 +#define GL_TEXTURE_COMPRESSED_BLOCK_SIZE 0x82B3 +#define GL_CLEAR_BUFFER 0x82B4 +#define GL_TEXTURE_VIEW 0x82B5 +#define GL_VIEW_COMPATIBILITY_CLASS 0x82B6 +#define GL_FULL_SUPPORT 0x82B7 +#define GL_CAVEAT_SUPPORT 0x82B8 +#define GL_IMAGE_CLASS_4_X_32 0x82B9 +#define GL_IMAGE_CLASS_2_X_32 0x82BA +#define GL_IMAGE_CLASS_1_X_32 0x82BB +#define GL_IMAGE_CLASS_4_X_16 0x82BC +#define GL_IMAGE_CLASS_2_X_16 0x82BD +#define GL_IMAGE_CLASS_1_X_16 0x82BE +#define GL_IMAGE_CLASS_4_X_8 0x82BF +#define GL_IMAGE_CLASS_2_X_8 0x82C0 +#define GL_IMAGE_CLASS_1_X_8 0x82C1 +#define GL_IMAGE_CLASS_11_11_10 0x82C2 +#define GL_IMAGE_CLASS_10_10_10_2 0x82C3 +#define GL_VIEW_CLASS_128_BITS 0x82C4 +#define GL_VIEW_CLASS_96_BITS 0x82C5 +#define GL_VIEW_CLASS_64_BITS 0x82C6 +#define GL_VIEW_CLASS_48_BITS 0x82C7 +#define GL_VIEW_CLASS_32_BITS 0x82C8 +#define GL_VIEW_CLASS_24_BITS 0x82C9 +#define GL_VIEW_CLASS_16_BITS 0x82CA +#define GL_VIEW_CLASS_8_BITS 0x82CB +#define GL_VIEW_CLASS_S3TC_DXT1_RGB 0x82CC +#define GL_VIEW_CLASS_S3TC_DXT1_RGBA 0x82CD +#define GL_VIEW_CLASS_S3TC_DXT3_RGBA 0x82CE +#define GL_VIEW_CLASS_S3TC_DXT5_RGBA 0x82CF +#define GL_VIEW_CLASS_RGTC1_RED 0x82D0 +#define GL_VIEW_CLASS_RGTC2_RG 0x82D1 +#define GL_VIEW_CLASS_BPTC_UNORM 0x82D2 +#define GL_VIEW_CLASS_BPTC_FLOAT 0x82D3 +#endif + +#ifndef GL_ARB_invalidate_subdata +#endif + +#ifndef GL_ARB_multi_draw_indirect +#endif + +#ifndef GL_ARB_program_interface_query +#define GL_UNIFORM 0x92E1 +#define GL_UNIFORM_BLOCK 0x92E2 +#define GL_PROGRAM_INPUT 0x92E3 +#define GL_PROGRAM_OUTPUT 0x92E4 +#define GL_BUFFER_VARIABLE 0x92E5 +#define GL_SHADER_STORAGE_BLOCK 0x92E6 +/* reuse GL_ATOMIC_COUNTER_BUFFER */ +#define GL_VERTEX_SUBROUTINE 0x92E8 +#define GL_TESS_CONTROL_SUBROUTINE 0x92E9 +#define GL_TESS_EVALUATION_SUBROUTINE 0x92EA +#define GL_GEOMETRY_SUBROUTINE 0x92EB +#define GL_FRAGMENT_SUBROUTINE 0x92EC +#define GL_COMPUTE_SUBROUTINE 0x92ED +#define GL_VERTEX_SUBROUTINE_UNIFORM 0x92EE +#define GL_TESS_CONTROL_SUBROUTINE_UNIFORM 0x92EF +#define GL_TESS_EVALUATION_SUBROUTINE_UNIFORM 0x92F0 +#define GL_GEOMETRY_SUBROUTINE_UNIFORM 0x92F1 +#define GL_FRAGMENT_SUBROUTINE_UNIFORM 0x92F2 +#define GL_COMPUTE_SUBROUTINE_UNIFORM 0x92F3 +#define GL_TRANSFORM_FEEDBACK_VARYING 0x92F4 +#define GL_ACTIVE_RESOURCES 0x92F5 +#define GL_MAX_NAME_LENGTH 0x92F6 +#define GL_MAX_NUM_ACTIVE_VARIABLES 0x92F7 +#define GL_MAX_NUM_COMPATIBLE_SUBROUTINES 0x92F8 +#define GL_NAME_LENGTH 0x92F9 +#define GL_TYPE 0x92FA +#define GL_ARRAY_SIZE 0x92FB +#define GL_OFFSET 0x92FC +#define GL_BLOCK_INDEX 0x92FD +#define GL_ARRAY_STRIDE 0x92FE +#define GL_MATRIX_STRIDE 0x92FF +#define GL_IS_ROW_MAJOR 0x9300 +#define GL_ATOMIC_COUNTER_BUFFER_INDEX 0x9301 +#define GL_BUFFER_BINDING 0x9302 +#define GL_BUFFER_DATA_SIZE 0x9303 +#define GL_NUM_ACTIVE_VARIABLES 0x9304 +#define GL_ACTIVE_VARIABLES 0x9305 +#define GL_REFERENCED_BY_VERTEX_SHADER 0x9306 +#define GL_REFERENCED_BY_TESS_CONTROL_SHADER 0x9307 +#define GL_REFERENCED_BY_TESS_EVALUATION_SHADER 0x9308 +#define GL_REFERENCED_BY_GEOMETRY_SHADER 0x9309 +#define GL_REFERENCED_BY_FRAGMENT_SHADER 0x930A +#define GL_REFERENCED_BY_COMPUTE_SHADER 0x930B +#define GL_TOP_LEVEL_ARRAY_SIZE 0x930C +#define GL_TOP_LEVEL_ARRAY_STRIDE 0x930D +#define GL_LOCATION 0x930E +#define GL_LOCATION_INDEX 0x930F +#define GL_IS_PER_PATCH 0x92E7 +/* reuse GL_NUM_COMPATIBLE_SUBROUTINES */ +/* reuse GL_COMPATIBLE_SUBROUTINES */ +#endif + +#ifndef GL_ARB_robust_buffer_access_behavior +#endif + +#ifndef GL_ARB_shader_image_size +#endif + +#ifndef GL_ARB_shader_storage_buffer_object +#define GL_SHADER_STORAGE_BUFFER 0x90D2 +#define GL_SHADER_STORAGE_BUFFER_BINDING 0x90D3 +#define GL_SHADER_STORAGE_BUFFER_START 0x90D4 +#define GL_SHADER_STORAGE_BUFFER_SIZE 0x90D5 +#define GL_MAX_VERTEX_SHADER_STORAGE_BLOCKS 0x90D6 +#define GL_MAX_GEOMETRY_SHADER_STORAGE_BLOCKS 0x90D7 +#define GL_MAX_TESS_CONTROL_SHADER_STORAGE_BLOCKS 0x90D8 +#define GL_MAX_TESS_EVALUATION_SHADER_STORAGE_BLOCKS 0x90D9 +#define GL_MAX_FRAGMENT_SHADER_STORAGE_BLOCKS 0x90DA +#define GL_MAX_COMPUTE_SHADER_STORAGE_BLOCKS 0x90DB +#define GL_MAX_COMBINED_SHADER_STORAGE_BLOCKS 0x90DC +#define GL_MAX_SHADER_STORAGE_BUFFER_BINDINGS 0x90DD +#define GL_MAX_SHADER_STORAGE_BLOCK_SIZE 0x90DE +#define GL_SHADER_STORAGE_BUFFER_OFFSET_ALIGNMENT 0x90DF +#define GL_SHADER_STORAGE_BARRIER_BIT 0x2000 +#define GL_MAX_COMBINED_SHADER_OUTPUT_RESOURCES GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS +/* reuse GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS */ +#endif + +#ifndef GL_ARB_stencil_texturing +#define GL_DEPTH_STENCIL_TEXTURE_MODE 0x90EA +#endif + +#ifndef GL_ARB_texture_buffer_range +#define GL_TEXTURE_BUFFER_OFFSET 0x919D +#define GL_TEXTURE_BUFFER_SIZE 0x919E +#define GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT 0x919F +#endif + +#ifndef GL_ARB_texture_query_levels +#endif + +#ifndef GL_ARB_texture_storage_multisample +#endif + #ifndef GL_EXT_abgr #define GL_ABGR_EXT 0x8000 #endif @@ -4260,6 +4900,8 @@ extern "C" { #define GL_RGB4_S3TC 0x83A1 #define GL_RGBA_S3TC 0x83A2 #define GL_RGBA4_S3TC 0x83A3 +#define GL_RGBA_DXT5_S3TC 0x83A4 +#define GL_RGBA4_DXT5_S3TC 0x83A5 #endif #ifndef GL_ATI_draw_buffers @@ -4283,7 +4925,7 @@ extern "C" { #endif #ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 +#define GL_RGBA_FLOAT_MODE_ATI 0x8820 #define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 #endif @@ -4373,11 +5015,37 @@ extern "C" { #ifndef GL_ATI_vertex_attrib_array_object #endif +#ifndef GL_OES_byte_coordinates +#endif + +#ifndef GL_OES_fixed_point +#define GL_FIXED_OES 0x140C +#endif + +#ifndef GL_OES_single_precision +#endif + +#ifndef GL_OES_compressed_paletted_texture +#define GL_PALETTE4_RGB8_OES 0x8B90 +#define GL_PALETTE4_RGBA8_OES 0x8B91 +#define GL_PALETTE4_R5_G6_B5_OES 0x8B92 +#define GL_PALETTE4_RGBA4_OES 0x8B93 +#define GL_PALETTE4_RGB5_A1_OES 0x8B94 +#define GL_PALETTE8_RGB8_OES 0x8B95 +#define GL_PALETTE8_RGBA8_OES 0x8B96 +#define GL_PALETTE8_R5_G6_B5_OES 0x8B97 +#define GL_PALETTE8_RGBA4_OES 0x8B98 +#define GL_PALETTE8_RGB5_A1_OES 0x8B99 +#endif + #ifndef GL_OES_read_format #define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A #define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B #endif +#ifndef GL_OES_query_matrix +#endif + #ifndef GL_EXT_depth_bounds_test #define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 #define GL_DEPTH_BOUNDS_EXT 0x8891 @@ -4743,7 +5411,7 @@ extern "C" { #define GL_PRIMITIVES_GENERATED_NV 0x8C87 #define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 #define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A +#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_COMPONENTS_NV 0x8C8A #define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B #define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C #define GL_SEPARATE_ATTRIBS_NV 0x8C8D @@ -5260,6 +5928,7 @@ extern "C" { #endif #ifndef GL_AMD_debug_output +#define GL_MAX_DEBUG_MESSAGE_LENGTH_AMD 0x9143 #define GL_MAX_DEBUG_LOGGED_MESSAGES_AMD 0x9144 #define GL_DEBUG_LOGGED_MESSAGES_AMD 0x9145 #define GL_DEBUG_SEVERITY_HIGH_AMD 0x9146 @@ -5344,27 +6013,19 @@ extern "C" { #define GL_PATH_FILL_COVER_MODE_NV 0x9082 #define GL_PATH_STROKE_COVER_MODE_NV 0x9083 #define GL_PATH_STROKE_MASK_NV 0x9084 -#define GL_PATH_SAMPLE_QUALITY_NV 0x9085 -#define GL_PATH_STROKE_BOUND_NV 0x9086 -#define GL_PATH_STROKE_OVERSAMPLE_COUNT_NV 0x9087 #define GL_COUNT_UP_NV 0x9088 #define GL_COUNT_DOWN_NV 0x9089 #define GL_PATH_OBJECT_BOUNDING_BOX_NV 0x908A #define GL_CONVEX_HULL_NV 0x908B -#define GL_MULTI_HULLS_NV 0x908C #define GL_BOUNDING_BOX_NV 0x908D #define GL_TRANSLATE_X_NV 0x908E #define GL_TRANSLATE_Y_NV 0x908F #define GL_TRANSLATE_2D_NV 0x9090 #define GL_TRANSLATE_3D_NV 0x9091 #define GL_AFFINE_2D_NV 0x9092 -#define GL_PROJECTIVE_2D_NV 0x9093 #define GL_AFFINE_3D_NV 0x9094 -#define GL_PROJECTIVE_3D_NV 0x9095 #define GL_TRANSPOSE_AFFINE_2D_NV 0x9096 -#define GL_TRANSPOSE_PROJECTIVE_2D_NV 0x9097 #define GL_TRANSPOSE_AFFINE_3D_NV 0x9098 -#define GL_TRANSPOSE_PROJECTIVE_3D_NV 0x9099 #define GL_UTF8_NV 0x909A #define GL_UTF16_NV 0x909B #define GL_BOUNDING_BOX_OF_BOUNDING_BOXES_NV 0x909C @@ -5444,20 +6105,23 @@ extern "C" { #define GL_GLYPH_VERTICAL_BEARING_X_BIT_NV 0x20 #define GL_GLYPH_VERTICAL_BEARING_Y_BIT_NV 0x40 #define GL_GLYPH_VERTICAL_BEARING_ADVANCE_BIT_NV 0x80 -#define GL_GLYPH_HAS_KERNING_NV 0x100 -#define GL_FONT_X_MIN_BOUNDS_NV 0x00010000 -#define GL_FONT_Y_MIN_BOUNDS_NV 0x00020000 -#define GL_FONT_X_MAX_BOUNDS_NV 0x00040000 -#define GL_FONT_Y_MAX_BOUNDS_NV 0x00080000 -#define GL_FONT_UNITS_PER_EM_NV 0x00100000 -#define GL_FONT_ASCENDER_NV 0x00200000 -#define GL_FONT_DESCENDER_NV 0x00400000 -#define GL_FONT_HEIGHT_NV 0x00800000 -#define GL_FONT_MAX_ADVANCE_WIDTH_NV 0x01000000 -#define GL_FONT_MAX_ADVANCE_HEIGHT_NV 0x02000000 -#define GL_FONT_UNDERLINE_POSITION_NV 0x04000000 -#define GL_FONT_UNDERLINE_THICKNESS_NV 0x08000000 -#define GL_FONT_HAS_KERNING_NV 0x10000000 +#define GL_GLYPH_HAS_KERNING_BIT_NV 0x100 +#define GL_FONT_X_MIN_BOUNDS_BIT_NV 0x00010000 +#define GL_FONT_Y_MIN_BOUNDS_BIT_NV 0x00020000 +#define GL_FONT_X_MAX_BOUNDS_BIT_NV 0x00040000 +#define GL_FONT_Y_MAX_BOUNDS_BIT_NV 0x00080000 +#define GL_FONT_UNITS_PER_EM_BIT_NV 0x00100000 +#define GL_FONT_ASCENDER_BIT_NV 0x00200000 +#define GL_FONT_DESCENDER_BIT_NV 0x00400000 +#define GL_FONT_HEIGHT_BIT_NV 0x00800000 +#define GL_FONT_MAX_ADVANCE_WIDTH_BIT_NV 0x01000000 +#define GL_FONT_MAX_ADVANCE_HEIGHT_BIT_NV 0x02000000 +#define GL_FONT_UNDERLINE_POSITION_BIT_NV 0x04000000 +#define GL_FONT_UNDERLINE_THICKNESS_BIT_NV 0x08000000 +#define GL_FONT_HAS_KERNING_BIT_NV 0x10000000 +/* reuse GL_PRIMARY_COLOR */ +/* reuse GL_PRIMARY_COLOR_NV */ +/* reuse GL_SECONDARY_COLOR_NV */ #endif #ifndef GL_AMD_pinned_memory @@ -5489,6 +6153,50 @@ extern "C" { #define GL_QUERY_RESULT_NO_WAIT_AMD 0x9194 #endif +#ifndef GL_NV_compute_program5 +#define GL_COMPUTE_PROGRAM_NV 0x90FB +#define GL_COMPUTE_PROGRAM_PARAMETER_BUFFER_NV 0x90FC +#endif + +#ifndef GL_NV_shader_storage_buffer_object +#endif + +#ifndef GL_NV_shader_atomic_counters +#endif + +#ifndef GL_NV_deep_texture3D +#define GL_MAX_DEEP_3D_TEXTURE_WIDTH_HEIGHT_NV 0x90D0 +#define GL_MAX_DEEP_3D_TEXTURE_DEPTH_NV 0x90D1 +#endif + +#ifndef GL_NVX_conditional_render +#endif + +#ifndef GL_AMD_sparse_texture +#define GL_VIRTUAL_PAGE_SIZE_X_AMD 0x9195 +#define GL_VIRTUAL_PAGE_SIZE_Y_AMD 0x9196 +#define GL_VIRTUAL_PAGE_SIZE_Z_AMD 0x9197 +#define GL_MAX_SPARSE_TEXTURE_SIZE_AMD 0x9198 +#define GL_MAX_SPARSE_3D_TEXTURE_SIZE_AMD 0x9199 +#define GL_MAX_SPARSE_ARRAY_TEXTURE_LAYERS 0x919A +#define GL_MIN_SPARSE_LEVEL_AMD 0x919B +#define GL_MIN_LOD_WARNING_AMD 0x919C +#define GL_TEXTURE_STORAGE_SPARSE_BIT_AMD 0x00000001 +#endif + +#ifndef GL_AMD_shader_trinary_minmax +#endif + +#ifndef GL_INTEL_map_texture +#define GL_TEXTURE_MEMORY_LAYOUT_INTEL 0x83FF +#define GL_LAYOUT_DEFAULT_INTEL 0 +#define GL_LAYOUT_LINEAR_INTEL 1 +#define GL_LAYOUT_LINEAR_CPU_CACHED_INTEL 2 +#endif + +#ifndef GL_NV_draw_texture +#endif + /*************************************************************/ @@ -5588,10 +6296,19 @@ typedef void (APIENTRY *GLDEBUGPROCARB)(GLenum source,GLenum type,GLuint id,GLen typedef void (APIENTRY *GLDEBUGPROCAMD)(GLuint id,GLenum category,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); #endif +#ifndef GL_KHR_debug +typedef void (APIENTRY *GLDEBUGPROC)(GLenum source,GLenum type,GLuint id,GLenum severity,GLsizei length,const GLchar *message,GLvoid *userParam); +#endif + #ifndef GL_NV_vdpau_interop typedef GLintptr GLvdpauSurfaceNV; #endif +#ifndef GL_OES_fixed_point +/* GLint must be 32 bits, a relatively safe assumption on modern CPUs */ +typedef GLint GLfixed; +#endif + #ifndef GL_VERSION_1_2 #define GL_VERSION_1_2 1 #ifdef GL_GLEXT_PROTOTYPES @@ -5601,18 +6318,6 @@ GLAPI void APIENTRY glDrawRangeElements (GLenum mode, GLuint start, GLuint end, GLAPI void APIENTRY glTexImage3D (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); GLAPI void APIENTRY glTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); GLAPI void APIENTRY glCopyTexSubImage3D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); -typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); -typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_2_DEPRECATED -#define GL_VERSION_1_2_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glColorTable (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); GLAPI void APIENTRY glColorTableParameterfv (GLenum target, GLenum pname, const GLfloat *params); GLAPI void APIENTRY glColorTableParameteriv (GLenum target, GLenum pname, const GLint *params); @@ -5646,6 +6351,12 @@ GLAPI void APIENTRY glMinmax (GLenum target, GLenum internalformat, GLboolean si GLAPI void APIENTRY glResetHistogram (GLenum target); GLAPI void APIENTRY glResetMinmax (GLenum target); #endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDCOLORPROC) (GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha); +typedef void (APIENTRYP PFNGLBLENDEQUATIONPROC) (GLenum mode); +typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); +typedef void (APIENTRYP PFNGLTEXIMAGE3DPROC) (GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); +typedef void (APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); typedef void (APIENTRYP PFNGLCOLORTABLEPROC) (GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC) (GLenum target, GLenum pname, const GLfloat *params); typedef void (APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC) (GLenum target, GLenum pname, const GLint *params); @@ -5692,21 +6403,6 @@ GLAPI void APIENTRY glCompressedTexSubImage3D (GLenum target, GLint level, GLint GLAPI void APIENTRY glCompressedTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); GLAPI void APIENTRY glCompressedTexSubImage1D (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); GLAPI void APIENTRY glGetCompressedTexImage (GLenum target, GLint level, GLvoid *img); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); -typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_3_DEPRECATED -#define GL_VERSION_1_3_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glClientActiveTexture (GLenum texture); GLAPI void APIENTRY glMultiTexCoord1d (GLenum target, GLdouble s); GLAPI void APIENTRY glMultiTexCoord1dv (GLenum target, const GLdouble *v); @@ -5745,6 +6441,15 @@ GLAPI void APIENTRY glLoadTransposeMatrixd (const GLdouble *m); GLAPI void APIENTRY glMultTransposeMatrixf (const GLfloat *m); GLAPI void APIENTRY glMultTransposeMatrixd (const GLdouble *m); #endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLACTIVETEXTUREPROC) (GLenum texture); +typedef void (APIENTRYP PFNGLSAMPLECOVERAGEPROC) (GLfloat value, GLboolean invert); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC) (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC) (GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); +typedef void (APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC) (GLenum target, GLint level, GLvoid *img); typedef void (APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC) (GLenum texture); typedef void (APIENTRYP PFNGLMULTITEXCOORD1DPROC) (GLenum target, GLdouble s); typedef void (APIENTRYP PFNGLMULTITEXCOORD1DVPROC) (GLenum target, const GLdouble *v); @@ -5788,25 +6493,12 @@ typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC) (const GLdouble *m); #define GL_VERSION_1_4 1 #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glBlendFuncSeparate (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount); +GLAPI void APIENTRY glMultiDrawArrays (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); +GLAPI void APIENTRY glMultiDrawElements (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount); GLAPI void APIENTRY glPointParameterf (GLenum pname, GLfloat param); GLAPI void APIENTRY glPointParameterfv (GLenum pname, const GLfloat *params); GLAPI void APIENTRY glPointParameteri (GLenum pname, GLint param); GLAPI void APIENTRY glPointParameteriv (GLenum pname, const GLint *params); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); -typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); -#endif - -#ifndef GL_VERSION_1_4_DEPRECATED -#define GL_VERSION_1_4_DEPRECATED 1 -#ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glFogCoordf (GLfloat coord); GLAPI void APIENTRY glFogCoordfv (const GLfloat *coord); GLAPI void APIENTRY glFogCoordd (GLdouble coord); @@ -5846,6 +6538,13 @@ GLAPI void APIENTRY glWindowPos3iv (const GLint *v); GLAPI void APIENTRY glWindowPos3s (GLshort x, GLshort y, GLshort z); GLAPI void APIENTRY glWindowPos3sv (const GLshort *v); #endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEPROC) (GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSPROC) (GLenum mode, const GLint *first, const GLsizei *count, GLsizei drawcount); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFPROC) (GLenum pname, GLfloat param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERFVPROC) (GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLPOINTPARAMETERIPROC) (GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLPOINTPARAMETERIVPROC) (GLenum pname, const GLint *params); typedef void (APIENTRYP PFNGLFOGCOORDFPROC) (GLfloat coord); typedef void (APIENTRYP PFNGLFOGCOORDFVPROC) (const GLfloat *coord); typedef void (APIENTRYP PFNGLFOGCOORDDPROC) (GLdouble coord); @@ -6272,13 +6971,13 @@ typedef const GLubyte * (APIENTRYP PFNGLGETSTRINGIPROC) (GLenum name, GLuint ind /* ARB_copy_buffer */ /* ARB_uniform_buffer_object */ #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +GLAPI void APIENTRY glDrawArraysInstanced (GLenum mode, GLint first, GLsizei count, GLsizei instancecount); +GLAPI void APIENTRY glDrawElementsInstanced (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount); GLAPI void APIENTRY glTexBuffer (GLenum target, GLenum internalformat, GLuint buffer); GLAPI void APIENTRY glPrimitiveRestartIndex (GLuint index); #endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount); typedef void (APIENTRYP PFNGLTEXBUFFERPROC) (GLenum target, GLenum internalformat, GLuint buffer); typedef void (APIENTRYP PFNGLPRIMITIVERESTARTINDEXPROC) (GLuint index); #endif @@ -6373,6 +7072,33 @@ typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEIPROC) (GLuint buf, GLenum srcRGB, /* ARB_texture_storage */ #endif +#ifndef GL_VERSION_4_3 +#define GL_VERSION_4_3 1 +/* OpenGL 4.3 reuses entry points from these extensions: */ +/* ARB_arrays_of_arrays (no entry points, GLSL only) */ +/* ARB_fragment_layer_viewport (no entry points, GLSL only) */ +/* ARB_shader_image_size (no entry points, GLSL only) */ +/* ARB_ES3_compatibility (no entry points) */ +/* ARB_clear_buffer_object */ +/* ARB_compute_shader */ +/* ARB_copy_image */ +/* KHR_debug (includes ARB_debug_output commands promoted to KHR without suffixes) */ +/* ARB_explicit_uniform_location (no entry points) */ +/* ARB_framebuffer_no_attachments */ +/* ARB_internalformat_query2 */ +/* ARB_invalidate_subdata */ +/* ARB_multi_draw_indirect */ +/* ARB_program_interface_query */ +/* ARB_robust_buffer_access_behavior (no entry points) */ +/* ARB_shader_storage_buffer_object */ +/* ARB_stencil_texturing (no entry points) */ +/* ARB_texture_buffer_range */ +/* ARB_texture_query_levels (no entry points) */ +/* ARB_texture_storage_multisample */ +/* ARB_texture_view */ +/* ARB_vertex_attrib_binding */ +#endif + #ifndef GL_ARB_multitexture #define GL_ARB_multitexture 1 #ifdef GL_GLEXT_PROTOTYPES @@ -7127,13 +7853,13 @@ typedef void (APIENTRYP PFNGLCOPYBUFFERSUBDATAPROC) (GLenum readTarget, GLenum w #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glDrawElementsBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); GLAPI void APIENTRY glDrawRangeElementsBaseVertex (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, const GLint *basevertex); +GLAPI void APIENTRY glDrawElementsInstancedBaseVertex (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex); +GLAPI void APIENTRY glMultiDrawElementsBaseVertex (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex); #endif /* GL_GLEXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); typedef void (APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices, GLint basevertex); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount, GLint basevertex); -typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei primcount, const GLint *basevertex); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXPROC) (GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei instancecount, GLint basevertex); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXPROC) (GLenum mode, const GLsizei *count, GLenum type, const GLvoid* const *indices, GLsizei drawcount, const GLint *basevertex); #endif #ifndef GL_ARB_fragment_coord_conventions @@ -7811,13 +8537,13 @@ typedef void (APIENTRYP PFNGLGETNUNIFORMDVARBPROC) (GLuint program, GLint locati #ifndef GL_ARB_base_instance #define GL_ARB_base_instance 1 #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedBaseInstance (GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); -GLAPI void APIENTRY glDrawElementsInstancedBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLuint baseinstance); -GLAPI void APIENTRY glDrawElementsInstancedBaseVertexBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); +GLAPI void APIENTRY glDrawArraysInstancedBaseInstance (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance); +GLAPI void APIENTRY glDrawElementsInstancedBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance); +GLAPI void APIENTRY glDrawElementsInstancedBaseVertexBaseInstance (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance); #endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei primcount, GLuint baseinstance); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLuint baseinstance); -typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei primcount, GLint basevertex, GLuint baseinstance); +typedef void (APIENTRYP PFNGLDRAWARRAYSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLint first, GLsizei count, GLsizei instancecount, GLuint baseinstance); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLuint baseinstance); +typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex, GLuint baseinstance); #endif #ifndef GL_ARB_shading_language_420pack @@ -7827,11 +8553,11 @@ typedef void (APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXBASEINSTANCEPROC) (G #ifndef GL_ARB_transform_feedback_instanced #define GL_ARB_transform_feedback_instanced 1 #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawTransformFeedbackInstanced (GLenum mode, GLuint id, GLsizei primcount); -GLAPI void APIENTRY glDrawTransformFeedbackStreamInstanced (GLenum mode, GLuint id, GLuint stream, GLsizei primcount); +GLAPI void APIENTRY glDrawTransformFeedbackInstanced (GLenum mode, GLuint id, GLsizei instancecount); +GLAPI void APIENTRY glDrawTransformFeedbackStreamInstanced (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount); #endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei primcount); -typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei primcount); +typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKINSTANCEDPROC) (GLenum mode, GLuint id, GLsizei instancecount); +typedef void (APIENTRYP PFNGLDRAWTRANSFORMFEEDBACKSTREAMINSTANCEDPROC) (GLenum mode, GLuint id, GLuint stream, GLsizei instancecount); #endif #ifndef GL_ARB_compressed_texture_pixel_storage @@ -7894,6 +8620,242 @@ typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DEXTPROC) (GLuint texture, GLenum ta typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DEXTPROC) (GLuint texture, GLenum target, GLsizei levels, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth); #endif +#ifndef GL_KHR_texture_compression_astc_ldr +#define GL_KHR_texture_compression_astc_ldr 1 +#endif + +#ifndef GL_KHR_debug +#define GL_KHR_debug 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDebugMessageControl (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +GLAPI void APIENTRY glDebugMessageInsert (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +GLAPI void APIENTRY glDebugMessageCallback (GLDEBUGPROC callback, const void *userParam); +GLAPI GLuint APIENTRY glGetDebugMessageLog (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +GLAPI void APIENTRY glPushDebugGroup (GLenum source, GLuint id, GLsizei length, const GLchar *message); +GLAPI void APIENTRY glPopDebugGroup (void); +GLAPI void APIENTRY glObjectLabel (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +GLAPI void APIENTRY glGetObjectLabel (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +GLAPI void APIENTRY glObjectPtrLabel (const void *ptr, GLsizei length, const GLchar *label); +GLAPI void APIENTRY glGetObjectPtrLabel (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDEBUGMESSAGECONTROLPROC) (GLenum source, GLenum type, GLenum severity, GLsizei count, const GLuint *ids, GLboolean enabled); +typedef void (APIENTRYP PFNGLDEBUGMESSAGEINSERTPROC) (GLenum source, GLenum type, GLuint id, GLenum severity, GLsizei length, const GLchar *buf); +typedef void (APIENTRYP PFNGLDEBUGMESSAGECALLBACKPROC) (GLDEBUGPROC callback, const void *userParam); +typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGPROC) (GLuint count, GLsizei bufsize, GLenum *sources, GLenum *types, GLuint *ids, GLenum *severities, GLsizei *lengths, GLchar *messageLog); +typedef void (APIENTRYP PFNGLPUSHDEBUGGROUPPROC) (GLenum source, GLuint id, GLsizei length, const GLchar *message); +typedef void (APIENTRYP PFNGLPOPDEBUGGROUPPROC) (void); +typedef void (APIENTRYP PFNGLOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei length, const GLchar *label); +typedef void (APIENTRYP PFNGLGETOBJECTLABELPROC) (GLenum identifier, GLuint name, GLsizei bufSize, GLsizei *length, GLchar *label); +typedef void (APIENTRYP PFNGLOBJECTPTRLABELPROC) (const void *ptr, GLsizei length, const GLchar *label); +typedef void (APIENTRYP PFNGLGETOBJECTPTRLABELPROC) (const void *ptr, GLsizei bufSize, GLsizei *length, GLchar *label); +#endif + +#ifndef GL_ARB_arrays_of_arrays +#define GL_ARB_arrays_of_arrays 1 +#endif + +#ifndef GL_ARB_clear_buffer_object +#define GL_ARB_clear_buffer_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glClearBufferData (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glClearBufferSubData (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glClearNamedBufferDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); +GLAPI void APIENTRY glClearNamedBufferSubDataEXT (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void *data); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCLEARBUFFERDATAPROC) (GLenum target, GLenum internalformat, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLCLEARBUFFERSUBDATAPROC) (GLenum target, GLenum internalformat, GLintptr offset, GLsizeiptr size, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, const void *data); +typedef void (APIENTRYP PFNGLCLEARNAMEDBUFFERSUBDATAEXTPROC) (GLuint buffer, GLenum internalformat, GLenum format, GLenum type, GLsizeiptr offset, GLsizeiptr size, const void *data); +#endif + +#ifndef GL_ARB_compute_shader +#define GL_ARB_compute_shader 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDispatchCompute (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); +GLAPI void APIENTRY glDispatchComputeIndirect (GLintptr indirect); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEPROC) (GLuint num_groups_x, GLuint num_groups_y, GLuint num_groups_z); +typedef void (APIENTRYP PFNGLDISPATCHCOMPUTEINDIRECTPROC) (GLintptr indirect); +#endif + +#ifndef GL_ARB_copy_image +#define GL_ARB_copy_image 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glCopyImageSubData (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLCOPYIMAGESUBDATAPROC) (GLuint srcName, GLenum srcTarget, GLint srcLevel, GLint srcX, GLint srcY, GLint srcZ, GLuint dstName, GLenum dstTarget, GLint dstLevel, GLint dstX, GLint dstY, GLint dstZ, GLsizei srcWidth, GLsizei srcHeight, GLsizei srcDepth); +#endif + +#ifndef GL_ARB_texture_view +#define GL_ARB_texture_view 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTextureView (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXTUREVIEWPROC) (GLuint texture, GLenum target, GLuint origtexture, GLenum internalformat, GLuint minlevel, GLuint numlevels, GLuint minlayer, GLuint numlayers); +#endif + +#ifndef GL_ARB_vertex_attrib_binding +#define GL_ARB_vertex_attrib_binding 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBindVertexBuffer (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +GLAPI void APIENTRY glVertexAttribFormat (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +GLAPI void APIENTRY glVertexAttribIFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI void APIENTRY glVertexAttribLFormat (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI void APIENTRY glVertexAttribBinding (GLuint attribindex, GLuint bindingindex); +GLAPI void APIENTRY glVertexBindingDivisor (GLuint bindingindex, GLuint divisor); +GLAPI void APIENTRY glVertexArrayBindVertexBufferEXT (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +GLAPI void APIENTRY glVertexArrayVertexAttribFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +GLAPI void APIENTRY glVertexArrayVertexAttribIFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI void APIENTRY glVertexArrayVertexAttribLFormatEXT (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +GLAPI void APIENTRY glVertexArrayVertexAttribBindingEXT (GLuint vaobj, GLuint attribindex, GLuint bindingindex); +GLAPI void APIENTRY glVertexArrayVertexBindingDivisorEXT (GLuint vaobj, GLuint bindingindex, GLuint divisor); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBINDVERTEXBUFFERPROC) (GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +typedef void (APIENTRYP PFNGLVERTEXATTRIBFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXATTRIBIFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXATTRIBLFORMATPROC) (GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXATTRIBBINDINGPROC) (GLuint attribindex, GLuint bindingindex); +typedef void (APIENTRYP PFNGLVERTEXBINDINGDIVISORPROC) (GLuint bindingindex, GLuint divisor); +typedef void (APIENTRYP PFNGLVERTEXARRAYBINDVERTEXBUFFEREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint buffer, GLintptr offset, GLsizei stride); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLboolean normalized, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBIFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBLFORMATEXTPROC) (GLuint vaobj, GLuint attribindex, GLint size, GLenum type, GLuint relativeoffset); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXATTRIBBINDINGEXTPROC) (GLuint vaobj, GLuint attribindex, GLuint bindingindex); +typedef void (APIENTRYP PFNGLVERTEXARRAYVERTEXBINDINGDIVISOREXTPROC) (GLuint vaobj, GLuint bindingindex, GLuint divisor); +#endif + +#ifndef GL_ARB_robustness_isolation +#define GL_ARB_robustness_isolation 1 +#endif + +#ifndef GL_ARB_ES3_compatibility +#define GL_ARB_ES3_compatibility 1 +#endif + +#ifndef GL_ARB_explicit_uniform_location +#define GL_ARB_explicit_uniform_location 1 +#endif + +#ifndef GL_ARB_fragment_layer_viewport +#define GL_ARB_fragment_layer_viewport 1 +#endif + +#ifndef GL_ARB_framebuffer_no_attachments +#define GL_ARB_framebuffer_no_attachments 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glFramebufferParameteri (GLenum target, GLenum pname, GLint param); +GLAPI void APIENTRY glGetFramebufferParameteriv (GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glNamedFramebufferParameteriEXT (GLuint framebuffer, GLenum pname, GLint param); +GLAPI void APIENTRY glGetNamedFramebufferParameterivEXT (GLuint framebuffer, GLenum pname, GLint *params); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLFRAMEBUFFERPARAMETERIPROC) (GLenum target, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLGETFRAMEBUFFERPARAMETERIVPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLNAMEDFRAMEBUFFERPARAMETERIEXTPROC) (GLuint framebuffer, GLenum pname, GLint param); +typedef void (APIENTRYP PFNGLGETNAMEDFRAMEBUFFERPARAMETERIVEXTPROC) (GLuint framebuffer, GLenum pname, GLint *params); +#endif + +#ifndef GL_ARB_internalformat_query2 +#define GL_ARB_internalformat_query2 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetInternalformati64v (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETINTERNALFORMATI64VPROC) (GLenum target, GLenum internalformat, GLenum pname, GLsizei bufSize, GLint64 *params); +#endif + +#ifndef GL_ARB_invalidate_subdata +#define GL_ARB_invalidate_subdata 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glInvalidateTexSubImage (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); +GLAPI void APIENTRY glInvalidateTexImage (GLuint texture, GLint level); +GLAPI void APIENTRY glInvalidateBufferSubData (GLuint buffer, GLintptr offset, GLsizeiptr length); +GLAPI void APIENTRY glInvalidateBufferData (GLuint buffer); +GLAPI void APIENTRY glInvalidateFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments); +GLAPI void APIENTRY glInvalidateSubFramebuffer (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLINVALIDATETEXSUBIMAGEPROC) (GLuint texture, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth); +typedef void (APIENTRYP PFNGLINVALIDATETEXIMAGEPROC) (GLuint texture, GLint level); +typedef void (APIENTRYP PFNGLINVALIDATEBUFFERSUBDATAPROC) (GLuint buffer, GLintptr offset, GLsizeiptr length); +typedef void (APIENTRYP PFNGLINVALIDATEBUFFERDATAPROC) (GLuint buffer); +typedef void (APIENTRYP PFNGLINVALIDATEFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments); +typedef void (APIENTRYP PFNGLINVALIDATESUBFRAMEBUFFERPROC) (GLenum target, GLsizei numAttachments, const GLenum *attachments, GLint x, GLint y, GLsizei width, GLsizei height); +#endif + +#ifndef GL_ARB_multi_draw_indirect +#define GL_ARB_multi_draw_indirect 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMultiDrawArraysIndirect (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride); +GLAPI void APIENTRY glMultiDrawElementsIndirect (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLMULTIDRAWARRAYSINDIRECTPROC) (GLenum mode, const void *indirect, GLsizei drawcount, GLsizei stride); +typedef void (APIENTRYP PFNGLMULTIDRAWELEMENTSINDIRECTPROC) (GLenum mode, GLenum type, const void *indirect, GLsizei drawcount, GLsizei stride); +#endif + +#ifndef GL_ARB_program_interface_query +#define GL_ARB_program_interface_query 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glGetProgramInterfaceiv (GLuint program, GLenum programInterface, GLenum pname, GLint *params); +GLAPI GLuint APIENTRY glGetProgramResourceIndex (GLuint program, GLenum programInterface, const GLchar *name); +GLAPI void APIENTRY glGetProgramResourceName (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +GLAPI void APIENTRY glGetProgramResourceiv (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params); +GLAPI GLint APIENTRY glGetProgramResourceLocation (GLuint program, GLenum programInterface, const GLchar *name); +GLAPI GLint APIENTRY glGetProgramResourceLocationIndex (GLuint program, GLenum programInterface, const GLchar *name); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLGETPROGRAMINTERFACEIVPROC) (GLuint program, GLenum programInterface, GLenum pname, GLint *params); +typedef GLuint (APIENTRYP PFNGLGETPROGRAMRESOURCEINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name); +typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCENAMEPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei bufSize, GLsizei *length, GLchar *name); +typedef void (APIENTRYP PFNGLGETPROGRAMRESOURCEIVPROC) (GLuint program, GLenum programInterface, GLuint index, GLsizei propCount, const GLenum *props, GLsizei bufSize, GLsizei *length, GLint *params); +typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONPROC) (GLuint program, GLenum programInterface, const GLchar *name); +typedef GLint (APIENTRYP PFNGLGETPROGRAMRESOURCELOCATIONINDEXPROC) (GLuint program, GLenum programInterface, const GLchar *name); +#endif + +#ifndef GL_ARB_robust_buffer_access_behavior +#define GL_ARB_robust_buffer_access_behavior 1 +#endif + +#ifndef GL_ARB_shader_image_size +#define GL_ARB_shader_image_size 1 +#endif + +#ifndef GL_ARB_shader_storage_buffer_object +#define GL_ARB_shader_storage_buffer_object 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glShaderStorageBlockBinding (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSHADERSTORAGEBLOCKBINDINGPROC) (GLuint program, GLuint storageBlockIndex, GLuint storageBlockBinding); +#endif + +#ifndef GL_ARB_stencil_texturing +#define GL_ARB_stencil_texturing 1 +#endif + +#ifndef GL_ARB_texture_buffer_range +#define GL_ARB_texture_buffer_range 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexBufferRange (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +GLAPI void APIENTRY glTextureBufferRangeEXT (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXBUFFERRANGEPROC) (GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +typedef void (APIENTRYP PFNGLTEXTUREBUFFERRANGEEXTPROC) (GLuint texture, GLenum target, GLenum internalformat, GLuint buffer, GLintptr offset, GLsizeiptr size); +#endif + +#ifndef GL_ARB_texture_query_levels +#define GL_ARB_texture_query_levels 1 +#endif + +#ifndef GL_ARB_texture_storage_multisample +#define GL_ARB_texture_storage_multisample 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexStorage2DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +GLAPI void APIENTRY glTexStorage3DMultisample (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +GLAPI void APIENTRY glTextureStorage2DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +GLAPI void APIENTRY glTextureStorage3DMultisampleEXT (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXSTORAGE2DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +typedef void (APIENTRYP PFNGLTEXSTORAGE3DMULTISAMPLEPROC) (GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE2DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLboolean fixedsamplelocations); +typedef void (APIENTRYP PFNGLTEXTURESTORAGE3DMULTISAMPLEEXTPROC) (GLuint texture, GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLboolean fixedsamplelocations); +#endif + #ifndef GL_EXT_abgr #define GL_EXT_abgr 1 #endif @@ -8635,11 +9597,15 @@ GLAPI void APIENTRY glPixelTransformParameteriEXT (GLenum target, GLenum pname, GLAPI void APIENTRY glPixelTransformParameterfEXT (GLenum target, GLenum pname, GLfloat param); GLAPI void APIENTRY glPixelTransformParameterivEXT (GLenum target, GLenum pname, const GLint *params); GLAPI void APIENTRY glPixelTransformParameterfvEXT (GLenum target, GLenum pname, const GLfloat *params); +GLAPI void APIENTRY glGetPixelTransformParameterivEXT (GLenum target, GLenum pname, GLint *params); +GLAPI void APIENTRY glGetPixelTransformParameterfvEXT (GLenum target, GLenum pname, GLfloat *params); #endif /* GL_GLEXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC) (GLenum target, GLenum pname, GLint param); typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC) (GLenum target, GLenum pname, GLfloat param); typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, const GLint *params); typedef void (APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, const GLfloat *params); +typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERIVEXTPROC) (GLenum target, GLenum pname, GLint *params); +typedef void (APIENTRYP PFNGLGETPIXELTRANSFORMPARAMETERFVEXTPROC) (GLenum target, GLenum pname, GLfloat *params); #endif #ifndef GL_EXT_pixel_transform_color_table @@ -8991,11 +9957,11 @@ typedef void (APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC) (GLenum sfactorRGB, GLen #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glVertexWeightfEXT (GLfloat weight); GLAPI void APIENTRY glVertexWeightfvEXT (const GLfloat *weight); -GLAPI void APIENTRY glVertexWeightPointerEXT (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); +GLAPI void APIENTRY glVertexWeightPointerEXT (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); #endif /* GL_GLEXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC) (GLfloat weight); typedef void (APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC) (const GLfloat *weight); -typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); +typedef void (APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC) (GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); #endif #ifndef GL_NV_light_max_exponent @@ -9944,15 +10910,15 @@ typedef void (APIENTRYP PFNGLDRAWBUFFERSATIPROC) (GLsizei n, const GLenum *bufs) /* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glProgramNamedParameter4fNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); GLAPI void APIENTRY glProgramNamedParameter4fvNV (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); +GLAPI void APIENTRY glProgramNamedParameter4dNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); GLAPI void APIENTRY glProgramNamedParameter4dvNV (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); GLAPI void APIENTRY glGetProgramNamedParameterfvNV (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); GLAPI void APIENTRY glGetProgramNamedParameterdvNV (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); #endif /* GL_GLEXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); +typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); typedef void (APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); typedef void (APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC) (GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); @@ -10059,10 +11025,10 @@ typedef void (APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC) (GLuint index, GLsizei n, c #ifndef GL_NV_pixel_data_range #define GL_NV_pixel_data_range 1 #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, GLvoid *pointer); +GLAPI void APIENTRY glPixelDataRangeNV (GLenum target, GLsizei length, const GLvoid *pointer); GLAPI void APIENTRY glFlushPixelDataRangeNV (GLenum target); #endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, GLvoid *pointer); +typedef void (APIENTRYP PFNGLPIXELDATARANGENVPROC) (GLenum target, GLsizei length, const GLvoid *pointer); typedef void (APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC) (GLenum target); #endif @@ -10116,10 +11082,304 @@ typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC) (GLuint index, typedef void (APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC) (GLuint index, GLenum pname, GLint *params); #endif +#ifndef GL_OES_byte_coordinates +#define GL_OES_byte_coordinates 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glMultiTexCoord1bOES (GLenum texture, GLbyte s); +GLAPI void APIENTRY glMultiTexCoord1bvOES (GLenum texture, const GLbyte *coords); +GLAPI void APIENTRY glMultiTexCoord2bOES (GLenum texture, GLbyte s, GLbyte t); +GLAPI void APIENTRY glMultiTexCoord2bvOES (GLenum texture, const GLbyte *coords); +GLAPI void APIENTRY glMultiTexCoord3bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r); +GLAPI void APIENTRY glMultiTexCoord3bvOES (GLenum texture, const GLbyte *coords); +GLAPI void APIENTRY glMultiTexCoord4bOES (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q); +GLAPI void APIENTRY glMultiTexCoord4bvOES (GLenum texture, const GLbyte *coords); +GLAPI void APIENTRY glTexCoord1bOES (GLbyte s); +GLAPI void APIENTRY glTexCoord1bvOES (const GLbyte *coords); +GLAPI void APIENTRY glTexCoord2bOES (GLbyte s, GLbyte t); +GLAPI void APIENTRY glTexCoord2bvOES (const GLbyte *coords); +GLAPI void APIENTRY glTexCoord3bOES (GLbyte s, GLbyte t, GLbyte r); +GLAPI void APIENTRY glTexCoord3bvOES (const GLbyte *coords); +GLAPI void APIENTRY glTexCoord4bOES (GLbyte s, GLbyte t, GLbyte r, GLbyte q); +GLAPI void APIENTRY glTexCoord4bvOES (const GLbyte *coords); +GLAPI void APIENTRY glVertex2bOES (GLbyte x); +GLAPI void APIENTRY glVertex2bvOES (const GLbyte *coords); +GLAPI void APIENTRY glVertex3bOES (GLbyte x, GLbyte y); +GLAPI void APIENTRY glVertex3bvOES (const GLbyte *coords); +GLAPI void APIENTRY glVertex4bOES (GLbyte x, GLbyte y, GLbyte z); +GLAPI void APIENTRY glVertex4bvOES (const GLbyte *coords); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLMULTITEXCOORD1BOESPROC) (GLenum texture, GLbyte s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1BVOESPROC) (GLenum texture, const GLbyte *coords); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2BOESPROC) (GLenum texture, GLbyte s, GLbyte t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2BVOESPROC) (GLenum texture, const GLbyte *coords); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3BVOESPROC) (GLenum texture, const GLbyte *coords); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4BOESPROC) (GLenum texture, GLbyte s, GLbyte t, GLbyte r, GLbyte q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4BVOESPROC) (GLenum texture, const GLbyte *coords); +typedef void (APIENTRYP PFNGLTEXCOORD1BOESPROC) (GLbyte s); +typedef void (APIENTRYP PFNGLTEXCOORD1BVOESPROC) (const GLbyte *coords); +typedef void (APIENTRYP PFNGLTEXCOORD2BOESPROC) (GLbyte s, GLbyte t); +typedef void (APIENTRYP PFNGLTEXCOORD2BVOESPROC) (const GLbyte *coords); +typedef void (APIENTRYP PFNGLTEXCOORD3BOESPROC) (GLbyte s, GLbyte t, GLbyte r); +typedef void (APIENTRYP PFNGLTEXCOORD3BVOESPROC) (const GLbyte *coords); +typedef void (APIENTRYP PFNGLTEXCOORD4BOESPROC) (GLbyte s, GLbyte t, GLbyte r, GLbyte q); +typedef void (APIENTRYP PFNGLTEXCOORD4BVOESPROC) (const GLbyte *coords); +typedef void (APIENTRYP PFNGLVERTEX2BOESPROC) (GLbyte x); +typedef void (APIENTRYP PFNGLVERTEX2BVOESPROC) (const GLbyte *coords); +typedef void (APIENTRYP PFNGLVERTEX3BOESPROC) (GLbyte x, GLbyte y); +typedef void (APIENTRYP PFNGLVERTEX3BVOESPROC) (const GLbyte *coords); +typedef void (APIENTRYP PFNGLVERTEX4BOESPROC) (GLbyte x, GLbyte y, GLbyte z); +typedef void (APIENTRYP PFNGLVERTEX4BVOESPROC) (const GLbyte *coords); +#endif + +#ifndef GL_OES_fixed_point +#define GL_OES_fixed_point 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glAccumxOES (GLenum op, GLfixed value); +GLAPI void APIENTRY glAlphaFuncxOES (GLenum func, GLfixed ref); +GLAPI void APIENTRY glBitmapxOES (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap); +GLAPI void APIENTRY glBlendColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +GLAPI void APIENTRY glClearAccumxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +GLAPI void APIENTRY glClearColorxOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +GLAPI void APIENTRY glClearDepthxOES (GLfixed depth); +GLAPI void APIENTRY glClipPlanexOES (GLenum plane, const GLfixed *equation); +GLAPI void APIENTRY glColor3xOES (GLfixed red, GLfixed green, GLfixed blue); +GLAPI void APIENTRY glColor4xOES (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +GLAPI void APIENTRY glColor3xvOES (const GLfixed *components); +GLAPI void APIENTRY glColor4xvOES (const GLfixed *components); +GLAPI void APIENTRY glConvolutionParameterxOES (GLenum target, GLenum pname, GLfixed param); +GLAPI void APIENTRY glConvolutionParameterxvOES (GLenum target, GLenum pname, const GLfixed *params); +GLAPI void APIENTRY glDepthRangexOES (GLfixed n, GLfixed f); +GLAPI void APIENTRY glEvalCoord1xOES (GLfixed u); +GLAPI void APIENTRY glEvalCoord2xOES (GLfixed u, GLfixed v); +GLAPI void APIENTRY glEvalCoord1xvOES (const GLfixed *coords); +GLAPI void APIENTRY glEvalCoord2xvOES (const GLfixed *coords); +GLAPI void APIENTRY glFeedbackBufferxOES (GLsizei n, GLenum type, const GLfixed *buffer); +GLAPI void APIENTRY glFogxOES (GLenum pname, GLfixed param); +GLAPI void APIENTRY glFogxvOES (GLenum pname, const GLfixed *param); +GLAPI void APIENTRY glFrustumxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); +GLAPI void APIENTRY glGetClipPlanexOES (GLenum plane, GLfixed *equation); +GLAPI void APIENTRY glGetConvolutionParameterxvOES (GLenum target, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetFixedvOES (GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetHistogramParameterxvOES (GLenum target, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetLightxOES (GLenum light, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetMapxvOES (GLenum target, GLenum query, GLfixed *v); +GLAPI void APIENTRY glGetMaterialxOES (GLenum face, GLenum pname, GLfixed param); +GLAPI void APIENTRY glGetPixelMapxv (GLenum map, GLint size, GLfixed *values); +GLAPI void APIENTRY glGetTexEnvxvOES (GLenum target, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetTexGenxvOES (GLenum coord, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetTexLevelParameterxvOES (GLenum target, GLint level, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glGetTexParameterxvOES (GLenum target, GLenum pname, GLfixed *params); +GLAPI void APIENTRY glIndexxOES (GLfixed component); +GLAPI void APIENTRY glIndexxvOES (const GLfixed *component); +GLAPI void APIENTRY glLightModelxOES (GLenum pname, GLfixed param); +GLAPI void APIENTRY glLightModelxvOES (GLenum pname, const GLfixed *param); +GLAPI void APIENTRY glLightxOES (GLenum light, GLenum pname, GLfixed param); +GLAPI void APIENTRY glLightxvOES (GLenum light, GLenum pname, const GLfixed *params); +GLAPI void APIENTRY glLineWidthxOES (GLfixed width); +GLAPI void APIENTRY glLoadMatrixxOES (const GLfixed *m); +GLAPI void APIENTRY glLoadTransposeMatrixxOES (const GLfixed *m); +GLAPI void APIENTRY glMap1xOES (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points); +GLAPI void APIENTRY glMap2xOES (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points); +GLAPI void APIENTRY glMapGrid1xOES (GLint n, GLfixed u1, GLfixed u2); +GLAPI void APIENTRY glMapGrid2xOES (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2); +GLAPI void APIENTRY glMaterialxOES (GLenum face, GLenum pname, GLfixed param); +GLAPI void APIENTRY glMaterialxvOES (GLenum face, GLenum pname, const GLfixed *param); +GLAPI void APIENTRY glMultMatrixxOES (const GLfixed *m); +GLAPI void APIENTRY glMultTransposeMatrixxOES (const GLfixed *m); +GLAPI void APIENTRY glMultiTexCoord1xOES (GLenum texture, GLfixed s); +GLAPI void APIENTRY glMultiTexCoord2xOES (GLenum texture, GLfixed s, GLfixed t); +GLAPI void APIENTRY glMultiTexCoord3xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r); +GLAPI void APIENTRY glMultiTexCoord4xOES (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); +GLAPI void APIENTRY glMultiTexCoord1xvOES (GLenum texture, const GLfixed *coords); +GLAPI void APIENTRY glMultiTexCoord2xvOES (GLenum texture, const GLfixed *coords); +GLAPI void APIENTRY glMultiTexCoord3xvOES (GLenum texture, const GLfixed *coords); +GLAPI void APIENTRY glMultiTexCoord4xvOES (GLenum texture, const GLfixed *coords); +GLAPI void APIENTRY glNormal3xOES (GLfixed nx, GLfixed ny, GLfixed nz); +GLAPI void APIENTRY glNormal3xvOES (const GLfixed *coords); +GLAPI void APIENTRY glOrthoxOES (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); +GLAPI void APIENTRY glPassThroughxOES (GLfixed token); +GLAPI void APIENTRY glPixelMapx (GLenum map, GLint size, const GLfixed *values); +GLAPI void APIENTRY glPixelStorex (GLenum pname, GLfixed param); +GLAPI void APIENTRY glPixelTransferxOES (GLenum pname, GLfixed param); +GLAPI void APIENTRY glPixelZoomxOES (GLfixed xfactor, GLfixed yfactor); +GLAPI void APIENTRY glPointParameterxvOES (GLenum pname, const GLfixed *params); +GLAPI void APIENTRY glPointSizexOES (GLfixed size); +GLAPI void APIENTRY glPolygonOffsetxOES (GLfixed factor, GLfixed units); +GLAPI void APIENTRY glPrioritizeTexturesxOES (GLsizei n, const GLuint *textures, const GLfixed *priorities); +GLAPI void APIENTRY glRasterPos2xOES (GLfixed x, GLfixed y); +GLAPI void APIENTRY glRasterPos3xOES (GLfixed x, GLfixed y, GLfixed z); +GLAPI void APIENTRY glRasterPos4xOES (GLfixed x, GLfixed y, GLfixed z, GLfixed w); +GLAPI void APIENTRY glRasterPos2xvOES (const GLfixed *coords); +GLAPI void APIENTRY glRasterPos3xvOES (const GLfixed *coords); +GLAPI void APIENTRY glRasterPos4xvOES (const GLfixed *coords); +GLAPI void APIENTRY glRectxOES (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2); +GLAPI void APIENTRY glRectxvOES (const GLfixed *v1, const GLfixed *v2); +GLAPI void APIENTRY glRotatexOES (GLfixed angle, GLfixed x, GLfixed y, GLfixed z); +GLAPI void APIENTRY glSampleCoverageOES (GLfixed value, GLboolean invert); +GLAPI void APIENTRY glScalexOES (GLfixed x, GLfixed y, GLfixed z); +GLAPI void APIENTRY glTexCoord1xOES (GLfixed s); +GLAPI void APIENTRY glTexCoord2xOES (GLfixed s, GLfixed t); +GLAPI void APIENTRY glTexCoord3xOES (GLfixed s, GLfixed t, GLfixed r); +GLAPI void APIENTRY glTexCoord4xOES (GLfixed s, GLfixed t, GLfixed r, GLfixed q); +GLAPI void APIENTRY glTexCoord1xvOES (const GLfixed *coords); +GLAPI void APIENTRY glTexCoord2xvOES (const GLfixed *coords); +GLAPI void APIENTRY glTexCoord3xvOES (const GLfixed *coords); +GLAPI void APIENTRY glTexCoord4xvOES (const GLfixed *coords); +GLAPI void APIENTRY glTexEnvxOES (GLenum target, GLenum pname, GLfixed param); +GLAPI void APIENTRY glTexEnvxvOES (GLenum target, GLenum pname, const GLfixed *params); +GLAPI void APIENTRY glTexGenxOES (GLenum coord, GLenum pname, GLfixed param); +GLAPI void APIENTRY glTexGenxvOES (GLenum coord, GLenum pname, const GLfixed *params); +GLAPI void APIENTRY glTexParameterxOES (GLenum target, GLenum pname, GLfixed param); +GLAPI void APIENTRY glTexParameterxvOES (GLenum target, GLenum pname, const GLfixed *params); +GLAPI void APIENTRY glTranslatexOES (GLfixed x, GLfixed y, GLfixed z); +GLAPI void APIENTRY glVertex2xOES (GLfixed x); +GLAPI void APIENTRY glVertex3xOES (GLfixed x, GLfixed y); +GLAPI void APIENTRY glVertex4xOES (GLfixed x, GLfixed y, GLfixed z); +GLAPI void APIENTRY glVertex2xvOES (const GLfixed *coords); +GLAPI void APIENTRY glVertex3xvOES (const GLfixed *coords); +GLAPI void APIENTRY glVertex4xvOES (const GLfixed *coords); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLACCUMXOESPROC) (GLenum op, GLfixed value); +typedef void (APIENTRYP PFNGLALPHAFUNCXOESPROC) (GLenum func, GLfixed ref); +typedef void (APIENTRYP PFNGLBITMAPXOESPROC) (GLsizei width, GLsizei height, GLfixed xorig, GLfixed yorig, GLfixed xmove, GLfixed ymove, const GLubyte *bitmap); +typedef void (APIENTRYP PFNGLBLENDCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +typedef void (APIENTRYP PFNGLCLEARACCUMXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +typedef void (APIENTRYP PFNGLCLEARCOLORXOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +typedef void (APIENTRYP PFNGLCLEARDEPTHXOESPROC) (GLfixed depth); +typedef void (APIENTRYP PFNGLCLIPPLANEXOESPROC) (GLenum plane, const GLfixed *equation); +typedef void (APIENTRYP PFNGLCOLOR3XOESPROC) (GLfixed red, GLfixed green, GLfixed blue); +typedef void (APIENTRYP PFNGLCOLOR4XOESPROC) (GLfixed red, GLfixed green, GLfixed blue, GLfixed alpha); +typedef void (APIENTRYP PFNGLCOLOR3XVOESPROC) (const GLfixed *components); +typedef void (APIENTRYP PFNGLCOLOR4XVOESPROC) (const GLfixed *components); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params); +typedef void (APIENTRYP PFNGLDEPTHRANGEXOESPROC) (GLfixed n, GLfixed f); +typedef void (APIENTRYP PFNGLEVALCOORD1XOESPROC) (GLfixed u); +typedef void (APIENTRYP PFNGLEVALCOORD2XOESPROC) (GLfixed u, GLfixed v); +typedef void (APIENTRYP PFNGLEVALCOORD1XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLEVALCOORD2XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLFEEDBACKBUFFERXOESPROC) (GLsizei n, GLenum type, const GLfixed *buffer); +typedef void (APIENTRYP PFNGLFOGXOESPROC) (GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLFOGXVOESPROC) (GLenum pname, const GLfixed *param); +typedef void (APIENTRYP PFNGLFRUSTUMXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); +typedef void (APIENTRYP PFNGLGETCLIPPLANEXOESPROC) (GLenum plane, GLfixed *equation); +typedef void (APIENTRYP PFNGLGETCONVOLUTIONPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETFIXEDVOESPROC) (GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETHISTOGRAMPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETMAPXVOESPROC) (GLenum target, GLenum query, GLfixed *v); +typedef void (APIENTRYP PFNGLGETMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLGETPIXELMAPXVPROC) (GLenum map, GLint size, GLfixed *values); +typedef void (APIENTRYP PFNGLGETTEXENVXVOESPROC) (GLenum target, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETTEXGENXVOESPROC) (GLenum coord, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETTEXLEVELPARAMETERXVOESPROC) (GLenum target, GLint level, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLGETTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, GLfixed *params); +typedef void (APIENTRYP PFNGLINDEXXOESPROC) (GLfixed component); +typedef void (APIENTRYP PFNGLINDEXXVOESPROC) (const GLfixed *component); +typedef void (APIENTRYP PFNGLLIGHTMODELXOESPROC) (GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLLIGHTMODELXVOESPROC) (GLenum pname, const GLfixed *param); +typedef void (APIENTRYP PFNGLLIGHTXOESPROC) (GLenum light, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLLIGHTXVOESPROC) (GLenum light, GLenum pname, const GLfixed *params); +typedef void (APIENTRYP PFNGLLINEWIDTHXOESPROC) (GLfixed width); +typedef void (APIENTRYP PFNGLLOADMATRIXXOESPROC) (const GLfixed *m); +typedef void (APIENTRYP PFNGLLOADTRANSPOSEMATRIXXOESPROC) (const GLfixed *m); +typedef void (APIENTRYP PFNGLMAP1XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint stride, GLint order, GLfixed points); +typedef void (APIENTRYP PFNGLMAP2XOESPROC) (GLenum target, GLfixed u1, GLfixed u2, GLint ustride, GLint uorder, GLfixed v1, GLfixed v2, GLint vstride, GLint vorder, GLfixed points); +typedef void (APIENTRYP PFNGLMAPGRID1XOESPROC) (GLint n, GLfixed u1, GLfixed u2); +typedef void (APIENTRYP PFNGLMAPGRID2XOESPROC) (GLint n, GLfixed u1, GLfixed u2, GLfixed v1, GLfixed v2); +typedef void (APIENTRYP PFNGLMATERIALXOESPROC) (GLenum face, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLMATERIALXVOESPROC) (GLenum face, GLenum pname, const GLfixed *param); +typedef void (APIENTRYP PFNGLMULTMATRIXXOESPROC) (const GLfixed *m); +typedef void (APIENTRYP PFNGLMULTTRANSPOSEMATRIXXOESPROC) (const GLfixed *m); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1XOESPROC) (GLenum texture, GLfixed s); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2XOESPROC) (GLenum texture, GLfixed s, GLfixed t); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4XOESPROC) (GLenum texture, GLfixed s, GLfixed t, GLfixed r, GLfixed q); +typedef void (APIENTRYP PFNGLMULTITEXCOORD1XVOESPROC) (GLenum texture, const GLfixed *coords); +typedef void (APIENTRYP PFNGLMULTITEXCOORD2XVOESPROC) (GLenum texture, const GLfixed *coords); +typedef void (APIENTRYP PFNGLMULTITEXCOORD3XVOESPROC) (GLenum texture, const GLfixed *coords); +typedef void (APIENTRYP PFNGLMULTITEXCOORD4XVOESPROC) (GLenum texture, const GLfixed *coords); +typedef void (APIENTRYP PFNGLNORMAL3XOESPROC) (GLfixed nx, GLfixed ny, GLfixed nz); +typedef void (APIENTRYP PFNGLNORMAL3XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLORTHOXOESPROC) (GLfixed l, GLfixed r, GLfixed b, GLfixed t, GLfixed n, GLfixed f); +typedef void (APIENTRYP PFNGLPASSTHROUGHXOESPROC) (GLfixed token); +typedef void (APIENTRYP PFNGLPIXELMAPXPROC) (GLenum map, GLint size, const GLfixed *values); +typedef void (APIENTRYP PFNGLPIXELSTOREXPROC) (GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLPIXELTRANSFERXOESPROC) (GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLPIXELZOOMXOESPROC) (GLfixed xfactor, GLfixed yfactor); +typedef void (APIENTRYP PFNGLPOINTPARAMETERXVOESPROC) (GLenum pname, const GLfixed *params); +typedef void (APIENTRYP PFNGLPOINTSIZEXOESPROC) (GLfixed size); +typedef void (APIENTRYP PFNGLPOLYGONOFFSETXOESPROC) (GLfixed factor, GLfixed units); +typedef void (APIENTRYP PFNGLPRIORITIZETEXTURESXOESPROC) (GLsizei n, const GLuint *textures, const GLfixed *priorities); +typedef void (APIENTRYP PFNGLRASTERPOS2XOESPROC) (GLfixed x, GLfixed y); +typedef void (APIENTRYP PFNGLRASTERPOS3XOESPROC) (GLfixed x, GLfixed y, GLfixed z); +typedef void (APIENTRYP PFNGLRASTERPOS4XOESPROC) (GLfixed x, GLfixed y, GLfixed z, GLfixed w); +typedef void (APIENTRYP PFNGLRASTERPOS2XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLRASTERPOS3XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLRASTERPOS4XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLRECTXOESPROC) (GLfixed x1, GLfixed y1, GLfixed x2, GLfixed y2); +typedef void (APIENTRYP PFNGLRECTXVOESPROC) (const GLfixed *v1, const GLfixed *v2); +typedef void (APIENTRYP PFNGLROTATEXOESPROC) (GLfixed angle, GLfixed x, GLfixed y, GLfixed z); +typedef void (APIENTRYP PFNGLSAMPLECOVERAGEOESPROC) (GLfixed value, GLboolean invert); +typedef void (APIENTRYP PFNGLSCALEXOESPROC) (GLfixed x, GLfixed y, GLfixed z); +typedef void (APIENTRYP PFNGLTEXCOORD1XOESPROC) (GLfixed s); +typedef void (APIENTRYP PFNGLTEXCOORD2XOESPROC) (GLfixed s, GLfixed t); +typedef void (APIENTRYP PFNGLTEXCOORD3XOESPROC) (GLfixed s, GLfixed t, GLfixed r); +typedef void (APIENTRYP PFNGLTEXCOORD4XOESPROC) (GLfixed s, GLfixed t, GLfixed r, GLfixed q); +typedef void (APIENTRYP PFNGLTEXCOORD1XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLTEXCOORD2XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLTEXCOORD3XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLTEXCOORD4XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLTEXENVXOESPROC) (GLenum target, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLTEXENVXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params); +typedef void (APIENTRYP PFNGLTEXGENXOESPROC) (GLenum coord, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLTEXGENXVOESPROC) (GLenum coord, GLenum pname, const GLfixed *params); +typedef void (APIENTRYP PFNGLTEXPARAMETERXOESPROC) (GLenum target, GLenum pname, GLfixed param); +typedef void (APIENTRYP PFNGLTEXPARAMETERXVOESPROC) (GLenum target, GLenum pname, const GLfixed *params); +typedef void (APIENTRYP PFNGLTRANSLATEXOESPROC) (GLfixed x, GLfixed y, GLfixed z); +typedef void (APIENTRYP PFNGLVERTEX2XOESPROC) (GLfixed x); +typedef void (APIENTRYP PFNGLVERTEX3XOESPROC) (GLfixed x, GLfixed y); +typedef void (APIENTRYP PFNGLVERTEX4XOESPROC) (GLfixed x, GLfixed y, GLfixed z); +typedef void (APIENTRYP PFNGLVERTEX2XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLVERTEX3XVOESPROC) (const GLfixed *coords); +typedef void (APIENTRYP PFNGLVERTEX4XVOESPROC) (const GLfixed *coords); +#endif + +#ifndef GL_OES_single_precision +#define GL_OES_single_precision 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDepthRangefOES (GLclampf n, GLclampf f); +GLAPI void APIENTRY glFrustumfOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); +GLAPI void APIENTRY glOrthofOES (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); +GLAPI void APIENTRY glClipPlanefOES (GLenum plane, const GLfloat *equation); +GLAPI void APIENTRY glClearDepthfOES (GLclampd depth); +GLAPI void APIENTRY glGetClipPlanefOES (GLenum plane, GLfloat *equation); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDEPTHRANGEFOESPROC) (GLclampf n, GLclampf f); +typedef void (APIENTRYP PFNGLFRUSTUMFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); +typedef void (APIENTRYP PFNGLORTHOFOESPROC) (GLfloat l, GLfloat r, GLfloat b, GLfloat t, GLfloat n, GLfloat f); +typedef void (APIENTRYP PFNGLCLIPPLANEFOESPROC) (GLenum plane, const GLfloat *equation); +typedef void (APIENTRYP PFNGLCLEARDEPTHFOESPROC) (GLclampd depth); +typedef void (APIENTRYP PFNGLGETCLIPPLANEFOESPROC) (GLenum plane, GLfloat *equation); +#endif + +#ifndef GL_OES_compressed_paletted_texture +#define GL_OES_compressed_paletted_texture 1 +#endif + #ifndef GL_OES_read_format #define GL_OES_read_format 1 #endif +#ifndef GL_OES_query_matrix +#define GL_OES_query_matrix 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI GLbitfield APIENTRY glQueryMatrixxOES (const GLfixed *mantissa, const GLint *exponent); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef GLbitfield (APIENTRYP PFNGLQUERYMATRIXXOESPROC) (const GLfixed *mantissa, const GLint *exponent); +#endif + #ifndef GL_EXT_depth_bounds_test #define GL_EXT_depth_bounds_test 1 #ifdef GL_GLEXT_PROTOTYPES @@ -10495,13 +11755,13 @@ typedef void (APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC) (GLen #ifndef GL_NV_parameter_buffer_object #define GL_NV_parameter_buffer_object 1 #ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); +GLAPI void APIENTRY glProgramBufferParametersfvNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params); +GLAPI void APIENTRY glProgramBufferParametersIivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params); +GLAPI void APIENTRY glProgramBufferParametersIuivNV (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params); #endif /* GL_GLEXT_PROTOTYPES */ -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); +typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLfloat *params); +typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLint *params); +typedef void (APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC) (GLenum target, GLuint bindingIndex, GLuint wordIndex, GLsizei count, const GLuint *params); #endif #ifndef GL_EXT_draw_buffers2 @@ -11571,7 +12831,7 @@ typedef GLuint (APIENTRYP PFNGLGETDEBUGMESSAGELOGAMDPROC) (GLuint count, GLsizei #ifdef GL_GLEXT_PROTOTYPES GLAPI void APIENTRY glVDPAUInitNV (const GLvoid *vdpDevice, const GLvoid *getProcAddress); GLAPI void APIENTRY glVDPAUFiniNV (void); -GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); +GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterVideoSurfaceNV (const GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); GLAPI GLvdpauSurfaceNV APIENTRY glVDPAURegisterOutputSurfaceNV (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); GLAPI void APIENTRY glVDPAUIsSurfaceNV (GLvdpauSurfaceNV surface); GLAPI void APIENTRY glVDPAUUnregisterSurfaceNV (GLvdpauSurfaceNV surface); @@ -11582,7 +12842,7 @@ GLAPI void APIENTRY glVDPAUUnmapSurfacesNV (GLsizei numSurface, const GLvdpauSur #endif /* GL_GLEXT_PROTOTYPES */ typedef void (APIENTRYP PFNGLVDPAUINITNVPROC) (const GLvoid *vdpDevice, const GLvoid *getProcAddress); typedef void (APIENTRYP PFNGLVDPAUFININVPROC) (void); -typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); +typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTERVIDEOSURFACENVPROC) (const GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); typedef GLvdpauSurfaceNV (APIENTRYP PFNGLVDPAUREGISTEROUTPUTSURFACENVPROC) (GLvoid *vdpSurface, GLenum target, GLsizei numTextureNames, const GLuint *textureNames); typedef void (APIENTRYP PFNGLVDPAUISSURFACENVPROC) (GLvdpauSurfaceNV surface); typedef void (APIENTRYP PFNGLVDPAUUNREGISTERSURFACENVPROC) (GLvdpauSurfaceNV surface); @@ -11820,6 +13080,66 @@ typedef GLboolean (APIENTRYP PFNGLISIMAGEHANDLERESIDENTNVPROC) (GLuint64 handle) #define GL_AMD_query_buffer_object 1 #endif +#ifndef GL_NV_compute_program5 +#define GL_NV_compute_program5 1 +#endif + +#ifndef GL_NV_shader_storage_buffer_object +#define GL_NV_shader_storage_buffer_object 1 +#endif + +#ifndef GL_NV_shader_atomic_counters +#define GL_NV_shader_atomic_counters 1 +#endif + +#ifndef GL_NV_deep_texture3D +#define GL_NV_deep_texture3D 1 +#endif + +#ifndef GL_NVX_conditional_render +#define GL_NVX_conditional_render 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glBeginConditionalRenderNVX (GLuint id); +GLAPI void APIENTRY glEndConditionalRenderNVX (void); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLBEGINCONDITIONALRENDERNVXPROC) (GLuint id); +typedef void (APIENTRYP PFNGLENDCONDITIONALRENDERNVXPROC) (void); +#endif + +#ifndef GL_AMD_sparse_texture +#define GL_AMD_sparse_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glTexStorageSparseAMD (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); +GLAPI void APIENTRY glTextureStorageSparseAMD (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLTEXSTORAGESPARSEAMDPROC) (GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); +typedef void (APIENTRYP PFNGLTEXTURESTORAGESPARSEAMDPROC) (GLuint texture, GLenum target, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei layers, GLbitfield flags); +#endif + +#ifndef GL_AMD_shader_trinary_minmax +#define GL_AMD_shader_trinary_minmax 1 +#endif + +#ifndef GL_INTEL_map_texture +#define GL_INTEL_map_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glSyncTextureINTEL (GLuint texture); +GLAPI void APIENTRY glUnmapTexture2DINTEL (GLuint texture, GLint level); +GLAPI GLvoid* APIENTRY glMapTexture2DINTEL (GLuint texture, GLint level, GLbitfield access, const GLint *stride, const GLenum *layout); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLSYNCTEXTUREINTELPROC) (GLuint texture); +typedef void (APIENTRYP PFNGLUNMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level); +typedef GLvoid* (APIENTRYP PFNGLMAPTEXTURE2DINTELPROC) (GLuint texture, GLint level, GLbitfield access, const GLint *stride, const GLenum *layout); +#endif + +#ifndef GL_NV_draw_texture +#define GL_NV_draw_texture 1 +#ifdef GL_GLEXT_PROTOTYPES +GLAPI void APIENTRY glDrawTextureNV (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); +#endif /* GL_GLEXT_PROTOTYPES */ +typedef void (APIENTRYP PFNGLDRAWTEXTURENVPROC) (GLuint texture, GLuint sampler, GLfloat x0, GLfloat y0, GLfloat x1, GLfloat y1, GLfloat z, GLfloat s0, GLfloat t0, GLfloat s1, GLfloat t1); +#endif + #ifdef __cplusplus } diff --git a/src/gui/opengl/qopenglframebufferobject.h b/src/gui/opengl/qopenglframebufferobject.h index 72c1ecc..215d370 100644 --- a/src/gui/opengl/qopenglframebufferobject.h +++ b/src/gui/opengl/qopenglframebufferobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,6 +42,8 @@ #ifndef QOPENGLFRAMEBUFFEROBJECT_H #define QOPENGLFRAMEBUFFEROBJECT_H +#include + #ifndef QT_NO_OPENGL #include @@ -49,8 +51,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -161,8 +161,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QOPENGLFRAMEBUFFEROBJECT_H diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index f035e26..1548ad4 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,6 +42,8 @@ #ifndef QOPENGLFUNCTIONS_H #define QOPENGLFUNCTIONS_H +#include + #ifndef QT_NO_OPENGL #ifdef __GLEW_H__ @@ -71,31 +73,8 @@ #define Q_OPENGL_FUNCTIONS_DEBUG #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE - -// Types that aren't defined in all system's gl.h files. -typedef ptrdiff_t qopengl_GLintptr; -typedef ptrdiff_t qopengl_GLsizeiptr; - - -#if defined(APIENTRY) && !defined(QOPENGLF_APIENTRY) -# define QOPENGLF_APIENTRY APIENTRY -#elif defined(GL_APIENTRY) && !defined(QOPENGLF_APIENTRY) -# define QOPENGLF_APIENTRY GL_APIENTRY -#endif - -# ifndef QOPENGLF_APIENTRYP -# ifdef QOPENGLF_APIENTRY -# define QOPENGLF_APIENTRYP QOPENGLF_APIENTRY * -# else -# define QOPENGLF_APIENTRY -# define QOPENGLF_APIENTRYP * -# endif -# endif - struct QOpenGLFunctionsPrivate; // Undefine any macros from GLEW, qopenglextensions_p.h, etc that @@ -1520,8 +1499,6 @@ inline void QOpenGLFunctions::glVertexAttribPointer(GLuint indx, GLint size, GLe QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif diff --git a/src/gui/opengl/qopenglpaintdevice.h b/src/gui/opengl/qopenglpaintdevice.h index 1a12005..c05571c 100644 --- a/src/gui/opengl/qopenglpaintdevice.h +++ b/src/gui/opengl/qopenglpaintdevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,14 +42,14 @@ #ifndef QOPENGLPAINTDEVICE_H #define QOPENGLPAINTDEVICE_H +#include + #ifndef QT_NO_OPENGL #include #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -70,6 +70,7 @@ public: QOpenGLContext *context() const; QSize size() const; void setSize(const QSize &size); + void setDevicePixelRatio(qreal devicePixelRatio); qreal dotsPerMeterX() const; qreal dotsPerMeterY() const; @@ -91,8 +92,6 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QOPENGLPAINTDEVICE_H diff --git a/src/gui/opengl/qopenglshaderprogram.h b/src/gui/opengl/qopenglshaderprogram.h index c765e7d..b894ae3 100644 --- a/src/gui/opengl/qopenglshaderprogram.h +++ b/src/gui/opengl/qopenglshaderprogram.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -42,6 +42,8 @@ #ifndef QOPENGLSHADERPROGRAM_H #define QOPENGLSHADERPROGRAM_H +#include + #ifndef QT_NO_OPENGL #include @@ -50,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,8 +65,12 @@ class Q_GUI_EXPORT QOpenGLShader : public QObject public: enum ShaderTypeBit { - Vertex = 0x0001, - Fragment = 0x0002 + Vertex = 0x0001, + Fragment = 0x0002, + Geometry = 0x0004, + TessellationControl = 0x0008, + TessellationEvaluation = 0x0010, + Compute = 0x0020 }; Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit) @@ -128,6 +132,17 @@ public: GLuint programId() const; + int maxGeometryOutputVertices() const; + + void setPatchVertexCount(int count); + int patchVertexCount() const; + + void setDefaultOuterTessellationLevels(const QVector &levels); + QVector defaultOuterTessellationLevels() const; + + void setDefaultInnerTessellationLevels(const QVector &levels); + QVector defaultInnerTessellationLevels() const; + void bindAttributeLocation(const char *name, int location); void bindAttributeLocation(const QByteArray& name, int location); void bindAttributeLocation(const QString& name, int location); @@ -293,8 +308,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif diff --git a/src/gui/painting/qbackingstore.h b/src/gui/painting/qbackingstore.h index c910b39..65efab2 100644 --- a/src/gui/painting/qbackingstore.h +++ b/src/gui/painting/qbackingstore.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -93,6 +91,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QBACKINGSTORE_H diff --git a/src/gui/painting/qbrush.h b/src/gui/painting/qbrush.h index 0f51673..4d8c97e 100644 --- a/src/gui/painting/qbrush.h +++ b/src/gui/painting/qbrush.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -52,17 +52,6 @@ #include #include -#if defined(Q_OS_VXWORKS) -# if defined(m_data) -# undef m_data -# endif -# if defined(m_type) -# undef m_type -# endif -#endif - -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -326,6 +315,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QBRUSH_H diff --git a/src/gui/painting/qcolor.h b/src/gui/painting/qcolor.h index 695c747..ef3503e 100644 --- a/src/gui/painting/qcolor.h +++ b/src/gui/painting/qcolor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -268,14 +266,12 @@ inline QColor::QColor(const QColor &acolor) inline bool QColor::isValid() const { return cspec != Invalid; } -inline QColor QColor::lighter(int f) const +inline QColor QColor::lighter(int f) const { return light(f); } -inline QColor QColor::darker(int f) const +inline QColor QColor::darker(int f) const { return dark(f); } QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOLOR_H diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h index be16b44..d2c1ae3 100644 --- a/src/gui/painting/qmatrix.h +++ b/src/gui/painting/qmatrix.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -185,6 +183,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QMatrix &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QMATRIX_H diff --git a/src/gui/painting/qpagedpaintdevice.h b/src/gui/painting/qpagedpaintdevice.h index fb4b6f3..d44a401 100644 --- a/src/gui/painting/qpagedpaintdevice.h +++ b/src/gui/painting/qpagedpaintdevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,10 +44,11 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +#if defined(B0) +#undef B0 // Terminal hang-up. We assume that you do not want that. +#endif class QPagedPaintDevicePrivate; @@ -87,6 +88,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/painting/qpaintdevice.h b/src/gui/painting/qpaintdevice.h index 32a2d6e..bb66f32 100644 --- a/src/gui/painting/qpaintdevice.h +++ b/src/gui/painting/qpaintdevice.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -67,7 +65,8 @@ public: PdmDpiX, PdmDpiY, PdmPhysicalDpiX, - PdmPhysicalDpiY + PdmPhysicalDpiY, + PdmDevicePixelRatio }; virtual ~QPaintDevice(); @@ -84,6 +83,7 @@ public: int logicalDpiY() const { return metric(PdmDpiY); } int physicalDpiX() const { return metric(PdmPhysicalDpiX); } int physicalDpiY() const { return metric(PdmPhysicalDpiY); } + int devicePixelRatio() const { return metric(PdmDevicePixelRatio); } int colorCount() const { return metric(PdmNumColors); } int depth() const { return metric(PdmDepth); } @@ -120,6 +120,4 @@ inline bool QPaintDevice::paintingActive() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAINTDEVICE_H diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index 1e96933..b4dec29 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -198,7 +196,7 @@ public: Windows, QuickDraw, CoreGraphics, MacPrinter, QWindowSystem, - PostScript, + PostScript, // ### Qt 6: Remove, update documentation OpenGL, Picture, SVG, @@ -255,7 +253,6 @@ private: #ifndef QT_NO_QWS_QPF2 friend class QFontEngineQPF; #endif - friend class QPSPrintEngine; friend class QMacPrintEngine; friend class QMacPrintEnginePrivate; friend class QFontEngineQPA; @@ -348,6 +345,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QPaintEngine::DirtyFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAINTENGINE_H diff --git a/src/gui/painting/qpainter.h b/src/gui/painting/qpainter.h index a393b29..874b244 100644 --- a/src/gui/painting/qpainter.h +++ b/src/gui/painting/qpainter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -60,8 +60,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -932,6 +930,4 @@ inline void QPainter::drawPicture(const QPoint &pt, const QPicture &p) QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAINTER_H diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 29fd8e9..e22c172 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -375,6 +373,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QPainterPath &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAINTERPATH_H diff --git a/src/gui/painting/qpdfwriter.h b/src/gui/painting/qpdfwriter.h index f4e6110..45bb5ad 100644 --- a/src/gui/painting/qpdfwriter.h +++ b/src/gui/painting/qpdfwriter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -85,6 +83,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/painting/qpen.h b/src/gui/painting/qpen.h index da0ddb7..c5144f7 100644 --- a/src/gui/painting/qpen.h +++ b/src/gui/painting/qpen.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QPen &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPEN_H diff --git a/src/gui/painting/qpolygon.h b/src/gui/painting/qpolygon.h index b05ec8a..1039e84 100644 --- a/src/gui/painting/qpolygon.h +++ b/src/gui/painting/qpolygon.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -185,6 +183,4 @@ inline QPolygonF QPolygonF::translated(qreal dx, qreal dy) const QT_END_NAMESPACE -QT_END_HEADER - #endif // QPOLYGON_H diff --git a/src/gui/painting/qregion.h b/src/gui/painting/qregion.h index c027e6c..0e436e3 100644 --- a/src/gui/painting/qregion.h +++ b/src/gui/painting/qregion.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -173,6 +171,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QRegion &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QREGION_H diff --git a/src/gui/painting/qrgb.h b/src/gui/painting/qrgb.h index e2b2a28..3c2bc5b 100644 --- a/src/gui/painting/qrgb.h +++ b/src/gui/painting/qrgb.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,44 +44,41 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE typedef unsigned int QRgb; // RGB triplet -const QRgb RGB_MASK = 0x00ffffff; // masks RGB values +// non-namespaced Qt global variable +const Q_DECL_UNUSED QRgb RGB_MASK = 0x00ffffff; // masks RGB values -inline int qRed(QRgb rgb) // get red part of RGB +inline Q_DECL_CONSTEXPR int qRed(QRgb rgb) // get red part of RGB { return ((rgb >> 16) & 0xff); } -inline int qGreen(QRgb rgb) // get green part of RGB +inline Q_DECL_CONSTEXPR int qGreen(QRgb rgb) // get green part of RGB { return ((rgb >> 8) & 0xff); } -inline int qBlue(QRgb rgb) // get blue part of RGB +inline Q_DECL_CONSTEXPR int qBlue(QRgb rgb) // get blue part of RGB { return (rgb & 0xff); } -inline int qAlpha(QRgb rgb) // get alpha part of RGBA +inline Q_DECL_CONSTEXPR int qAlpha(QRgb rgb) // get alpha part of RGBA { return rgb >> 24; } -inline QRgb qRgb(int r, int g, int b)// set RGB value +inline Q_DECL_CONSTEXPR QRgb qRgb(int r, int g, int b)// set RGB value { return (0xffu << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -inline QRgb qRgba(int r, int g, int b, int a)// set RGBA value +inline Q_DECL_CONSTEXPR QRgb qRgba(int r, int g, int b, int a)// set RGBA value { return ((a & 0xff) << 24) | ((r & 0xff) << 16) | ((g & 0xff) << 8) | (b & 0xff); } -inline int qGray(int r, int g, int b)// convert R,G,B to gray 0..255 +inline Q_DECL_CONSTEXPR int qGray(int r, int g, int b)// convert R,G,B to gray 0..255 { return (r*11+g*16+b*5)/32; } -inline int qGray(QRgb rgb) // convert RGB to gray 0..255 +inline Q_DECL_CONSTEXPR int qGray(QRgb rgb) // convert RGB to gray 0..255 { return qGray(qRed(rgb), qGreen(rgb), qBlue(rgb)); } -inline bool qIsGray(QRgb rgb) +inline Q_DECL_CONSTEXPR bool qIsGray(QRgb rgb) { return qRed(rgb) == qGreen(rgb) && qRed(rgb) == qBlue(rgb); } QT_END_NAMESPACE -QT_END_HEADER - #endif // QRGB_H diff --git a/src/gui/painting/qtransform.h b/src/gui/painting/qtransform.h index d569b86..060362f 100644 --- a/src/gui/painting/qtransform.h +++ b/src/gui/painting/qtransform.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -50,12 +50,6 @@ #include #include -#if defined(Q_OS_VXWORKS) && defined(m_type) -# undef m_type -#endif - -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -389,6 +383,4 @@ inline QTransform operator -(const QTransform &a, qreal n) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTRANSFORM_H diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 1aa15eb..95733f5 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -144,6 +142,4 @@ Q_DECLARE_INTERFACE(QTextObjectInterface, "org.qt-project.Qt.QTextObjectInterfac QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTTEXTDOCUMENTLAYOUT_H diff --git a/src/gui/text/qfont.h b/src/gui/text/qfont.h index 886d087..6d36f78 100644 --- a/src/gui/text/qfont.h +++ b/src/gui/text/qfont.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -287,7 +285,6 @@ private: friend class QFontInfo; friend class QPainter; friend class QPainterPrivate; - friend class QPSPrintEngineFont; friend class QApplication; friend class QWidget; friend class QWidgetPrivate; @@ -350,6 +347,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QFont &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QFONT_H diff --git a/src/gui/text/qfontdatabase.h b/src/gui/text/qfontdatabase.h index a94f306..05f1a85 100644 --- a/src/gui/text/qfontdatabase.h +++ b/src/gui/text/qfontdatabase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -166,6 +164,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QFONTDATABASE_H diff --git a/src/gui/text/qfontinfo.h b/src/gui/text/qfontinfo.h index c04ef45..efa8f6e 100644 --- a/src/gui/text/qfontinfo.h +++ b/src/gui/text/qfontinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ Q_DECLARE_SHARED(QFontInfo) QT_END_NAMESPACE -QT_END_HEADER - #endif // QFONTINFO_H diff --git a/src/gui/text/qfontmetrics.h b/src/gui/text/qfontmetrics.h index 83affa74..00b38eb 100644 --- a/src/gui/text/qfontmetrics.h +++ b/src/gui/text/qfontmetrics.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -191,6 +189,4 @@ Q_DECLARE_SHARED(QFontMetricsF) QT_END_NAMESPACE -QT_END_HEADER - #endif // QFONTMETRICS_H diff --git a/src/gui/text/qglyphrun.h b/src/gui/text/qglyphrun.h index a5361ac..4353790 100644 --- a/src/gui/text/qglyphrun.h +++ b/src/gui/text/qglyphrun.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -49,8 +49,6 @@ #if !defined(QT_NO_RAWFONT) -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -130,8 +128,6 @@ Q_DECLARE_SHARED(QGlyphRun) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_RAWFONT #endif // QGLYPHRUN_H diff --git a/src/gui/text/qrawfont.h b/src/gui/text/qrawfont.h index 9831480..eb84a8f 100644 --- a/src/gui/text/qrawfont.h +++ b/src/gui/text/qrawfont.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -53,8 +53,6 @@ #if !defined(QT_NO_RAWFONT) -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -67,6 +65,13 @@ public: SubPixelAntialiasing }; + enum LayoutFlag { + SeparateAdvances = 0, + KernedAdvances = 1, + UseDesignMetrics = 2 + }; + Q_DECLARE_FLAGS(LayoutFlags, LayoutFlag) + QRawFont(); QRawFont(const QString &fileName, qreal pixelSize, @@ -95,8 +100,10 @@ public: QVector glyphIndexesForString(const QString &text) const; inline QVector advancesForGlyphIndexes(const QVector &glyphIndexes) const; + inline QVector advancesForGlyphIndexes(const QVector &glyphIndexes, LayoutFlags layoutFlags) const; bool glyphIndexesForChars(const QChar *chars, int numChars, quint32 *glyphIndexes, int *numGlyphs) const; bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs) const; + bool advancesForGlyphIndexes(const quint32 *glyphIndexes, QPointF *advances, int numGlyphs, LayoutFlags layoutFlags) const; QImage alphaMapForGlyph(quint32 glyphIndex, AntialiasingType antialiasingType = SubPixelAntialiasing, @@ -147,17 +154,22 @@ private: Q_DECLARE_SHARED(QRawFont) -inline QVector QRawFont::advancesForGlyphIndexes(const QVector &glyphIndexes) const +Q_DECLARE_OPERATORS_FOR_FLAGS(QRawFont::LayoutFlags) + +inline QVector QRawFont::advancesForGlyphIndexes(const QVector &glyphIndexes, QRawFont::LayoutFlags layoutFlags) const { QVector advances(glyphIndexes.size()); - if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), glyphIndexes.size())) + if (advancesForGlyphIndexes(glyphIndexes.constData(), advances.data(), glyphIndexes.size(), layoutFlags)) return advances; return QVector(); } -QT_END_NAMESPACE +inline QVector QRawFont::advancesForGlyphIndexes(const QVector &glyphIndexes) const +{ + return advancesForGlyphIndexes(glyphIndexes, QRawFont::SeparateAdvances); +} -QT_END_HEADER +QT_END_NAMESPACE #endif // QT_NO_RAWFONT diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h index 2069762..e41c475 100644 --- a/src/gui/text/qstatictext.h +++ b/src/gui/text/qstatictext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the test suite of the Qt Toolkit. @@ -50,14 +50,12 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QStaticTextPrivate; class Q_GUI_EXPORT QStaticText -{ +{ public: enum PerformanceHint { ModerateCaching, @@ -107,6 +105,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QStaticText) -QT_END_HEADER - #endif // QSTATICTEXT_H diff --git a/src/gui/text/qsyntaxhighlighter.h b/src/gui/text/qsyntaxhighlighter.h index 093f9c7..8af35a1 100644 --- a/src/gui/text/qsyntaxhighlighter.h +++ b/src/gui/text/qsyntaxhighlighter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -102,8 +100,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SYNTAXHIGHLIGHTER #endif // QSYNTAXHIGHLIGHTER_H diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h index a9756dc..560e80d 100644 --- a/src/gui/text/qtextcursor.h +++ b/src/gui/text/qtextcursor.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -239,6 +237,4 @@ Q_DECLARE_SHARED(QTextCursor) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTCURSOR_H diff --git a/src/gui/text/qtextdocument.h b/src/gui/text/qtextdocument.h index dffc02b..9d9cbcf 100644 --- a/src/gui/text/qtextdocument.h +++ b/src/gui/text/qtextdocument.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -296,6 +294,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QTextDocument::FindFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTDOCUMENT_H diff --git a/src/gui/text/qtextdocumentfragment.h b/src/gui/text/qtextdocumentfragment.h index e2e9a48..fe9fbff 100644 --- a/src/gui/text/qtextdocumentfragment.h +++ b/src/gui/text/qtextdocumentfragment.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -85,6 +83,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTDOCUMENTFRAGMENT_H diff --git a/src/gui/text/qtextdocumentwriter.h b/src/gui/text/qtextdocumentwriter.h index 9c67a6f..7fba231 100644 --- a/src/gui/text/qtextdocumentwriter.h +++ b/src/gui/text/qtextdocumentwriter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -43,8 +43,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -87,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h index 00cf97b..2098369 100644 --- a/src/gui/text/qtextformat.h +++ b/src/gui/text/qtextformat.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -51,8 +51,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -1009,6 +1007,4 @@ inline void QTextTableCellFormat::setPadding(qreal padding) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTFORMAT_H diff --git a/src/gui/text/qtextlayout.h b/src/gui/text/qtextlayout.h index 2eec9fb..cbe42c3 100644 --- a/src/gui/text/qtextlayout.h +++ b/src/gui/text/qtextlayout.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -190,7 +188,6 @@ private: Q_DISABLE_COPY(QTextLayout) friend class QPainter; - friend class QPSPrinter; friend class QGraphicsSimpleTextItemPrivate; friend class QGraphicsSimpleTextItem; friend void qt_format_text(const QFont &font, const QRectF &_r, int tf, const QTextOption *, const QString& str, @@ -266,6 +263,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTLAYOUT_H diff --git a/src/gui/text/qtextlist.h b/src/gui/text/qtextlist.h index 2c3ea28..1fcc99d 100644 --- a/src/gui/text/qtextlist.h +++ b/src/gui/text/qtextlist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -88,6 +86,4 @@ inline void QTextList::setFormat(const QTextListFormat &aformat) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTLIST_H diff --git a/src/gui/text/qtextobject.h b/src/gui/text/qtextobject.h index bcb7be0..87f2cf6 100644 --- a/src/gui/text/qtextobject.h +++ b/src/gui/text/qtextobject.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -329,6 +327,4 @@ Q_DECLARE_TYPEINFO(QTextFragment, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTOBJECT_H diff --git a/src/gui/text/qtextoption.h b/src/gui/text/qtextoption.h index 9a8f856..a6818eb 100644 --- a/src/gui/text/qtextoption.h +++ b/src/gui/text/qtextoption.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -157,6 +155,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE( QTextOption::Tab ) -QT_END_HEADER - #endif // QTEXTOPTION_H diff --git a/src/gui/text/qtexttable.h b/src/gui/text/qtexttable.h index d7b5c87..9da205a 100644 --- a/src/gui/text/qtexttable.h +++ b/src/gui/text/qtexttable.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTTABLE_H diff --git a/src/gui/util/qdesktopservices.h b/src/gui/util/qdesktopservices.h index b7013da..9b1d710 100644 --- a/src/gui/util/qdesktopservices.h +++ b/src/gui/util/qdesktopservices.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -94,7 +92,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESKTOPSERVICES_H diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h index e4aa55d..386af1b 100644 --- a/src/gui/util/qvalidator.h +++ b/src/gui/util/qvalidator.h @@ -1,6 +1,7 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2012 Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com, author Giuseppe D'Angelo ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,10 +46,9 @@ #include #include #include +#include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -195,10 +195,39 @@ private: #endif // QT_NO_REGEXP +#ifndef QT_NO_REGULAREXPRESSION + +class QRegularExpressionValidatorPrivate; + +class Q_GUI_EXPORT QRegularExpressionValidator : public QValidator +{ + Q_OBJECT + Q_PROPERTY(QRegularExpression regularExpression READ regularExpression WRITE setRegularExpression NOTIFY regularExpressionChanged) + +public: + explicit QRegularExpressionValidator(QObject *parent = 0); + explicit QRegularExpressionValidator(const QRegularExpression &re, QObject *parent = 0); + ~QRegularExpressionValidator(); + + virtual QValidator::State validate(QString &input, int &pos) const Q_DECL_OVERRIDE; + + QRegularExpression regularExpression() const; + +public Q_SLOTS: + void setRegularExpression(const QRegularExpression &re); + +Q_SIGNALS: + void regularExpressionChanged(const QRegularExpression &re); + +private: + Q_DISABLE_COPY(QRegularExpressionValidator) + Q_DECLARE_PRIVATE(QRegularExpressionValidator) +}; + +#endif // QT_NO_REGULAREXPRESSION + #endif // QT_NO_VALIDATOR QT_END_NAMESPACE -QT_END_HEADER - #endif // QVALIDATOR_H From thiago.macieira at intel.com Wed Jun 26 22:50:13 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:13 -0700 Subject: [Development] Header diff for QtSvg In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h index b4e2dc2..09cda2a 100644 --- a/src/svg/qgraphicssvgitem.h +++ b/src/svg/qgraphicssvgitem.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,8 +96,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_WIDGETS #endif // QGRAPHICSSVGITEM_H diff --git a/src/svg/qsvggenerator.h b/src/svg/qsvggenerator.h index 6ba0aa1..44e9ced 100644 --- a/src/svg/qsvggenerator.h +++ b/src/svg/qsvggenerator.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,7 +104,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SVGGENERATOR #endif // QSVGGENERATOR_H diff --git a/src/svg/qsvgrenderer.h b/src/svg/qsvgrenderer.h index cafe94d..395f093 100644 --- a/src/svg/qsvgrenderer.h +++ b/src/svg/qsvgrenderer.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -52,8 +52,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -114,7 +112,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SVGRENDERER #endif // QSVGRENDERER_H diff --git a/src/svg/qsvgwidget.h b/src/svg/qsvgwidget.h index 02098f3..e91b974 100644 --- a/src/svg/qsvgwidget.h +++ b/src/svg/qsvgwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtSvg module of the Qt Toolkit. +** This file is part of the Qt SVG module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -82,8 +80,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_WIDGETS #endif // QSVGWIDGET_H diff --git a/src/svg/qtsvgglobal.h b/src/svg/qtsvgglobal.h index ace2053..3779679 100644 --- a/src/svg/qtsvgglobal.h +++ b/src/svg/qtsvgglobal.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef Q_SVG_EXPORT @@ -62,6 +60,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:50:10 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:10 -0700 Subject: [Development] Header diff for QtScript In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h index 82fa250..4f4fdc2 100644 --- a/src/script/api/qscriptable.h +++ b/src/script/api/qscriptable.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -29,8 +29,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,6 +63,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTABLE_H diff --git a/src/script/api/qscriptclass.h b/src/script/api/qscriptclass.h index d7d2011..fbc7699 100644 --- a/src/script/api/qscriptclass.h +++ b/src/script/api/qscriptclass.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -30,8 +30,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -94,6 +92,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptClass::QueryFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/script/api/qscriptclasspropertyiterator.h b/src/script/api/qscriptclasspropertyiterator.h index 96a49ef..3a946bd 100644 --- a/src/script/api/qscriptclasspropertyiterator.h +++ b/src/script/api/qscriptclasspropertyiterator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -29,8 +29,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -69,6 +67,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/script/api/qscriptcontext.h b/src/script/api/qscriptcontext.h index 81b23a2..8cbfad8 100644 --- a/src/script/api/qscriptcontext.h +++ b/src/script/api/qscriptcontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -28,8 +28,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/script/api/qscriptcontextinfo.h b/src/script/api/qscriptcontextinfo.h index 28baf70..148f09a 100644 --- a/src/script/api/qscriptcontextinfo.h +++ b/src/script/api/qscriptcontextinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -31,8 +31,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -69,9 +67,7 @@ public: qint64 scriptId() const; QString fileName() const; int lineNumber() const; -#ifdef QT_DEPRECATED - QT_DEPRECATED int columnNumber() const; -#endif + int columnNumber() const; QString functionName() const; FunctionType functionType() const; @@ -101,6 +97,4 @@ Q_SCRIPT_EXPORT QDataStream &operator>>(QDataStream &, QScriptContextInfo &); QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/script/api/qscriptengine.h b/src/script/api/qscriptengine.h index 951053f..fcfb4a2 100644 --- a/src/script/api/qscriptengine.h +++ b/src/script/api/qscriptengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -40,8 +40,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -445,6 +443,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptEngine::QObjectWrapOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTENGINE_H diff --git a/src/script/api/qscriptengineagent.h b/src/script/api/qscriptengineagent.h index 14e551f..289ce52 100644 --- a/src/script/api/qscriptengineagent.h +++ b/src/script/api/qscriptengineagent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -30,8 +30,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/script/api/qscriptextensioninterface.h b/src/script/api/qscriptextensioninterface.h index 39fd5e1..ea9af81 100644 --- a/src/script/api/qscriptextensioninterface.h +++ b/src/script/api/qscriptextensioninterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -29,8 +29,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -48,6 +46,4 @@ Q_DECLARE_INTERFACE(QScriptExtensionInterface, QScriptExtensionInterface_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTEXTENSIONINTERFACE_H diff --git a/src/script/api/qscriptextensionplugin.h b/src/script/api/qscriptextensionplugin.h index e59c398..5fad2e4 100644 --- a/src/script/api/qscriptextensionplugin.h +++ b/src/script/api/qscriptextensionplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -28,8 +28,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -52,6 +50,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTEXTENSIONPLUGIN_H diff --git a/src/script/api/qscriptprogram.h b/src/script/api/qscriptprogram.h index 18a303c..0d3d413 100644 --- a/src/script/api/qscriptprogram.h +++ b/src/script/api/qscriptprogram.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -29,8 +29,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -63,6 +61,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTPROGRAM_H diff --git a/src/script/api/qscriptstring.h b/src/script/api/qscriptstring.h index 42a8d2f..f763de2 100644 --- a/src/script/api/qscriptstring.h +++ b/src/script/api/qscriptstring.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -29,8 +29,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -64,6 +62,4 @@ Q_SCRIPT_EXPORT uint qHash(const QScriptString &key); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTSTRING_H diff --git a/src/script/api/qscriptvalue.h b/src/script/api/qscriptvalue.h index 670f928..9ea69c1 100644 --- a/src/script/api/qscriptvalue.h +++ b/src/script/api/qscriptvalue.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -30,8 +30,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -218,6 +216,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QScriptValue::PropertyFlags) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/script/api/qscriptvalueiterator.h b/src/script/api/qscriptvalueiterator.h index 84bf30a..19019b5 100644 --- a/src/script/api/qscriptvalueiterator.h +++ b/src/script/api/qscriptvalueiterator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtScript module of the Qt Toolkit. @@ -28,8 +28,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -73,6 +71,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTVALUEITERATOR_H diff --git a/src/script/api/qtscriptglobal.h b/src/script/api/qtscriptglobal.h index 4bc3b31..1b74cf6 100644 --- a/src/script/api/qtscriptglobal.h +++ b/src/script/api/qtscriptglobal.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -66,6 +64,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:50:18 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:18 -0700 Subject: [Development] Header diff for QtXml In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1f4a33$7ogneo@AZSMGA002.ch.intel.com> diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h index 7eeda6e..f1c04a4 100644 --- a/src/xml/dom/qdom.h +++ b/src/xml/dom/qdom.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -675,6 +673,4 @@ Q_XML_EXPORT QTextStream& operator<<(QTextStream&, const QDomNode&); QT_END_NAMESPACE -QT_END_HEADER - #endif // QDOM_H diff --git a/src/xml/qtxmlglobal.h b/src/xml/qtxmlglobal.h index fb86e57..c7209ad 100644 --- a/src/xml/qtxmlglobal.h +++ b/src/xml/qtxmlglobal.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -60,6 +58,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QTXMLGLOBAL_H diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 8a76a49..743f870 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXml module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -119,8 +117,8 @@ private: class Q_XML_EXPORT QXmlAttributes { public: - QXmlAttributes() {} - virtual ~QXmlAttributes() {} + QXmlAttributes(); + virtual ~QXmlAttributes(); int index(const QString& qName) const; int index(QLatin1String qName) const; @@ -367,8 +365,8 @@ public: class Q_XML_EXPORT QXmlDefaultHandler : public QXmlContentHandler, public QXmlErrorHandler, public QXmlDTDHandler, public QXmlEntityResolver, public QXmlLexicalHandler, public QXmlDeclHandler { public: - QXmlDefaultHandler() { } - virtual ~QXmlDefaultHandler() { } + QXmlDefaultHandler(); + virtual ~QXmlDefaultHandler(); void setDocumentLocator(QXmlLocator* locator); bool startDocument(); @@ -417,6 +415,4 @@ inline int QXmlAttributes::count() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QXML_H From thiago.macieira at intel.com Wed Jun 26 22:50:20 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:20 -0700 Subject: [Development] Header diff for QtXmlPatterns In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h b/src/xmlpatterns/api/qabstractmessagehandler.h index 8fbd8ae..cf62754 100644 --- a/src/xmlpatterns/api/qabstractmessagehandler.h +++ b/src/xmlpatterns/api/qabstractmessagehandler.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -75,6 +73,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qabstracturiresolver.h b/src/xmlpatterns/api/qabstracturiresolver.h index 5014ec7..f12e631 100644 --- a/src/xmlpatterns/api/qabstracturiresolver.h +++ b/src/xmlpatterns/api/qabstracturiresolver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -45,7 +45,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -69,6 +68,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qabstractxmlnodemodel.h b/src/xmlpatterns/api/qabstractxmlnodemodel.h index 08461d7..0bdf9c4 100644 --- a/src/xmlpatterns/api/qabstractxmlnodemodel.h +++ b/src/xmlpatterns/api/qabstractxmlnodemodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,7 +46,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -428,6 +427,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QXmlItem) /* This macro must appear after QT_END_NAMESPACE. */ -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qabstractxmlreceiver.h b/src/xmlpatterns/api/qabstractxmlreceiver.h index a31579c..1f9a500 100644 --- a/src/xmlpatterns/api/qabstractxmlreceiver.h +++ b/src/xmlpatterns/api/qabstractxmlreceiver.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -101,6 +99,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qsimplexmlnodemodel.h b/src/xmlpatterns/api/qsimplexmlnodemodel.h index 8fbeb63..ba20c36 100644 --- a/src/xmlpatterns/api/qsimplexmlnodemodel.h +++ b/src/xmlpatterns/api/qsimplexmlnodemodel.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -71,6 +69,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qsourcelocation.h b/src/xmlpatterns/api/qsourcelocation.h index f6ccca3..9bfbc87 100644 --- a/src/xmlpatterns/api/qsourcelocation.h +++ b/src/xmlpatterns/api/qsourcelocation.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -96,6 +94,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QSourceLocation) /* This macro must appear after QT_END_NAMESPACE. */ -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qtxmlpatternsglobal.h b/src/xmlpatterns/api/qtxmlpatternsglobal.h index 0795d0b..b69ace8 100644 --- a/src/xmlpatterns/api/qtxmlpatternsglobal.h +++ b/src/xmlpatterns/api/qtxmlpatternsglobal.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef Q_XMLPATTERNS_EXPORT @@ -62,6 +60,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qxmlformatter.h b/src/xmlpatterns/api/qxmlformatter.h index 164d7a4..8fa0a90 100644 --- a/src/xmlpatterns/api/qxmlformatter.h +++ b/src/xmlpatterns/api/qxmlformatter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -88,6 +86,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qxmlname.h b/src/xmlpatterns/api/qxmlname.h index eb1f04c..1dbb568 100644 --- a/src/xmlpatterns/api/qxmlname.h +++ b/src/xmlpatterns/api/qxmlname.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -137,6 +135,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QXmlName) /* This macro must appear after QT_END_NAMESPACE. */ -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qxmlnamepool.h b/src/xmlpatterns/api/qxmlnamepool.h index 24e7916..a709e10 100644 --- a/src/xmlpatterns/api/qxmlnamepool.h +++ b/src/xmlpatterns/api/qxmlnamepool.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -90,6 +88,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qxmlquery.h b/src/xmlpatterns/api/qxmlquery.h index f8c904f..ae8add5 100644 --- a/src/xmlpatterns/api/qxmlquery.h +++ b/src/xmlpatterns/api/qxmlquery.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -47,7 +47,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -149,6 +148,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/xmlpatterns/api/qxmlresultitems.h b/src/xmlpatterns/api/qxmlresultitems.h index 64d5335..87543af 100644 --- a/src/xmlpatterns/api/qxmlresultitems.h +++ b/src/xmlpatterns/api/qxmlresultitems.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,7 +46,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -72,6 +71,5 @@ private: }; QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/xmlpatterns/api/qxmlschema.h b/src/xmlpatterns/api/qxmlschema.h index 3f4f28a..dedabfb 100644 --- a/src/xmlpatterns/api/qxmlschema.h +++ b/src/xmlpatterns/api/qxmlschema.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -46,7 +46,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -91,6 +90,4 @@ class Q_XMLPATTERNS_EXPORT QXmlSchema QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qxmlschemavalidator.h b/src/xmlpatterns/api/qxmlschemavalidator.h index 237e14a..a360857 100644 --- a/src/xmlpatterns/api/qxmlschemavalidator.h +++ b/src/xmlpatterns/api/qxmlschemavalidator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -45,7 +45,6 @@ #include #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -91,6 +90,4 @@ class Q_XMLPATTERNS_EXPORT QXmlSchemaValidator QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/xmlpatterns/api/qxmlserializer.h b/src/xmlpatterns/api/qxmlserializer.h index 74c4eb8..6e93f26 100644 --- a/src/xmlpatterns/api/qxmlserializer.h +++ b/src/xmlpatterns/api/qxmlserializer.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtXmlPatterns module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -152,6 +150,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:50:17 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:17 -0700 Subject: [Development] Header diff for QtWidgets In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index 45ae7c2..80a31c4 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -133,6 +131,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QColorDialog::ColorDialogOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOLORDIALOG_H diff --git a/src/widgets/dialogs/qdialog.h b/src/widgets/dialogs/qdialog.h index 430db7f..efbc475 100644 --- a/src/widgets/dialogs/qdialog.h +++ b/src/widgets/dialogs/qdialog.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,6 +123,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDIALOG_H diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 1de0ecc..6be063b 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QERRORMESSAGE_H diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index a9393ef..98d1fd5 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -242,6 +240,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_updateOkButton()) Q_PRIVATE_SLOT(d_func(), void _q_currentChanged(const QModelIndex &index)) Q_PRIVATE_SLOT(d_func(), void _q_enterDirectory(const QModelIndex &index)) + Q_PRIVATE_SLOT(d_func(), void _q_nativeEnterDirectory(const QString&)) Q_PRIVATE_SLOT(d_func(), void _q_goToDirectory(const QString &path)) Q_PRIVATE_SLOT(d_func(), void _q_useNameFilter(int index)) Q_PRIVATE_SLOT(d_func(), void _q_selectionChanged()) @@ -264,6 +263,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFileDialog::Options) QT_END_NAMESPACE -QT_END_HEADER - #endif // QFILEDIALOG_H diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index dfc5afa..0b52b65 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -173,7 +171,5 @@ inline QFileInfo QFileSystemModel::fileInfo(const QModelIndex &aindex) const QT_END_NAMESPACE -QT_END_HEADER - #endif // QFILESYSTEMMODEL_H diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index 0692a77..c2d930b 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,6 +124,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFontDialog::FontDialogOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QFONTDIALOG_H diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index c6d2e43..41dca1f 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -215,6 +213,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QInputDialog::InputDialogOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QINPUTDIALOG_H diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 927da83..32b7027 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -69,6 +67,7 @@ class Q_WIDGETS_EXPORT QMessageBox : public QDialog Q_PROPERTY(QString detailedText READ detailedText WRITE setDetailedText) #endif Q_PROPERTY(QString informativeText READ informativeText WRITE setInformativeText) + Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) public: enum Icon { @@ -186,6 +185,9 @@ public: Qt::TextFormat textFormat() const; void setTextFormat(Qt::TextFormat format); + void setTextInteractionFlags(Qt::TextInteractionFlags flags); + Qt::TextInteractionFlags textInteractionFlags() const; + static StandardButton information(QWidget *parent, const QString &title, const QString &text, StandardButtons buttons = Ok, StandardButton defaultButton = NoButton); @@ -288,7 +290,7 @@ public: Q_SIGNALS: void buttonClicked(QAbstractButton *button); -#ifdef qdoc +#ifdef Q_QDOC public Q_SLOTS: int exec(); #endif @@ -329,6 +331,4 @@ str)).arg(QString::fromLatin1(qVersion())); QMessageBox::critical(0, QApplicatio QT_END_NAMESPACE -QT_END_HEADER - #endif // QMESSAGEBOX_H diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index f70c02e..20b658e 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPROGRESSDIALOG_H diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 9101162..9dea9a8 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -261,8 +259,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_WIZARD #endif // QWIZARD_H diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index aa03ac4..8acb832 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,8 +49,6 @@ #include #ifndef QT_NO_GRAPHICSEFFECT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -281,7 +279,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER #endif //QT_NO_GRAPHICSEFFECT #endif // QGRAPHICSEFFECT_H diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 2b1da24..c924a03 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,6 +120,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index 25dccf1..6d0ef5e 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -137,7 +135,5 @@ inline void QGraphicsGridLayout::addItem(QGraphicsLayoutItem *aitem, int arow, i QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 0cb936b..4283deb 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -52,8 +52,6 @@ class tst_QGraphicsItem; -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -1059,6 +1057,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QGRAPHICSITEM_H diff --git a/src/widgets/graphicsview/qgraphicsitemanimation.h b/src/widgets/graphicsview/qgraphicsitemanimation.h index 7a352c8..1e8f27e 100644 --- a/src/widgets/graphicsview/qgraphicsitemanimation.h +++ b/src/widgets/graphicsview/qgraphicsitemanimation.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #if !defined(QT_NO_GRAPHICSVIEW) -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,7 +111,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_GRAPHICSVIEW #endif diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index 168e723..719ac0d 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -93,7 +91,5 @@ Q_DECLARE_INTERFACE(QGraphicsLayout, "org.qt-project.Qt.QGraphicsLayout") QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicslayoutitem.h b/src/widgets/graphicsview/qgraphicslayoutitem.h index 5f13690..e1dfadcc 100644 --- a/src/widgets/graphicsview/qgraphicslayoutitem.h +++ b/src/widgets/graphicsview/qgraphicslayoutitem.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -148,6 +146,4 @@ inline qreal QGraphicsLayoutItem::maximumHeight() const QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index c5c781d..04e2751 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -112,7 +110,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index 21339ec..8180cb9 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,7 +138,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index 27337d3..cde0eda 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -51,8 +51,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -292,6 +290,7 @@ Q_SIGNALS: void changed(const QList ®ion); void sceneRectChanged(const QRectF &rect); void selectionChanged(); + void focusItemChanged(QGraphicsItem *newFocus, QGraphicsItem *oldFocus, Qt::FocusReason reason); private: Q_DECLARE_PRIVATE(QGraphicsScene) @@ -324,6 +323,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGraphicsScene::SceneLayers) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicssceneevent.h b/src/widgets/graphicsview/qgraphicssceneevent.h index 367dc7e..e744d08 100644 --- a/src/widgets/graphicsview/qgraphicssceneevent.h +++ b/src/widgets/graphicsview/qgraphicssceneevent.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -320,6 +318,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index 9b5dfab..6f27420 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,8 +48,6 @@ #include #ifndef QT_NO_GRAPHICSVIEW -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -152,7 +150,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER #endif //QT_NO_GRAPHICSVIEW #endif // QFXTRANSFORM_H diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index 838c1ee..670c325 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -148,6 +146,7 @@ public: #ifndef QT_NO_RUBBERBAND Qt::ItemSelectionMode rubberBandSelectionMode() const; void setRubberBandSelectionMode(Qt::ItemSelectionMode mode); + QRect rubberBandRect() const; #endif CacheMode cacheMode() const; @@ -228,6 +227,11 @@ public Q_SLOTS: void invalidateScene(const QRectF &rect = QRectF(), QGraphicsScene::SceneLayers layers = QGraphicsScene::AllLayers); void updateSceneRect(const QRectF &rect); +#ifndef QT_NO_RUBBERBAND +Q_SIGNALS: + void rubberBandChanged(QRect viewportRect, QPointF fromScenePoint, QPointF toScenePoint); +#endif + protected Q_SLOTS: void setupViewport(QWidget *widget); @@ -310,6 +314,4 @@ inline QPolygon QGraphicsView::mapFromScene(qreal ax, qreal ay, qreal w, qreal h QT_END_NAMESPACE -QT_END_HEADER - #endif // QGRAPHICSVIEW_H diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index aa19c03..8881fec 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -245,7 +243,5 @@ inline void QGraphicsWidget::setGeometry(qreal ax, qreal ay, qreal aw, qreal ah) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index b2d0ccc..13e4f06 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -131,6 +129,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTITEMDELEGATE_H diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index fdd59f3..9642851 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -376,6 +374,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractItemView::EditTriggers) QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTITEMVIEW_H diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 0cf4447..a13433b 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -116,7 +114,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOLUMNVIEW_H diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index 364885c..b874219 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #ifndef QT_NO_DATAWIDGETMAPPER -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -120,8 +118,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_DATAWIDGETMAPPER #endif diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 6223bc6..c021439 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -154,6 +152,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDIRMODEL_H diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h index cffcde6..cac135f 100644 --- a/src/widgets/itemviews/qfileiconprovider.h +++ b/src/widgets/itemviews/qfileiconprovider.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -75,7 +73,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QFILEICONPROVIDER_H diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index 847758a..8fcd8d7 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -263,6 +261,4 @@ inline void QHeaderView::showSection(int alogicalIndex) QT_END_NAMESPACE -QT_END_HEADER - #endif // QHEADERVIEW_H diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index b6a086b..2866a4b 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -135,6 +133,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QITEMDELEGATE_H diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h index 3e28fb9..9affe14 100644 --- a/src/widgets/itemviews/qitemeditorfactory.h +++ b/src/widgets/itemviews/qitemeditorfactory.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -118,6 +116,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QITEMEDITORFACTORY_H diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index ba5e556..e4ae2d0 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -193,6 +191,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QLISTVIEW_H diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 6f69f93..a7f993d 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -329,6 +327,4 @@ inline bool QListWidgetItem::isHidden() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QLISTWIDGET_H diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index 37992bf..aeb25a5 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -110,6 +108,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTYLEDITEMDELEGATE_H diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 0d8b264..824348d 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -192,6 +190,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTABLEVIEW_H diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index ce0295a..fba7612 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include //#include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -371,6 +369,4 @@ inline bool QTableWidgetItem::isSelected() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QTABLEWIDGET_H diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 205d4f2..73f11f1 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -235,6 +233,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTREEVIEW_H diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 611291f..7aa927a 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -423,6 +421,4 @@ inline bool QTreeWidgetItem::isDisabled() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QTREEWIDGET_H diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.h b/src/widgets/itemviews/qtreewidgetitemiterator.h index baebe38..01efbc8 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator.h +++ b/src/widgets/itemviews/qtreewidgetitemiterator.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -153,6 +151,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QTreeWidgetItemIterator::IteratorFlags) QT_END_NAMESPACE #endif // QT_NO_TREEWIDGET -QT_END_HEADER - #endif // QTREEWIDGETITEMITERATOR_H diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index 6a3c0be..f2346ac 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -221,6 +219,4 @@ QT_END_INCLUDE_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QACTION_H diff --git a/src/widgets/kernel/qactiongroup.h b/src/widgets/kernel/qactiongroup.h index b8f0658..eab1d8b 100644 --- a/src/widgets/kernel/qactiongroup.h +++ b/src/widgets/kernel/qactiongroup.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,6 +97,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QACTIONGROUP_H diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 8a7cb24..83673ee 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -50,10 +50,11 @@ #ifdef QT_INCLUDE_COMPAT # include #endif +#ifdef Q_NO_USING_KEYWORD +#include +#endif #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -244,6 +245,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QAPPLICATION_H diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index bb1234e..4c7b27a 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -141,6 +139,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QBOXLAYOUT_H diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 71dd08d..da44242 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -104,6 +102,4 @@ inline int QDesktopWidget::screenCount() const QT_END_NAMESPACE -QT_END_HEADER - #endif // QDESKTOPWIDGET_H diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index 7bf239c..a1356c7 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -54,7 +52,7 @@ class QFormLayoutPrivate; class Q_WIDGETS_EXPORT QFormLayout : public QLayout { Q_OBJECT - Q_ENUMS(FormStyle FieldGrowthPolicy RowWrapPolicy ItemRole) + Q_ENUMS(FieldGrowthPolicy RowWrapPolicy ItemRole) Q_DECLARE_PRIVATE(QFormLayout) Q_PROPERTY(FieldGrowthPolicy fieldGrowthPolicy READ fieldGrowthPolicy WRITE setFieldGrowthPolicy RESET resetFieldGrowthPolicy) Q_PROPERTY(RowWrapPolicy rowWrapPolicy READ rowWrapPolicy WRITE setRowWrapPolicy RESET resetRowWrapPolicy) @@ -157,6 +155,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/kernel/qgesture.h b/src/widgets/kernel/qgesture.h index 0f09f20..056fc35 100644 --- a/src/widgets/kernel/qgesture.h +++ b/src/widgets/kernel/qgesture.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -52,8 +52,6 @@ #ifndef QT_NO_GESTURES -QT_BEGIN_HEADER - Q_DECLARE_METATYPE(Qt::GestureState) Q_DECLARE_METATYPE(Qt::GestureType) @@ -328,8 +326,6 @@ private: QT_END_NAMESPACE Q_DECLARE_METATYPE(QGesture::GestureCancelPolicy) -QT_END_HEADER - #endif // QT_NO_GESTURES #endif // QGESTURE_H diff --git a/src/widgets/kernel/qgesturerecognizer.h b/src/widgets/kernel/qgesturerecognizer.h index e2cd3ef..a1ce86b 100644 --- a/src/widgets/kernel/qgesturerecognizer.h +++ b/src/widgets/kernel/qgesturerecognizer.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #ifndef QT_NO_GESTURES -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -94,8 +92,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QGestureRecognizer::Result) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_GESTURES #endif // QGESTURERECOGNIZER_H diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 48e9e1e..6a788d9 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -49,8 +49,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -132,6 +130,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGRIDLAYOUT_H diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 1e9dd01..6f43c2b 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -50,8 +50,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -150,6 +148,7 @@ protected: void childEvent(QChildEvent *e); void addChildLayout(QLayout *l); void addChildWidget(QWidget *w); + bool adoptLayout(QLayout *layout); QRect alignmentRect(const QRect&) const; protected: @@ -171,6 +170,4 @@ QT_END_NAMESPACE #include #include -QT_END_HEADER - #endif // QLAYOUT_H diff --git a/src/widgets/kernel/qlayoutitem.h b/src/widgets/kernel/qlayoutitem.h index 093e7fe..4af57f14 100644 --- a/src/widgets/kernel/qlayoutitem.h +++ b/src/widgets/kernel/qlayoutitem.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,12 +47,10 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE -static const int QLAYOUTSIZE_MAX = INT_MAX/256/16; +static const Q_DECL_UNUSED int QLAYOUTSIZE_MAX = INT_MAX/256/16; class QLayout; class QLayoutItem; @@ -180,6 +178,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QLAYOUTITEM_H diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index d3e06f6..372cd9f 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -101,6 +99,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSHORTCUT_H diff --git a/src/widgets/kernel/qsizepolicy.h b/src/widgets/kernel/qsizepolicy.h index d359507..2fe85cb 100644 --- a/src/widgets/kernel/qsizepolicy.h +++ b/src/widgets/kernel/qsizepolicy.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -183,6 +181,4 @@ inline void QSizePolicy::transpose() { QT_END_NAMESPACE -QT_END_HEADER - #endif // QSIZEPOLICY_H diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 680ed55..87715d1 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -111,6 +109,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTACKEDLAYOUT_H diff --git a/src/widgets/kernel/qtooltip.h b/src/widgets/kernel/qtooltip.h index 860a2cc..25b138b 100644 --- a/src/widgets/kernel/qtooltip.h +++ b/src/widgets/kernel/qtooltip.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOOLTIP_H diff --git a/src/widgets/kernel/qwhatsthis.h b/src/widgets/kernel/qwhatsthis.h index e901b47..37887b8 100644 --- a/src/widgets/kernel/qwhatsthis.h +++ b/src/widgets/kernel/qwhatsthis.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -74,6 +72,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QWHATSTHIS_H diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index e61cf0d..f90f2ee 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -60,8 +60,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -593,6 +591,8 @@ public: QWindow *windowHandle() const; + static QWidget *createWindowContainer(QWindow *window, QWidget *parent=0, Qt::WindowFlags flags=0); + friend class QDesktopScreenWidget; Q_SIGNALS: @@ -704,6 +704,8 @@ private: friend class QStyleSheetStyle; friend struct QWidgetExceptionCleaner; friend class QWidgetWindow; + friend class QAccessibleWidget; + friend class QAccessibleTable; #ifndef QT_NO_GESTURES friend class QGestureManager; friend class QWinNativePanGestureRecognizer; @@ -855,6 +857,4 @@ inline bool QWidget::testAttribute(Qt::WidgetAttribute attribute) const QT_END_NAMESPACE -QT_END_HEADER - #endif // QWIDGET_H diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index dfaf173..7fc24ba 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,13 +59,13 @@ class Q_WIDGETS_EXPORT QWidgetAction : public QAction public: explicit QWidgetAction(QObject *parent); virtual ~QWidgetAction(); - + void setDefaultWidget(QWidget *w); QWidget *defaultWidget() const; QWidget *requestWidget(QWidget *parent); void releaseWidget(QWidget *widget); - + protected: virtual bool event(QEvent *); virtual bool eventFilter(QObject *, QEvent *); @@ -85,6 +83,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QWIDGETACTION_H diff --git a/src/widgets/kernel/qwidgetsfunctions_wince.h b/src/widgets/kernel/qwidgetsfunctions_wince.h index 39d29b8..ca742e2 100644 --- a/src/widgets/kernel/qwidgetsfunctions_wince.h +++ b/src/widgets/kernel/qwidgetsfunctions_wince.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtWidgets module of the Qt Toolkit. @@ -40,14 +40,15 @@ ****************************************************************************/ #ifndef QWIDGETSFUNCTIONS_WCE_H #define QWIDGETSFUNCTIONS_WCE_H + +#include + #ifdef Q_OS_WINCE #include #ifdef QT_BUILD_GUI_LIB -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER #endif @@ -58,4 +59,4 @@ HINSTANCE qt_wince_ShellExecute(HWND hwnd, LPCWSTR operation, LPCWSTR file, LPCW #endif #endif // Q_OS_WINCE -#endif // QWIDGETSFUNCTIONS_WCE_H \ No newline at end of file +#endif // QWIDGETSFUNCTIONS_WCE_H diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index 9290820..dc31016 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -82,6 +80,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 0e4658b..a3606e8 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,6 +84,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index 8782137..942721a 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QCommonStylePrivate; @@ -53,7 +51,7 @@ class QCommonStylePrivate; class Q_WIDGETS_EXPORT QCommonStyle: public QStyle { Q_OBJECT - + public: QCommonStyle(); ~QCommonStyle(); @@ -105,6 +103,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOMMONSTYLE_H diff --git a/src/widgets/styles/qdrawutil.h b/src/widgets/styles/qdrawutil.h index 3a62764..6e9dc26 100644 --- a/src/widgets/styles/qdrawutil.h +++ b/src/widgets/styles/qdrawutil.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include // char*->QString conversion #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -169,6 +167,4 @@ inline void qDrawBorderPixmap(QPainter *painter, QT_END_NAMESPACE -QT_END_HEADER - #endif // QDRAWUTIL_H diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index c18c450..5864c19 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -57,7 +55,8 @@ class Q_WIDGETS_EXPORT QProxyStyle : public QCommonStyle Q_OBJECT public: - QProxyStyle(QStyle *baseStyle = 0); + QProxyStyle(QStyle *style = 0); + QProxyStyle(const QString &key); ~QProxyStyle(); QStyle *baseStyle() const; @@ -107,6 +106,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPROXYSTYLE_H diff --git a/src/widgets/styles/qstyle.h b/src/widgets/styles/qstyle.h index 387645a..beafad3 100644 --- a/src/widgets/styles/qstyle.h +++ b/src/widgets/styles/qstyle.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -699,6 +697,7 @@ public: SH_ToolButtonStyle, SH_RequestSoftwareInputPanel, SH_ScrollBar_Transient, + SH_Menu_SupportsSections, // Add new style hint values here SH_CustomBase = 0xf0000000 @@ -831,6 +830,4 @@ Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, QStyle::State state); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTYLE_H diff --git a/src/widgets/styles/qstylefactory.h b/src/widgets/styles/qstylefactory.h index f4105aa..539f474 100644 --- a/src/widgets/styles/qstylefactory.h +++ b/src/widgets/styles/qstylefactory.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -60,6 +58,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTYLEFACTORY_H diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h index b4641f3..4f817a3 100644 --- a/src/widgets/styles/qstyleoption.h +++ b/src/widgets/styles/qstyleoption.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -56,8 +56,6 @@ # include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -751,6 +749,4 @@ Q_WIDGETS_EXPORT QDebug operator<<(QDebug debug, const QStyleOption &option); QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTYLEOPTION_H diff --git a/src/widgets/styles/qstylepainter.h b/src/widgets/styles/qstylepainter.h index 6d0dc37..2031921 100644 --- a/src/widgets/styles/qstylepainter.h +++ b/src/widgets/styles/qstylepainter.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ void QStylePainter::drawItemPixmap(const QRect &r, int flags, const QPixmap &pix QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTYLEPAINTER_H diff --git a/src/widgets/styles/qstyleplugin.h b/src/widgets/styles/qstyleplugin.h index 16da229..041bdbf 100644 --- a/src/widgets/styles/qstyleplugin.h +++ b/src/widgets/styles/qstyleplugin.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -66,6 +64,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTYLEPLUGIN_H diff --git a/src/widgets/util/qcolormap.h b/src/widgets/util/qcolormap.h index ee067cc..963be7e 100644 --- a/src/widgets/util/qcolormap.h +++ b/src/widgets/util/qcolormap.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -80,10 +78,6 @@ public: const QVector colormap() const; -#ifdef Q_WS_WIN - static HPALETTE hPal(); -#endif - private: QColormap(); QColormapPrivate *d; @@ -91,6 +85,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOLORMAP_H diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index d8a8d9e..737d9f5 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -165,6 +163,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOMPLETER_H diff --git a/src/widgets/util/qscroller.h b/src/widgets/util/qscroller.h index ebf732f..1b382f3 100644 --- a/src/widgets/util/qscroller.h +++ b/src/widgets/util/qscroller.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -149,6 +147,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCROLLER_H diff --git a/src/widgets/util/qscrollerproperties.h b/src/widgets/util/qscrollerproperties.h index f1d7244..eb34c97 100644 --- a/src/widgets/util/qscrollerproperties.h +++ b/src/widgets/util/qscrollerproperties.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -134,6 +132,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QScrollerProperties::OvershootPolicy) Q_DECLARE_METATYPE(QScrollerProperties::FrameRates) -QT_END_HEADER - #endif // QSCROLLERPROPERTIES_H diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index bf1a47f..278efae 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -48,8 +48,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,7 +124,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SYSTEMTRAYICON #endif // QSYSTEMTRAYICON_H diff --git a/src/widgets/util/qundogroup.h b/src/widgets/util/qundogroup.h index f71b932..9a961d7 100644 --- a/src/widgets/util/qundogroup.h +++ b/src/widgets/util/qundogroup.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUndoGroupPrivate; @@ -104,6 +102,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QUNDOGROUP_H diff --git a/src/widgets/util/qundostack.h b/src/widgets/util/qundostack.h index 114a7e4..4756ca3 100644 --- a/src/widgets/util/qundostack.h +++ b/src/widgets/util/qundostack.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -153,6 +151,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QUNDOSTACK_H diff --git a/src/widgets/util/qundoview.h b/src/widgets/util/qundoview.h index 7c590ff..80a0548 100644 --- a/src/widgets/util/qundoview.h +++ b/src/widgets/util/qundoview.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #ifndef QT_NO_UNDOVIEW -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUndoViewPrivate; @@ -95,7 +93,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_UNDOVIEW #endif // QUNDOVIEW_H diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index 3c1642a..4732f46 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -155,6 +153,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTBUTTON_H diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index 5ac1402..ccf16b5 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,6 +138,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTSCROLLAREA_H diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index b058bcc..82c8f40 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -163,6 +161,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTSLIDER_H diff --git a/src/widgets/widgets/qabstractspinbox.h b/src/widgets/widgets/qabstractspinbox.h index 01d36eb..4f6aad0 100644 --- a/src/widgets/widgets/qabstractspinbox.h +++ b/src/widgets/widgets/qabstractspinbox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -175,6 +173,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractSpinBox::StepEnabled) QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTSPINBOX_H diff --git a/src/widgets/widgets/qbuttongroup.h b/src/widgets/widgets/qbuttongroup.h index 0161896..84fe26e 100644 --- a/src/widgets/widgets/qbuttongroup.h +++ b/src/widgets/widgets/qbuttongroup.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QBUTTONGROUP_H diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index 3af8b0a..4a4d21e 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -191,7 +189,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCALENDARWIDGET_H diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index 468c871..9adf5f6 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -92,6 +90,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCHECKBOX_H diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index bce6c98..d167ac7 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_COMBOBOX @@ -280,6 +278,4 @@ inline void QComboBox::insertItem(int aindex, const QString &atext, QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOMBOBOX_H diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index ec8fd33..e18fb0a 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -81,6 +79,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOMMANDLINKBUTTON diff --git a/src/widgets/widgets/qdatetimeedit.h b/src/widgets/widgets/qdatetimeedit.h index 7435013..0b6dfb6 100644 --- a/src/widgets/widgets/qdatetimeedit.h +++ b/src/widgets/widgets/qdatetimeedit.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -235,6 +233,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDateTimeEdit::Sections) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDATETIMEEDIT_H diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index f10134d..16c4001 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -105,6 +103,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDIAL_H diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index 3abf5e0..6715c59 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -162,6 +160,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDialogButtonBox::StandardButtons) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDIALOGBUTTONBOX_H diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index 2b4e822..ecf8c67 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,6 +138,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QDockWidget::DockWidgetFeatures) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDYNAMICDOCKWIDGET_H diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index 0ff2db3..e1b0004 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,6 +74,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QFOCUSFRAME_H diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 566d922..8b3170e 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #ifndef QT_NO_FONTCOMBOBOX -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,7 +59,6 @@ class Q_WIDGETS_EXPORT QFontComboBox : public QComboBox Q_PROPERTY(QFontDatabase::WritingSystem writingSystem READ writingSystem WRITE setWritingSystem) Q_PROPERTY(FontFilters fontFilters READ fontFilters WRITE setFontFilters) Q_PROPERTY(QFont currentFont READ currentFont WRITE setCurrentFont NOTIFY currentFontChanged) - Q_ENUMS(FontSelection) public: explicit QFontComboBox(QWidget *parent = 0); @@ -105,7 +102,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QFontComboBox::FontFilters) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_FONTCOMBOBOX #endif diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index 2511d74..f121c0d 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,6 +123,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QFRAME_H diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index 2013800..6c18cf8 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,7 @@ protected: void changeEvent(QEvent *event); void mousePressEvent(QMouseEvent *event); void mouseMoveEvent(QMouseEvent *event); - void mouseReleaseEvent(QMouseEvent *event); + void mouseReleaseEvent(QMouseEvent *event); void initStyleOption(QStyleOptionGroupBox *option) const; @@ -111,6 +109,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGROUPBOX_H diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index ca89b27..8edb099 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -164,6 +162,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QLABEL_H diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index e9487a2..3dde152 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -122,6 +120,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QLCDNUMBER_H diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index f18fd4a..e2b9443 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -248,6 +246,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QLINEEDIT_H diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h index b46d279..b89b796 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.h +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -67,6 +65,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCOCOAVIEWCONTAINER_H diff --git a/src/widgets/widgets/qmacnativewidget_mac.h b/src/widgets/widgets/qmacnativewidget_mac.h index 4e05f5c..796d7b3 100644 --- a/src/widgets/widgets/qmacnativewidget_mac.h +++ b/src/widgets/widgets/qmacnativewidget_mac.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -68,6 +66,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMACNATIVEWIDGET_H diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index 457c682..d9edf71 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -210,6 +208,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMainWindow::DockOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QDYNAMICMAINWINDOW_H diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index 9755b0b..87ecd43 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -172,7 +170,5 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMdiArea::AreaOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_MDIAREA #endif // QMDIAREA_H diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index de03fed..915fef7 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -151,8 +149,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMdiSubWindow::SubWindowOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_MDIAREA #endif // QMDISUBWINDOW_H diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index f06bdd0..518771d 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -51,8 +51,6 @@ #include // for HMENU #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,7 @@ private: Q_PROPERTY(QString title READ title WRITE setTitle) Q_PROPERTY(QIcon icon READ icon WRITE setIcon) Q_PROPERTY(bool separatorsCollapsible READ separatorsCollapsible WRITE setSeparatorsCollapsible) + Q_PROPERTY(bool toolTipsVisible READ toolTipsVisible WRITE setToolTipsVisible) public: explicit QMenu(QWidget *parent = 0); @@ -94,8 +93,13 @@ public: QAction *addSeparator(); + QAction *addSection(const QString &text); + QAction *addSection(const QIcon &icon, const QString &text); + QAction *insertMenu(QAction *before, QMenu *menu); QAction *insertSeparator(QAction *before); + QAction *insertSection(QAction *before, const QString &text); + QAction *insertSection(QAction *before, const QIcon &icon, const QString &text); bool isEmpty() const; void clear(); @@ -141,6 +145,9 @@ public: bool separatorsCollapsible() const; void setSeparatorsCollapsible(bool collapse); + bool toolTipsVisible() const; + void setToolTipsVisible(bool visible); + Q_SIGNALS: void aboutToShow(); void aboutToHide(); @@ -201,6 +208,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMENU_H diff --git a/src/widgets/widgets/qmenubar.h b/src/widgets/widgets/qmenubar.h index 6de5bdd..e88a0c0 100644 --- a/src/widgets/widgets/qmenubar.h +++ b/src/widgets/widgets/qmenubar.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -159,6 +157,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QMENUBAR_H diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index 377996c..8154881 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -53,8 +53,6 @@ #ifndef QT_NO_TEXTEDIT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -204,6 +202,9 @@ public Q_SLOTS: void centerCursor(); + void zoomIn(int range = 1); + void zoomOut(int range = 1); + Q_SIGNALS: void textChanged(); void undoAvailable(bool b); @@ -319,8 +320,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_TEXTEDIT diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index a830df7..2f66aaa 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -67,7 +65,7 @@ class Q_WIDGETS_EXPORT QProgressBar : public QWidget Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) Q_PROPERTY(bool invertedAppearance READ invertedAppearance WRITE setInvertedAppearance) Q_PROPERTY(Direction textDirection READ textDirection WRITE setTextDirection) - Q_PROPERTY(QString format READ format WRITE setFormat) + Q_PROPERTY(QString format READ format WRITE setFormat RESET resetFormat) public: enum Direction { TopToBottom, BottomToTop }; @@ -98,6 +96,7 @@ public: QProgressBar::Direction textDirection() const; void setFormat(const QString &format); + void resetFormat(); QString format() const; public Q_SLOTS: @@ -125,6 +124,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPROGRESSBAR_H diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index 411b538..7806e96 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -105,13 +103,11 @@ public: private: Q_DISABLE_COPY(QPushButton) Q_DECLARE_PRIVATE(QPushButton) -#ifndef QT_NO_MENU +#ifndef QT_NO_MENU Q_PRIVATE_SLOT(d_func(), void _q_popupPressed()) #endif }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QPUSHBUTTON_H diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index dec49dd..104d4a1 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QRADIOBUTTON_H diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index 407c403..b603415 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ inline void QRubberBand::move(int ax, int ay) QT_END_NAMESPACE -QT_END_HEADER - #endif // QRUBBERBAND_H diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index 588252b9..576c9bc 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -95,6 +93,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCROLLAREA_H diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index 3e9ac8a..27d0169 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -94,6 +92,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCROLLBAR_H diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index cbfc41d..11dadfa 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -83,6 +81,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSIZEGRIP_H diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index 16c1290..a8d7019 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSLIDER_H diff --git a/src/widgets/widgets/qspinbox.h b/src/widgets/widgets/qspinbox.h index 889b283..4963f87 100644 --- a/src/widgets/widgets/qspinbox.h +++ b/src/widgets/widgets/qspinbox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -172,6 +170,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSPINBOX_H diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 58cd00b..a1af8e4 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -88,6 +86,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSPLASHSCREEN_H diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index 2bcdc54..ed4102d 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -170,6 +168,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSPLITTER_H diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 9af6c6b..a147577 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -94,6 +92,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTACKEDWIDGET_H diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 5490ade..4a5b1ee 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -101,6 +99,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSTATUSBAR_H diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index f3409ed..72c19ab 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -212,6 +210,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTABBAR_H diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index 59a0e5d..1a1eb2e 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -181,6 +179,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTABWIDGET_H diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index 72f275f..244d8a3 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -129,6 +127,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTEXTBROWSER_H diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index 178aa7b..e147184 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -51,8 +51,6 @@ #ifndef QT_NO_TEXTEDIT -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,7 +84,7 @@ class Q_WIDGETS_EXPORT QTextEdit : public QAbstractScrollArea Q_PROPERTY(bool acceptRichText READ acceptRichText WRITE setAcceptRichText) Q_PROPERTY(int cursorWidth READ cursorWidth WRITE setCursorWidth) Q_PROPERTY(Qt::TextInteractionFlags textInteractionFlags READ textInteractionFlags WRITE setTextInteractionFlags) - Q_PROPERTY(QTextDocument *document READ document WRITE setDocument) + Q_PROPERTY(QTextDocument *document READ document WRITE setDocument DESIGNABLE false) public: enum LineWrapMode { NoWrap, @@ -304,6 +302,7 @@ private: Q_PRIVATE_SLOT(d_func(), void _q_currentCharFormatChanged(const QTextCharFormat &)) Q_PRIVATE_SLOT(d_func(), void _q_adjustScrollbars()) Q_PRIVATE_SLOT(d_func(), void _q_ensureVisible(const QRectF &)) + Q_PRIVATE_SLOT(d_func(), void _q_cursorPositionChanged()) friend class QTextEditControl; friend class QTextDocument; friend class QWidgetTextControl; @@ -313,8 +312,6 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QTextEdit::AutoFormatting) QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_TEXTEDIT #endif // QTEXTEDIT_H diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index ade4233..6634974 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -172,6 +170,4 @@ inline QAction *QToolBar::actionAt(int ax, int ay) const QT_END_NAMESPACE -QT_END_HEADER - #endif // QDYNAMICTOOLBAR_H diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index e0deaaa..3a15ca1 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -126,6 +124,4 @@ inline int QToolBox::insertItem(int index, QWidget *item, const QString &text) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOOLBOX_H diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index 1480826..3310476 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -1,9 +1,9 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** -** This file is part of the QtGui module of the Qt Toolkit. +** This file is part of the QtWidgets module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** Commercial License Usage @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOOLBUTTON_H From thiago.macieira at intel.com Wed Jun 26 22:50:06 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:06 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <84c8a8$a0ea4b@orsmga001.jf.intel.com> diff --git a/src/qml/debugger/qqmldebug.h b/src/qml/debugger/qqmldebug.h index 577a2a0..d2b0220 100644 --- a/src/qml/debugger/qqmldebug.h +++ b/src/qml/debugger/qqmldebug.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -63,6 +61,4 @@ static QQmlDebuggingEnabler qmlEnableDebuggingHelper(true); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLDEBUG_H diff --git a/src/qml/qml/qqml.h b/src/qml/qml/qqml.h index 4cde750..fb0133f 100644 --- a/src/qml/qml/qqml.h +++ b/src/qml/qml/qqml.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -49,8 +49,7 @@ #include #include - -QT_BEGIN_HEADER +#include #define QML_VERSION 0x020000 #define QML_VERSION_STR "2.0" @@ -103,6 +102,8 @@ class QQmlPropertyValueInterceptor; listName[listLen+nameLen] = '>'; \ listName[listLen+nameLen+1] = '\0'; +void Q_QML_EXPORT qmlClearTypeRegistrations(); + template int qmlRegisterType() { @@ -418,11 +419,17 @@ class QQmlContext; class QQmlEngine; class QJSValue; class QJSEngine; -Q_QML_EXPORT void qmlExecuteDeferred(QObject *); -Q_QML_EXPORT QQmlContext *qmlContext(const QObject *); -Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *); -Q_QML_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); -Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, const QMetaObject *, bool create); + +namespace QtQml { + // declared in namespace to avoid symbol conflicts with QtDeclarative + Q_QML_EXPORT void qmlExecuteDeferred(QObject *); + Q_QML_EXPORT QQmlContext *qmlContext(const QObject *); + Q_QML_EXPORT QQmlEngine *qmlEngine(const QObject *); + Q_QML_EXPORT QObject *qmlAttachedPropertiesObjectById(int, const QObject *, bool create = true); + Q_QML_EXPORT QObject *qmlAttachedPropertiesObject(int *, const QObject *, + const QMetaObject *, bool create); +} +using namespace QtQml; template QObject *qmlAttachedPropertiesObject(const QObject *obj, bool create = true) @@ -465,11 +472,29 @@ inline int qmlRegisterSingletonType(const char *uri, int versionMajor, int versi return QQmlPrivate::qmlregister(QQmlPrivate::SingletonRegistration, &api); } + +inline int qmlRegisterType(const QUrl &url, const char *uri, int versionMajor, int versionMinor, const char *qmlName) +{ + if (url.isRelative()) { + // User input check must go here, because QQmlPrivate::qmlregister is also used internally for composite types + qWarning() << "qmlRegisterType requires absolute URLs."; + return 0; + } + + QQmlPrivate::RegisterCompositeType type = { + url, + uri, + versionMajor, + versionMinor, + qmlName + }; + + return QQmlPrivate::qmlregister(QQmlPrivate::CompositeRegistration, &type); +} + QT_END_NAMESPACE QML_DECLARE_TYPE(QObject) Q_DECLARE_METATYPE(QVariant) -QT_END_HEADER - #endif // QQML_H diff --git a/src/qml/qml/qqmlcomponent.h b/src/qml/qml/qqmlcomponent.h index 12140af..aefad47 100644 --- a/src/qml/qml/qqmlcomponent.h +++ b/src/qml/qml/qqmlcomponent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -139,6 +137,4 @@ Q_DECLARE_METATYPE(QQmlComponent::Status) QML_DECLARE_TYPE(QQmlComponent) QML_DECLARE_TYPEINFO(QQmlComponent, QML_HAS_ATTACHED_PROPERTIES) -QT_END_HEADER - #endif // QQMLCOMPONENT_H diff --git a/src/qml/qml/qqmlcontext.h b/src/qml/qml/qqmlcontext.h index 4e46e0f..e191807 100644 --- a/src/qml/qml/qqmlcontext.h +++ b/src/qml/qml/qqmlcontext.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -107,6 +105,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QList) -QT_END_HEADER - #endif // QQMLCONTEXT_H diff --git a/src/qml/qml/qqmlengine.h b/src/qml/qml/qqmlengine.h index 3e60b60..ab25e06 100644 --- a/src/qml/qml/qqmlengine.h +++ b/src/qml/qml/qqmlengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -49,10 +49,9 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +class QQmlAbstractUrlInterceptor; class Q_QML_EXPORT QQmlImageProviderBase { @@ -121,6 +120,9 @@ public: QNetworkAccessManager *networkAccessManager() const; + void setUrlInterceptor(QQmlAbstractUrlInterceptor* urlInterceptor); + QQmlAbstractUrlInterceptor* urlInterceptor() const; + void addImageProvider(const QString &id, QQmlImageProviderBase *); QQmlImageProviderBase *imageProvider(const QString &id) const; void removeImageProvider(const QString &id); @@ -144,6 +146,7 @@ public: static void setObjectOwnership(QObject *, ObjectOwnership); static ObjectOwnership objectOwnership(QObject *); protected: + QQmlEngine(QQmlEnginePrivate &dd, QObject *p); virtual bool event(QEvent *); Q_SIGNALS: @@ -157,6 +160,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLENGINE_H diff --git a/src/qml/qml/qqmlerror.h b/src/qml/qml/qqmlerror.h index 06fb096..cea9ee4 100644 --- a/src/qml/qml/qqmlerror.h +++ b/src/qml/qml/qqmlerror.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -84,6 +82,4 @@ Q_DECLARE_TYPEINFO(QQmlError, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLERROR_H diff --git a/src/qml/qml/qqmlexpression.h b/src/qml/qml/qqmlexpression.h index bc1aea4..b04abc1 100644 --- a/src/qml/qml/qqmlexpression.h +++ b/src/qml/qml/qqmlexpression.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -113,7 +111,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLEXPRESSION_H diff --git a/src/qml/qml/qqmlextensioninterface.h b/src/qml/qml/qqmlextensioninterface.h index 42f2eef..be2939d 100644 --- a/src/qml/qml/qqmlextensioninterface.h +++ b/src/qml/qml/qqmlextensioninterface.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,6 +74,4 @@ Q_DECLARE_INTERFACE(QQmlExtensionInterface, QQmlExtensionInterface_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLEXTENSIONINTERFACE_H diff --git a/src/qml/qml/qqmlextensionplugin.h b/src/qml/qml/qqmlextensionplugin.h index 99d9fb6..170c791 100644 --- a/src/qml/qml/qqmlextensionplugin.h +++ b/src/qml/qml/qqmlextensionplugin.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -43,35 +43,34 @@ #define QQMLEXTENSIONPLUGIN_H #include - +#include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE - class QQmlEngine; +class QQmlExtensionPluginPrivate; -class Q_QML_EXPORT QQmlExtensionPlugin : public QObject, - public QQmlExtensionInterface +class Q_QML_EXPORT QQmlExtensionPlugin + : public QObject + , public QQmlExtensionInterface { Q_OBJECT + Q_DECLARE_PRIVATE(QQmlExtensionPlugin) Q_INTERFACES(QQmlExtensionInterface) Q_INTERFACES(QQmlTypesExtensionInterface) public: explicit QQmlExtensionPlugin(QObject *parent = 0); ~QQmlExtensionPlugin(); + QUrl baseUrl() const; + virtual void registerTypes(const char *uri) = 0; virtual void initializeEngine(QQmlEngine *engine, const char *uri); -private: Q_DISABLE_COPY(QQmlExtensionPlugin) }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLEXTENSIONPLUGIN_H diff --git a/src/qml/qml/qqmlfile.h b/src/qml/qml/qqmlfile.h index cec3270..5e7a42d 100644 --- a/src/qml/qml/qqmlfile.h +++ b/src/qml/qml/qqmlfile.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUrl; @@ -119,6 +117,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLFILE_H diff --git a/src/qml/qml/qqmlincubator.h b/src/qml/qml/qqmlincubator.h index 469c6d7..4d3287a 100644 --- a/src/qml/qml/qqmlincubator.h +++ b/src/qml/qml/qqmlincubator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,6 +123,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLINCUBATOR_H diff --git a/src/qml/qml/qqmlinfo.h b/src/qml/qml/qqmlinfo.h index e11de2d..56ac788 100644 --- a/src/qml/qml/qqmlinfo.h +++ b/src/qml/qml/qqmlinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -46,10 +46,17 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +class QQmlInfo; + +namespace QtQml { + // declared in namespace to avoid symbol conflicts with QtDeclarative + Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); + Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); + Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList &errors); +} +using namespace QtQml; class QQmlInfoPrivate; class Q_QML_EXPORT QQmlInfo : public QDebug @@ -84,20 +91,14 @@ public: #endif private: - friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); - friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); - friend Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList &errors); + friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me); + friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QQmlError &error); + friend Q_QML_EXPORT QQmlInfo QtQml::qmlInfo(const QObject *me, const QList &errors); QQmlInfo(QQmlInfoPrivate *); QQmlInfoPrivate *d; }; -Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me); -Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QQmlError &error); -Q_QML_EXPORT QQmlInfo qmlInfo(const QObject *me, const QList &errors); - QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLINFO_H diff --git a/src/qml/qml/qqmllist.h b/src/qml/qml/qqmllist.h index e772022..a27a2da 100644 --- a/src/qml/qml/qqmllist.h +++ b/src/qml/qml/qqmllist.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -150,6 +148,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlListReference) -QT_END_HEADER - #endif // QQMLLIST_H diff --git a/src/qml/qml/qqmlnetworkaccessmanagerfactory.h b/src/qml/qml/qqmlnetworkaccessmanagerfactory.h index 6f7610f..4c12e00 100644 --- a/src/qml/qml/qqmlnetworkaccessmanagerfactory.h +++ b/src/qml/qml/qqmlnetworkaccessmanagerfactory.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,6 +59,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLNETWORKACCESSMANAGERFACTORY_H diff --git a/src/qml/qml/qqmlparserstatus.h b/src/qml/qml/qqmlparserstatus.h index 65765d7..d3447e7 100644 --- a/src/qml/qml/qqmlparserstatus.h +++ b/src/qml/qml/qqmlparserstatus.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,6 +70,4 @@ Q_DECLARE_INTERFACE(QQmlParserStatus, QQmlParserStatus_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPARSERSTATUS_H diff --git a/src/qml/qml/qqmlprivate.h b/src/qml/qml/qqmlprivate.h index 44a9599..b5b11d2 100644 --- a/src/qml/qml/qqmlprivate.h +++ b/src/qml/qml/qqmlprivate.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -57,8 +57,7 @@ #include #include - -QT_BEGIN_HEADER +#include QT_BEGIN_NAMESPACE @@ -253,11 +252,20 @@ namespace QQmlPrivate // If this is extended ensure "version" is bumped!!! }; + struct RegisterCompositeType { + QUrl url; + const char *uri; + int versionMajor; + int versionMinor; + const char *typeName; + }; + enum RegistrationType { - TypeRegistration = 0, + TypeRegistration = 0, InterfaceRegistration = 1, AutoParentRegistration = 2, - SingletonRegistration = 3 + SingletonRegistration = 3, + CompositeRegistration = 4 }; int Q_QML_EXPORT qmlregister(RegistrationType, void *); @@ -265,6 +273,4 @@ namespace QQmlPrivate QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPRIVATE_H diff --git a/src/qml/qml/qqmlproperty.h b/src/qml/qml/qqmlproperty.h index 2a688a8..c3322c0 100644 --- a/src/qml/qml/qqmlproperty.h +++ b/src/qml/qml/qqmlproperty.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,6 +138,4 @@ Q_DECLARE_TYPEINFO(QQmlProperty, Q_MOVABLE_TYPE); QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPROPERTY_H diff --git a/src/qml/qml/qqmlpropertyvaluesource.h b/src/qml/qml/qqmlpropertyvaluesource.h index f64a687..ccf40eb 100644 --- a/src/qml/qml/qqmlpropertyvaluesource.h +++ b/src/qml/qml/qqmlpropertyvaluesource.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -65,6 +63,4 @@ Q_DECLARE_INTERFACE(QQmlPropertyValueSource, QQmlPropertyValueSource_iid) QT_END_NAMESPACE -QT_END_HEADER - #endif // QQMLPROPERTYVALUESOURCE_H diff --git a/src/qml/qml/qqmlscriptstring.h b/src/qml/qml/qqmlscriptstring.h index f9ab65c..5421ef9 100644 --- a/src/qml/qml/qqmlscriptstring.h +++ b/src/qml/qml/qqmlscriptstring.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,7 +84,5 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QQmlScriptString) -QT_END_HEADER - #endif // QQMLSCRIPTSTRING_H diff --git a/src/qml/qml/v8/qjsengine.h b/src/qml/qml/v8/qjsengine.h index de962b5..0a575f8 100644 --- a/src/qml/qml/v8/qjsengine.h +++ b/src/qml/qml/v8/qjsengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -137,6 +135,4 @@ inline QVariant qjsvalue_cast(const QJSValue &value) QT_END_NAMESPACE -QT_END_HEADER - #endif // QJSENGINE_H diff --git a/src/qml/qml/v8/qjsvalue.h b/src/qml/qml/v8/qjsvalue.h index d13be2b..efd52ce 100644 --- a/src/qml/qml/v8/qjsvalue.h +++ b/src/qml/qml/v8/qjsvalue.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -48,8 +48,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -157,6 +155,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QJSValue) -QT_END_HEADER - #endif diff --git a/src/qml/qml/v8/qjsvalueiterator.h b/src/qml/qml/v8/qjsvalueiterator.h index c40fd07..b4f90a4 100644 --- a/src/qml/qml/v8/qjsvalueiterator.h +++ b/src/qml/qml/v8/qjsvalueiterator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -46,8 +46,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCRIPTVALUEITERATOR_H diff --git a/src/qml/qtqmlglobal.h b/src/qml/qtqmlglobal.h index 3ad8a5d..07a4136 100644 --- a/src/qml/qtqmlglobal.h +++ b/src/qml/qtqmlglobal.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -44,7 +44,6 @@ #include -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -58,6 +57,4 @@ QT_BEGIN_NAMESPACE #endif QT_END_NAMESPACE -QT_END_HEADER - #endif // QTQMLGLOBAL_H diff --git a/src/qml/util/qqmlpropertymap.h b/src/qml/util/qqmlpropertymap.h index 1b5b827..f963e90 100644 --- a/src/qml/util/qqmlpropertymap.h +++ b/src/qml/util/qqmlpropertymap.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtQml module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -83,8 +81,8 @@ protected: virtual QVariant updateValue(const QString &key, const QVariant &input); template - QQmlPropertyMap(DerivedType *derived, QObject *parent) - : QObject(*allocatePrivate(), parent) + QQmlPropertyMap(DerivedType *derived, QObject *parentObj) + : QObject(*allocatePrivate(), parentObj) { Q_UNUSED(derived) init(&DerivedType::staticMetaObject); @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:50:15 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:15 -0700 Subject: [Development] Header diff for QtTest In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <84c8a8$a0ea5n@orsmga001.jf.intel.com> diff --git a/src/testlib/qbenchmark.h b/src/testlib/qbenchmark.h index c9ce198..ea5023c 100644 --- a/src/testlib/qbenchmark.h +++ b/src/testlib/qbenchmark.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -58,7 +56,7 @@ namespace QTest // ------------- // // The QBenchmarkIterationController class is not a part of the -// QTestlib API. It exists purely as an implementation detail. +// Qt Test API. It exists purely as an implementation detail. // // class Q_TESTLIB_EXPORT QBenchmarkIterationController @@ -94,6 +92,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif // QBENCHMARK_H diff --git a/src/testlib/qbenchmarkmetric.h b/src/testlib/qbenchmarkmetric.h index 769e362..448df3f 100644 --- a/src/testlib/qbenchmarkmetric.h +++ b/src/testlib/qbenchmarkmetric.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -60,13 +58,32 @@ enum QBenchmarkMetric { InstructionReads, Events, WalltimeNanoseconds, - BytesAllocated + BytesAllocated, + CPUMigrations, + CPUCycles, + BusCycles, + StalledCycles, + Instructions, + BranchInstructions, + BranchMisses, + CacheReferences, + CacheReads, + CacheWrites, + CachePrefetches, + CacheMisses, + CacheReadMisses, + CacheWriteMisses, + CachePrefetchMisses, + ContextSwitches, + PageFaults, + MinorPageFaults, + MajorPageFaults, + AlignmentFaults, + EmulationFaults }; } QT_END_NAMESPACE -QT_END_HEADER - #endif // QBENCHMARK_H diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index b8e542a..72a5df1 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -50,8 +50,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -97,7 +95,7 @@ public: return; } sig = ba; - initArgs(mo->method(sigIndex)); + initArgs(mo->method(sigIndex), obj); } inline bool isValid() const { return !sig.isEmpty(); } @@ -131,10 +129,23 @@ public: private: void initArgs(const QMetaMethod &member) { + initArgs(member, 0); + } + + void initArgs(const QMetaMethod &member, const QObject *obj) + { const QList params = member.parameterTypes(); args.reserve(params.size()); for (int i = 0; i < params.count(); ++i) { - const int tp = QMetaType::type(params.at(i).constData()); + int tp = QMetaType::type(params.at(i).constData()); + if (tp == QMetaType::UnknownType && obj) { + void *argv[] = { &tp, &i }; + QMetaObject::metacall(const_cast(obj), + QMetaObject::RegisterMethodArgumentMetaType, + member.methodIndex(), argv); + if (tp == -1) + tp = QMetaType::UnknownType; + } if (tp == QMetaType::UnknownType) { Q_ASSERT(tp != QMetaType::Void); // void parameter => metaobject is corrupt qWarning("Don't know how to handle '%s', use qRegisterMetaType to register it.", @@ -172,6 +183,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtest.h b/src/testlib/qtest.h index a38b656..ac1d6cc 100644 --- a/src/testlib/qtest.h +++ b/src/testlib/qtest.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -60,8 +60,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -70,12 +68,12 @@ namespace QTest template<> inline char *toString(const QLatin1String &str) { - return qstrdup(str.latin1()); + return qstrdup(qPrintable(QString(str))); } template<> inline char *toString(const QString &str) { - return qstrdup(str.toLatin1().constData()); + return qstrdup(qPrintable(str)); } template<> inline char *toString(const QByteArray &ba) @@ -87,29 +85,29 @@ template<> inline char *toString(const QByteArray &ba) template<> inline char *toString(const QTime &time) { return time.isValid() - ? qstrdup(time.toString(QLatin1String("hh:mm:ss.zzz")).toLatin1().constData()) + ? qstrdup(qPrintable(time.toString(QLatin1String("hh:mm:ss.zzz")))) : qstrdup("Invalid QTime"); } template<> inline char *toString(const QDate &date) { return date.isValid() - ? qstrdup(date.toString(QLatin1String("yyyy/MM/dd")).toLatin1().constData()) + ? qstrdup(qPrintable(date.toString(QLatin1String("yyyy/MM/dd")))) : qstrdup("Invalid QDate"); } template<> inline char *toString(const QDateTime &dateTime) { return dateTime.isValid() - ? qstrdup((dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) + - (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]"))).toLatin1().constData()) + ? qstrdup(qPrintable(dateTime.toString(QLatin1String("yyyy/MM/dd hh:mm:ss.zzz")) + + (dateTime.timeSpec() == Qt::LocalTime ? QLatin1String("[local time]") : QLatin1String("[UTC]")))) : qstrdup("Invalid QDateTime"); } #endif // QT_NO_DATESTRING template<> inline char *toString(const QChar &c) { - return qstrdup(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast(c.unicode()), 16)).toLatin1().constData()); + return qstrdup(qPrintable(QString::fromLatin1("QChar: '%1' (0x%2)").arg(c).arg(QString::number(static_cast(c.unicode()), 16)))); } template<> inline char *toString(const QPoint &p) @@ -145,7 +143,7 @@ template<> inline char *toString(const QRectF &s) template<> inline char *toString(const QUrl &uri) { if (!uri.isValid()) - return qstrdup(QByteArray("Invalid URL: " + uri.errorString().toLatin1()).constData()); + return qstrdup(qPrintable(QStringLiteral("Invalid URL: ") + uri.errorString())); return qstrdup(uri.toEncoded().constData()); } @@ -161,7 +159,7 @@ template<> inline char *toString(const QVariant &v) if (!v.isNull()) { vstring.append(','); if (v.canConvert(QVariant::String)) { - vstring.append(qvariant_cast(v).toLatin1()); + vstring.append(qvariant_cast(v).toLocal8Bit()); } else { vstring.append(""); @@ -186,9 +184,9 @@ inline bool qCompare(QLatin1String const &t1, QString const &t2, const char *act return qCompare(QString(t1), t2, actual, expected, file, line); } -template<> -inline bool qCompare(QStringList const &t1, QStringList const &t2, - const char *actual, const char *expected, const char *file, int line) +template +inline bool qCompare(QList const &t1, QList const &t2, const char *actual, const char *expected, + const char *file, int line) { char msg[1024]; msg[0] = '\0'; @@ -196,23 +194,30 @@ inline bool qCompare(QStringList const &t1, QStringList const &t2, const int actualSize = t1.count(); const int expectedSize = t2.count(); if (actualSize != expectedSize) { - qsnprintf(msg, sizeof(msg), "Compared QStringLists have different sizes.\n" + qsnprintf(msg, sizeof(msg), "Compared lists have different sizes.\n" " Actual (%s) size: '%d'\n" " Expected (%s) size: '%d'", actual, actualSize, expected, expectedSize); isOk = false; } for (int i = 0; isOk && i < actualSize; ++i) { - if (t1.at(i) != t2.at(i)) { - qsnprintf(msg, sizeof(msg), "Compared QStringLists differ at index %d.\n" + if (!(t1.at(i) == t2.at(i))) { + qsnprintf(msg, sizeof(msg), "Compared lists differ at index %d.\n" " Actual (%s): '%s'\n" - " Expected (%s): '%s'", i, actual, t1.at(i).toLatin1().constData(), - expected, t2.at(i).toLatin1().constData()); + " Expected (%s): '%s'", i, actual, toString(t1.at(i)), + expected, toString(t2.at(i))); isOk = false; } } return compare_helper(isOk, msg, 0, 0, actual, expected, file, line); } +template <> +inline bool qCompare(QStringList const &t1, QStringList const &t2, const char *actual, const char *expected, + const char *file, int line) +{ + return qCompare(t1, t2, actual, expected, file, line); +} + template inline bool qCompare(QFlags const &t1, T const &t2, const char *actual, const char *expected, const char *file, int line) @@ -227,6 +232,48 @@ inline bool qCompare(QFlags const &t1, int const &t2, const char *actual, con return qCompare(int(t1), t2, actual, expected, file, line); } +template<> +inline bool qCompare(qint64 const &t1, qint32 const &t2, const char *actual, + const char *expected, const char *file, int line) +{ + return qCompare(t1, static_cast(t2), actual, expected, file, line); +} + +template<> +inline bool qCompare(qint64 const &t1, quint32 const &t2, const char *actual, + const char *expected, const char *file, int line) +{ + return qCompare(t1, static_cast(t2), actual, expected, file, line); +} + +template<> +inline bool qCompare(quint64 const &t1, quint32 const &t2, const char *actual, + const char *expected, const char *file, int line) +{ + return qCompare(t1, static_cast(t2), actual, expected, file, line); +} + +template<> +inline bool qCompare(qint32 const &t1, qint64 const &t2, const char *actual, + const char *expected, const char *file, int line) +{ + return qCompare(static_cast(t1), t2, actual, expected, file, line); +} + +template<> +inline bool qCompare(quint32 const &t1, qint64 const &t2, const char *actual, + const char *expected, const char *file, int line) +{ + return qCompare(static_cast(t1), t2, actual, expected, file, line); +} + +template<> +inline bool qCompare(quint32 const &t1, quint64 const &t2, const char *actual, + const char *expected, const char *file, int line) +{ + return qCompare(static_cast(t1), t2, actual, expected, file, line); +} + } QT_END_NAMESPACE @@ -294,6 +341,4 @@ int main(int argc, char *argv[]) \ return QTest::qExec(&tc, argc, argv); \ } -QT_END_HEADER - #endif diff --git a/src/testlib/qtest_global.h b/src/testlib/qtest_global.h index 464810d..ac5a0b2 100644 --- a/src/testlib/qtest_global.h +++ b/src/testlib/qtest_global.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,6 +74,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtest_gui.h b/src/testlib/qtest_gui.h index 66e65f7..a9ac777 100644 --- a/src/testlib/qtest_gui.h +++ b/src/testlib/qtest_gui.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -69,8 +69,6 @@ #pragma qt_no_master_include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -149,6 +147,4 @@ inline bool qCompare(QPixmap const &t1, QPixmap const &t2, const char *actual, c QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtest_widgets.h b/src/testlib/qtest_widgets.h index ac3f032..1161b84 100644 --- a/src/testlib/qtest_widgets.h +++ b/src/testlib/qtest_widgets.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -57,11 +57,9 @@ #pragma qt_no_master_include #endif -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER #endif diff --git a/src/testlib/qtestaccessible.h b/src/testlib/qtestaccessible.h index 2642ee2..f27651c 100644 --- a/src/testlib/qtestaccessible.h +++ b/src/testlib/qtestaccessible.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -47,6 +47,8 @@ #pragma qt_no_master_include #endif +#include + #ifndef QT_NO_ACCESSIBILITY #define QVERIFY_EVENT(event) \ @@ -56,8 +58,8 @@ #include #include #include - -QT_BEGIN_HEADER +#include +#include QT_BEGIN_NAMESPACE @@ -254,7 +256,7 @@ private: str << "Event " << needle->object() << ", type: " << needle->type() << ", child: " << needle->child() << " not found at head of event list of size " << haystack.size() << " :"; - foreach (const QAccessibleEvent *e, haystack) + Q_FOREACH (const QAccessibleEvent *e, haystack) str << ' ' << e->object() << ", type: " << e->type() << ", child: " << e->child(); return rc; @@ -264,7 +266,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_ACCESSIBILITY #endif // QTESTACCESSIBLE_H diff --git a/src/testlib/qtestassert.h b/src/testlib/qtestassert.h index 00df2fa..c694253 100644 --- a/src/testlib/qtestassert.h +++ b/src/testlib/qtestassert.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -55,6 +53,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtestcase.h b/src/testlib/qtestcase.h index 8529791..6b5e7a5 100644 --- a/src/testlib/qtestcase.h +++ b/src/testlib/qtestcase.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -51,8 +51,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -249,7 +247,7 @@ namespace QTest Q_TESTLIB_EXPORT bool compare_string_helper(const char *t1, const char *t2, const char *actual, const char *expected, const char *file, int line); -#ifndef qdoc +#ifndef Q_QDOC QTEST_COMPARE_DECL(short) QTEST_COMPARE_DECL(ushort) QTEST_COMPARE_DECL(int) @@ -352,6 +350,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtestdata.h b/src/testlib/qtestdata.h index 1f77c22..d1bc3e7 100644 --- a/src/testlib/qtestdata.h +++ b/src/testlib/qtestdata.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,6 +97,4 @@ inline QTestData &operator<<(QTestData &data, const QStringBuilder &value) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtestevent.h b/src/testlib/qtestevent.h index e7e9a35..a96cfa7 100644 --- a/src/testlib/qtestevent.h +++ b/src/testlib/qtestevent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -58,8 +58,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -227,6 +225,4 @@ QT_END_NAMESPACE Q_DECLARE_METATYPE(QTestEventList) -QT_END_HEADER - #endif diff --git a/src/testlib/qtesteventloop.h b/src/testlib/qtesteventloop.h index c8184e5..b70954c 100644 --- a/src/testlib/qtesteventloop.h +++ b/src/testlib/qtesteventloop.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -49,8 +49,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -131,6 +129,4 @@ inline void QTestEventLoop::timerEvent(QTimerEvent *e) QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtestkeyboard.h b/src/testlib/qtestkeyboard.h index 3be4a77..8788067 100644 --- a/src/testlib/qtestkeyboard.h +++ b/src/testlib/qtestkeyboard.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -62,8 +62,6 @@ #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE Q_GUI_EXPORT void qt_handleKeyEvent(QWindow *w, QEvent::Type t, int k, Qt::KeyboardModifiers mods, const QString & text = QString(), bool autorep = false, ushort count = 1); @@ -298,6 +296,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif // QTESTKEYBOARD_H diff --git a/src/testlib/qtestmouse.h b/src/testlib/qtestmouse.h index cb61c67..4d70aff 100644 --- a/src/testlib/qtestmouse.h +++ b/src/testlib/qtestmouse.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -54,14 +54,13 @@ #include #include #include +#include #ifdef QT_WIDGETS_LIB #include #include #endif -QT_BEGIN_HEADER - 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); @@ -85,6 +84,9 @@ namespace QTest QTEST_ASSERT(window); extern int Q_TESTLIB_EXPORT defaultMouseDelay(); + if (!window->geometry().contains(pos)) + QTest::qWarn("Mouse event occurs outside of target window."); + static Qt::MouseButton lastButton = Qt::NoButton; if (delay == -1 || delay < defaultMouseDelay()) @@ -227,6 +229,4 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif // QTESTMOUSE_H diff --git a/src/testlib/qtestspontaneevent.h b/src/testlib/qtestspontaneevent.h index 04ce57d..e299981 100644 --- a/src/testlib/qtestspontaneevent.h +++ b/src/testlib/qtestspontaneevent.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -49,8 +49,6 @@ #pragma qt_no_master_include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -73,7 +71,7 @@ public: class QSpontaneKeyEvent { public: - void setSpontaneous() { spont = 1; } + void setSpontaneous() { spont = 1; Q_UNUSED(posted) Q_UNUSED(m_accept) Q_UNUSED(reserved) } bool spontaneous() { return spont; } virtual void dummyFunc() {} virtual ~QSpontaneKeyEvent() {} @@ -112,6 +110,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtestsystem.h b/src/testlib/qtestsystem.h index dd60aae..2a719e9 100644 --- a/src/testlib/qtestsystem.h +++ b/src/testlib/qtestsystem.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -52,8 +52,6 @@ # include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE namespace QTest @@ -72,7 +70,7 @@ namespace QTest } #ifdef QT_GUI_LIB - inline static bool qWaitForWindowActive(QWindow *window, int timeout = 1000) + inline static bool qWaitForWindowActive(QWindow *window, int timeout = 5000) { QElapsedTimer timer; timer.start(); @@ -101,7 +99,7 @@ namespace QTest return window->isActive(); } - inline static bool qWaitForWindowExposed(QWindow *window, int timeout = 1000) + inline static bool qWaitForWindowExposed(QWindow *window, int timeout = 5000) { QElapsedTimer timer; timer.start(); @@ -145,7 +143,5 @@ namespace QTest QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/testlib/qtesttouch.h b/src/testlib/qtesttouch.h index 0b4b558..9a661b4 100644 --- a/src/testlib/qtesttouch.h +++ b/src/testlib/qtesttouch.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtTest module of the Qt Toolkit. @@ -53,12 +53,11 @@ #include #include #include +#include #ifdef QT_WIDGETS_LIB #include #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE Q_GUI_EXPORT void qt_handleTouchEvent(QWindow *w, QTouchDevice *device, @@ -233,6 +232,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTESTTOUCH_H From thiago.macieira at intel.com Wed Jun 26 22:50:42 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:42 -0700 Subject: [Development] Qt 5.1 header diff In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> References: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: <1765379.5UmyvvMD4s@tjmaciei-mobl2> On terça-feira, 25 de junho de 2013 23.22.59, Thiago Macieira wrote: > I've just noticed we haven't done the manual header diff to catch issues. > > We need to get this done by the end of this week if we want to catch, fix > and release any issues by next Friday. > > Any volunteers to produce the diffs and send to the list? Ok, I've done it. Each module that was part of Qt 5.0 and has public headers has received an email as a reply to my original email. The script is this: https://codereview.qt-project.org/59938 -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 22:50:04 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:04 -0700 Subject: [Development] Header diff for QtPrintSupport In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index a9fd361..8797931 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -125,6 +123,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QAbstractPrintDialog::PrintDialogOptions) QT_END_NAMESPACE -QT_END_HEADER - #endif // QABSTRACTPRINTDIALOG_H diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index b271d91..c316e42 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -88,6 +86,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPAGESETUPDIALOG_H diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index e774799..7d77c6a 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -91,7 +89,7 @@ public: #endif void open(QObject *receiver, const char *member); -#ifdef qdoc +#ifdef Q_QDOC QPrinter *printer(); #endif @@ -121,6 +119,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPRINTDIALOG_H diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 5014f62..b9c8737 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_PRINTPREVIEWDIALOG -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -99,8 +97,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_PRINTPREVIEWDIALOG #endif // QPRINTPREVIEWDIALOG_H diff --git a/src/printsupport/kernel/qprintengine.h b/src/printsupport/kernel/qprintengine.h index ab4483e..3993a22 100644 --- a/src/printsupport/kernel/qprintengine.h +++ b/src/printsupport/kernel/qprintengine.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -86,6 +84,7 @@ public: PPK_PageMargins, PPK_CopyCount, PPK_SupportsMultipleCopies, + PPK_PaperName, PPK_PaperSize = PPK_PageSize, PPK_CustomBase = 0xff00 @@ -106,6 +105,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPRINTENGINE_H diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index 7e2259b..2528157 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -169,6 +167,9 @@ public: void setPaperSize(const QSizeF &paperSize, Unit unit); QSizeF paperSize(Unit unit) const; + void setPaperName(const QString &paperName); + QString paperName() const; + void setPageOrder(PageOrder); PageOrder pageOrder() const; @@ -221,7 +222,7 @@ public: QRectF paperRect(Unit) const; QRectF pageRect(Unit) const; -#if !defined(Q_OS_WIN) || defined(qdoc) +#if !defined(Q_OS_WIN) || defined(Q_QDOC) QString printerSelectionOption() const; void setPrinterSelectionOption(const QString &); #endif @@ -267,6 +268,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPRINTER_H diff --git a/src/printsupport/kernel/qprinterinfo.h b/src/printsupport/kernel/qprinterinfo.h index 4de2a3d..0dc19c1 100644 --- a/src/printsupport/kernel/qprinterinfo.h +++ b/src/printsupport/kernel/qprinterinfo.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -43,11 +43,9 @@ #define QPRINTERINFO_H #include - +#include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -73,6 +71,7 @@ public: bool isDefault() const; QList supportedPaperSizes() const; + QList > supportedSizesWithNames() const; static QList availablePrinters(); static QPrinterInfo defaultPrinter(); @@ -91,6 +90,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPRINTERINFO_H diff --git a/src/printsupport/kernel/qtprintsupportglobal.h b/src/printsupport/kernel/qtprintsupportglobal.h index 1927252..0fdb306 100644 --- a/src/printsupport/kernel/qtprintsupportglobal.h +++ b/src/printsupport/kernel/qtprintsupportglobal.h @@ -44,8 +44,6 @@ #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_STATIC @@ -60,6 +58,4 @@ QT_BEGIN_NAMESPACE QT_END_NAMESPACE -QT_END_HEADER - #endif // QTPRINTSUPPORTGLOBAL_H diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h index 585dcf8..85ff77d 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.h +++ b/src/printsupport/widgets/qprintpreviewwidget.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtGui module of the Qt Toolkit. @@ -47,8 +47,6 @@ #ifndef QT_NO_PRINTPREVIEWWIDGET -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -116,7 +114,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_PRINTPREVIEWWIDGET #endif // QPRINTPREVIEWWIDGET_H From thiago.macieira at intel.com Wed Jun 26 22:50:11 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:50:11 -0700 Subject: [Development] Header diff for QtScriptTools In-Reply-To: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> Message-ID: diff --git a/src/scripttools/debugging/qscriptenginedebugger.h b/src/scripttools/debugging/qscriptenginedebugger.h index e380086..9589f65 100644 --- a/src/scripttools/debugging/qscriptenginedebugger.h +++ b/src/scripttools/debugging/qscriptenginedebugger.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/legal ** ** This file is part of the QtSCriptTools module of the Qt Toolkit. @@ -45,8 +45,6 @@ #include #include -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -132,6 +130,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif From thiago.macieira at intel.com Wed Jun 26 22:54:44 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:54:44 -0700 Subject: [Development] Header diff for QtDBus In-Reply-To: <84c8a8$a0e9u7@orsmga001.jf.intel.com> References: <84c8a8$a0e9u7@orsmga001.jf.intel.com> Message-ID: <1619778.kzo6Mxmx2e@tjmaciei-mobl2> Everything is fine. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 22:52:36 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 13:52:36 -0700 Subject: [Development] Header diff for QtConcurrent In-Reply-To: <6c3329$andd15@orsmga002.jf.intel.com> References: <6c3329$andd15@orsmga002.jf.intel.com> Message-ID: <1687371.xKtTYytnYU@tjmaciei-mobl2> Everything fine. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Lars.Knoll at digia.com Wed Jun 26 22:55:33 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 20:55:33 +0000 Subject: [Development] Header diff for QtConcurrent In-Reply-To: <6c3329$andd15@orsmga002.jf.intel.com> Message-ID: Nothing to see here :) Lars On 6/26/13 10:49 PM, "Thiago Macieira" wrote: >diff --git a/src/concurrent/qtconcurrent_global.h >b/src/concurrent/qtconcurrent_global.h >index 464aa88..965d33f 100644 >--- a/src/concurrent/qtconcurrent_global.h >+++ b/src/concurrent/qtconcurrent_global.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -44,7 +44,6 @@ > > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > #ifndef QT_STATIC >@@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE > #endif > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // include guard >diff --git a/src/concurrent/qtconcurrentcompilertest.h >b/src/concurrent/qtconcurrentcompilertest.h >index 0b0edf5..7652a69 100644 >--- a/src/concurrent/qtconcurrentcompilertest.h >+++ b/src/concurrent/qtconcurrentcompilertest.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -46,7 +46,6 @@ > > #ifndef QT_NO_CONCURRENT > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > namespace QtPrivate { >@@ -64,7 +63,6 @@ public: > } > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentexception.h >b/src/concurrent/qtconcurrentexception.h >index 373d42e..21fdb25 100644 >--- a/src/concurrent/qtconcurrentexception.h >+++ b/src/concurrent/qtconcurrentexception.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -48,7 +48,6 @@ > > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >@@ -65,7 +64,6 @@ typedef Q_DECL_DEPRECATED QUnhandledException >UnhandledException; > } // namespace QtConcurrent > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_QFUTURE > >diff --git a/src/concurrent/qtconcurrentfilter.h >b/src/concurrent/qtconcurrentfilter.h >index ca0ab4d..4c6f2ed 100644 >--- a/src/concurrent/qtconcurrentfilter.h >+++ b/src/concurrent/qtconcurrentfilter.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -49,11 +49,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifdef qdoc >+#ifdef Q_QDOC > > namespace QtConcurrent { > >@@ -258,10 +257,9 @@ OutputSequence blockingFiltered(Iterator begin, >Iterator end, KeepFunctor keep) > > } // namespace QtConcurrent > >-#endif // qdoc >+#endif // Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentfilterkernel.h >b/src/concurrent/qtconcurrentfilterkernel.h >index c980fcc..63e77ab 100644 >--- a/src/concurrent/qtconcurrentfilterkernel.h >+++ b/src/concurrent/qtconcurrentfilterkernel.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -50,11 +50,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > >@@ -340,10 +339,9 @@ inline ThreadEngineStarter >startFilteredReduced(Iterator begin, Iter > > } // namespace QtConcurrent > >-#endif // qdoc >+#endif // Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentfunctionwrappers.h >b/src/concurrent/qtconcurrentfunctionwrappers.h >index 59a29d4..abd316b 100644 >--- a/src/concurrent/qtconcurrentfunctionwrappers.h >+++ b/src/concurrent/qtconcurrentfunctionwrappers.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -43,14 +43,14 @@ > #define QTCONCURRENT_FUNCTIONWRAPPERS_H > > #include >+#include > > #ifndef QT_NO_CONCURRENT > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > >@@ -293,10 +293,9 @@ struct MapResultType > > } // namespace QtPrivate. > >-#endif //qdoc >+#endif //Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentiteratekernel.h >b/src/concurrent/qtconcurrentiteratekernel.h >index 5d899b5..70a7f16 100644 >--- a/src/concurrent/qtconcurrentiteratekernel.h >+++ b/src/concurrent/qtconcurrentiteratekernel.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -52,11 +52,10 @@ > > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > >@@ -300,10 +299,9 @@ public: > > } // namespace QtConcurrent > >-#endif //qdoc >+#endif //Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentmap.h >b/src/concurrent/qtconcurrentmap.h >index 3c2f0df..bc1c363 100644 >--- a/src/concurrent/qtconcurrentmap.h >+++ b/src/concurrent/qtconcurrentmap.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -51,11 +51,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifdef qdoc >+#ifdef Q_QDOC > > namespace QtConcurrent { > >@@ -309,10 +308,9 @@ typename QtPrivate::MapResultTypeMapFunctor>::ResultType blockingMapp > > } // namespace QtConcurrent > >-#endif // qdoc >+#endif // Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentmapkernel.h >b/src/concurrent/qtconcurrentmapkernel.h >index e6d7493..6817cd3 100644 >--- a/src/concurrent/qtconcurrentmapkernel.h >+++ b/src/concurrent/qtconcurrentmapkernel.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -49,11 +49,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > namespace QtConcurrent { > > // map kernel, works with both parallel-for and parallel-while >@@ -81,7 +80,7 @@ public: > runIteration(it, i, 0); > advance(it, 1); > } >- >+ > return false; > } > }; >@@ -262,10 +261,9 @@ inline ThreadEngineStarter >startMappedReduced(Iterator begin, Iterat > > } // namespace QtConcurrent > >-#endif //qdoc >+#endif //Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentmedian.h >b/src/concurrent/qtconcurrentmedian.h >index 92bcae8..7d3b50a 100644 >--- a/src/concurrent/qtconcurrentmedian.h >+++ b/src/concurrent/qtconcurrentmedian.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -49,11 +49,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > >@@ -119,10 +118,9 @@ private: > > } // namespace QtConcurrent > >-#endif //qdoc >+#endif //Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentreducekernel.h >b/src/concurrent/qtconcurrentreducekernel.h >index 9bcc9005..dcf4b92 100644 >--- a/src/concurrent/qtconcurrentreducekernel.h >+++ b/src/concurrent/qtconcurrentreducekernel.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -54,13 +54,12 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > > namespace QtConcurrent { > >-#ifndef qdoc >+#ifndef Q_QDOC > > /* > The ReduceQueueStartLimit and ReduceQueueThrottleLimit constants >@@ -85,7 +84,7 @@ public: > QVector vector; > }; > >-#endif // qdoc >+#endif // Q_QDOC > > enum ReduceOption { > UnorderedReduce = 0x1, >@@ -96,7 +95,7 @@ enum ReduceOption { > Q_DECLARE_FLAGS(ReduceOptions, ReduceOption) > Q_DECLARE_OPERATORS_FOR_FLAGS(ReduceOptions) > >-#ifndef qdoc >+#ifndef Q_QDOC > > // supports both ordered and out-of-order reduction > template >@@ -140,7 +139,7 @@ class ReduceKernel > > public: > ReduceKernel(ReduceOptions _reduceOptions) >- : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), >+ : reduceOptions(_reduceOptions), progress(0), resultsMapSize(0), > threadCount(QThreadPool::globalInstance()->maxThreadCount()) > { } > >@@ -242,12 +241,11 @@ struct SequenceHolder2 : public Base > } > }; > >-#endif //qdoc >+#endif //Q_QDOC > > } // namespace QtConcurrent > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentrun.h >b/src/concurrent/qtconcurrentrun.h >index 452c869..0bfe4bf 100644 >--- a/src/concurrent/qtconcurrentrun.h >+++ b/src/concurrent/qtconcurrentrun.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -50,11 +50,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifdef qdoc >+#ifdef Q_QDOC > > namespace QtConcurrent { > >@@ -98,7 +97,7 @@ QFuture run(T (*functionPointer)(Param1, Param2, >Param3, Param4, Param5), con > return (new StoredFunctorCall5Param4, Param5), Arg1, Arg2, Arg3, Arg4, Arg5>(functionPointer, arg1, >arg2, arg3, arg4, arg5))->start(); > } > >-#ifdef Q_COMPILER_DECLTYPE >+#if defined(Q_COMPILER_DECLTYPE) && defined(Q_COMPILER_AUTO_FUNCTION) > > template > auto run(Functor functor) -> typename >QtPrivate::QEnableIf::Value, >QFuture >::Type >@@ -337,10 +336,9 @@ QFuture run(const Class *object, T >(Class::*fn)(Param1, Param2, Param3, Param > > } //namespace QtConcurrent > >-#endif // qdoc >+#endif // Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentrunbase.h >b/src/concurrent/qtconcurrentrunbase.h >index 6c67338..bd24c42 100644 >--- a/src/concurrent/qtconcurrentrunbase.h >+++ b/src/concurrent/qtconcurrentrunbase.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -50,11 +50,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > >@@ -144,10 +143,9 @@ public: > > } //namespace QtConcurrent > >-#endif //qdoc >+#endif //Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentstoredfunctioncall.h >b/src/concurrent/qtconcurrentstoredfunctioncall.h >index ffddb30..8d49ab3 100644 >--- a/src/concurrent/qtconcurrentstoredfunctioncall.h >+++ b/src/concurrent/qtconcurrentstoredfunctioncall.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -48,11 +48,10 @@ > #ifndef QT_NO_CONCURRENT > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > template >@@ -1302,10 +1301,9 @@ private: > > } //namespace QtConcurrent > >-#endif // qdoc >+#endif // Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >diff --git a/src/concurrent/qtconcurrentthreadengine.h >b/src/concurrent/qtconcurrentthreadengine.h >index ee3f7e6..a3ee8ca 100644 >--- a/src/concurrent/qtconcurrentthreadengine.h >+++ b/src/concurrent/qtconcurrentthreadengine.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtCore module of the Qt Toolkit. >@@ -54,11 +54,10 @@ > #include > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > >-#ifndef qdoc >+#ifndef Q_QDOC > > namespace QtConcurrent { > >@@ -270,10 +269,9 @@ inline ThreadEngineStarterThreadEngine::ResultType> startThreadEngine( > > } // namespace QtConcurrent > >-#endif //qdoc >+#endif //Q_QDOC > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QT_NO_CONCURRENT > >_______________________________________________ >Development mailing list >Development at qt-project.org >http://lists.qt-project.org/mailman/listinfo/development From Sergio.Ahumada at digia.com Wed Jun 26 23:00:23 2013 From: Sergio.Ahumada at digia.com (Ahumada Sergio) Date: Wed, 26 Jun 2013 21:00:23 +0000 Subject: [Development] Qt 5.1 header diff In-Reply-To: <1765379.5UmyvvMD4s@tjmaciei-mobl2> References: <1967466.Gq0jFrFLpo@tjmaciei-mobl2>, <1765379.5UmyvvMD4s@tjmaciei-mobl2> Message-ID: <9B4D1DADF5006F4DB6666312421B98E50100EF22@IT-EXMB01-HKI.it.local> can the script post to pastebin and just send one email with all the pastebin links ? -- Sergio Ahumada Release Engineer - Digia, Qt ________________________________________ From: development-bounces+sergio.ahumada=digia.com at qt-project.org [development-bounces+sergio.ahumada=digia.com at qt-project.org] on behalf of Thiago Macieira [thiago.macieira at intel.com] Sent: Wednesday, June 26, 2013 22:50 To: development at qt-project.org Subject: Re: [Development] Qt 5.1 header diff On terça-feira, 25 de junho de 2013 23.22.59, Thiago Macieira wrote: > I've just noticed we haven't done the manual header diff to catch issues. > > We need to get this done by the end of this week if we want to catch, fix > and release any issues by next Friday. > > Any volunteers to produce the diffs and send to the list? Ok, I've done it. Each module that was part of Qt 5.0 and has public headers has received an email as a reply to my original email. The script is this: https://codereview.qt-project.org/59938 -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center From sh at theharmers.co.uk Wed Jun 26 23:07:42 2013 From: sh at theharmers.co.uk (Sean Harmer) Date: Wed, 26 Jun 2013 22:07:42 +0100 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <51CB581E.2090004@theharmers.co.uk> On 26/06/2013 07:58, Knoll Lars wrote: > On 26.06.13 01:48, "Thiago Macieira" wrote: > >> On quarta-feira, 26 de junho de 2013 07.34.28, Yuchen Deng wrote: >>> 2013/6/25 Knoll Lars >>> >>>> Are we going to get this one ready in time for 5.2? >>> I prefer/hope this module can be added, It's should added in Qt 5.1 as >>> plan, but it not. then It's plan adding in Qt5.2, It's seems still not? >>> no, no. please. >>> If it's still no way, could you please explain why? > We have time based releases and include the modules that are ready. Sean > did send a mail about Qt 3D explaining why it's not part of 5.1 to the > mailing list some time earlier this year. > > Whether it'll be part of 5.2 depends on whether someone does the actual > work in time (ie. Whether it's high enough on someone's priority list). We are aiming to get something ready for 5.2. James and I have been working on this and discussing it with Pasi and we will push some stuff upstream in the next few weeks. I do not yet know if the API will be stable for 5.2 and we'll have to call it a tech preview or not. Time will tell. Also there's things in the OpenGL support in QtGui that we also need to improve - textures being a big one. Cheers, Sean -- This message has been scanned for viruses and dangerous content by MailScanner, and is believed to be clean. From Lars.Knoll at digia.com Wed Jun 26 23:23:40 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 21:23:40 +0000 Subject: [Development] Header diff for QtCore In-Reply-To: <1f4a33$7ogn1q@AZSMGA002.ch.intel.com> Message-ID: Couldn't find anything here. Lars On 6/26/13 10:49 PM, "Thiago Macieira" wrote: [...] From thiago.macieira at intel.com Wed Jun 26 23:28:24 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:28:24 -0700 Subject: [Development] Header diff for QtCore In-Reply-To: <1f4a33$7ogn1q@AZSMGA002.ch.intel.com> References: <1f4a33$7ogn1q@AZSMGA002.ch.intel.com> Message-ID: <4591096.FRjckQR22e@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 13.49.36, Thiago Macieira wrote: > -// POD for Q_GLOBAL_STATIC > -template > -class QGlobalStatic class QGlobalStatic was moved to a new header, qglobalstatic.h, which doesn't show in the diff (due to --diff-filter=M). The new class is completely different from the previous, but QGlobalStatic has never been API (and still isn't, technically). Q_GLOBAL_STATIC was not API in Qt 5.0, but is now in 5.1. > +++ b/src/corelib/global/qlibraryinfo.h > @@ -84,6 +82,7 @@ public: > SysrootPath, > HostPrefixPath, > HostBinariesPath, > + HostLibrariesPath, Non-issue, the lines before SysrootPath are: #ifdef QT_BOOTSTRAPPED // These are not subject to binary compatibility constraints There are a few scary changes in the metatype and QObject connection code that I'd like Stephen and Olivier (respectively) to take a look. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Lars.Knoll at digia.com Wed Jun 26 23:36:35 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Wed, 26 Jun 2013 21:36:35 +0000 Subject: [Development] Header diff for QtWidgets In-Reply-To: Message-ID: Looks ok to me as well. Lars On 6/26/13 10:50 PM, "Thiago Macieira" wrote: >diff --git a/src/widgets/dialogs/qcolordialog.h >b/src/widgets/dialogs/qcolordialog.h >index 45ae7c2..80a31c4 100644 [...] From thiago.macieira at intel.com Wed Jun 26 23:44:48 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:44:48 -0700 Subject: [Development] Header diff for QtGui In-Reply-To: <453bf0$9k2ea9@azsmga001.ch.intel.com> References: <453bf0$9k2ea9@azsmga001.ch.intel.com> Message-ID: <10722485.5qLMJ63geF@tjmaciei-mobl2> One issue found: On quarta-feira, 26 de junho de 2013 13.49.40, Thiago Macieira wrote: > class Q_GUI_EXPORT QAccessibleInterface > { > +protected: > + virtual ~QAccessibleInterface(); > + > public: > - virtual ~QAccessibleInterface() {} SC/BC BREAK Change in protection level is not acceptable (MSVC and Sun CC mangle the protection level). The constructors are public, so it's possible to derive from this class. The destructor should go back to public. This is also an SC break, because it makes it impossible to delete a QAccessibleInterface. The rest are comments: > class Q_GUI_EXPORT QAccessible > -#ifndef qdoc > - :public QObject > -#endif > { > - Q_OBJECT > - Q_ENUMS(Role Event State) > + Q_GADGET > + Q_ENUMS(Role Event) Acceptable because QAccessible's only constructor is private. The change in class size and vtable will not affect anyone. The change from Q_OBJECT to Q_GADGET means the virtual functions are gone now (qt_metacall, qt_metacast, metaObject), but no one could call them before either. The tr() functions are gone too. That's the only question I have, because it was possible to call: QAccessible::tr("Hello"); Opinions? > --- a/src/gui/kernel/qwindow.h > +++ b/src/gui/kernel/qwindow.h > @@ -261,10 +286,12 @@ public Q_SLOTS: > void setWidth(int arg); > void setHeight(int arg); > > - void setMinimumWidth(int w); > - void setMinimumHeight(int h); > - void setMaximumWidth(int w); > - void setMaximumHeight(int h); > + Q_REVISION(1) void setMinimumWidth(int w); > + Q_REVISION(1) void setMinimumHeight(int h); > + Q_REVISION(1) void setMaximumWidth(int w); > + Q_REVISION(1) void setMaximumHeight(int h); The meta object system doesn't care about Q_REVISION. It will simply extract the information. So this is neither BIC nor SIC. However, the information is relevant to QML. QML experts, please comment on whether the change above is safe. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:46:54 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:46:54 -0700 Subject: [Development] Header diff for QtNetwork In-Reply-To: <1f4a33$7ogn2s@AZSMGA002.ch.intel.com> References: <1f4a33$7ogn2s@AZSMGA002.ch.intel.com> Message-ID: <1783709.ch6PFcBvUl@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.49.45, Thiago Macieira wrote: > diff --git a/src/network/access/qabstractnetworkcache.h > b/src/network/access/qabstractnetworkcache.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:47:01 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:47:01 -0700 Subject: [Development] Header diff for QtOpenGL In-Reply-To: <6c3329$andd3p@orsmga002.jf.intel.com> References: <6c3329$andd3p@orsmga002.jf.intel.com> Message-ID: <2655843.u451C0eeFg@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.49.47, Thiago Macieira wrote: > diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:47:09 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:47:09 -0700 Subject: [Development] Header diff for QtPrintSupport In-Reply-To: References: Message-ID: <2122518.6S4MvQEqjP@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.50.04, Thiago Macieira wrote: > diff --git a/src/printsupport/dialogs/qabstractprintdialog.h > b/src/printsupport/dialogs/qabstractprintdialog.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:51:54 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:51:54 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: <84c8a8$a0ea4b@orsmga001.jf.intel.com> References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> Message-ID: <1406113.adBsfGQ5RZ@tjmaciei-mobl2> One minor oops found: On quarta-feira, 26 de junho de 2013 13.50.06, Thiago Macieira wrote: > +++ b/src/qml/qml/qqmlextensionplugin.h > -private: > Q_DISABLE_COPY(QQmlExtensionPlugin) By removing the private:, with C++98 the error from trying to copy a Q_DISABLE_COPY moves from compile time to link time (undefined reference to QQmlExtensionPlugin's copy constructor or assignment operator). Bring it back. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:53:27 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:53:27 -0700 Subject: [Development] Header diff for QtQuickTest In-Reply-To: <453bf0$9k2ef3@azsmga001.ch.intel.com> References: <453bf0$9k2ef3@azsmga001.ch.intel.com> Message-ID: <1390475.DncDmSgV41@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.50.08, Thiago Macieira wrote: > diff --git a/src/qmltest/quicktest.h b/src/qmltest/quicktest.h > index a71a7f7..d6ffcf8 100644 > --- a/src/qmltest/quicktest.h > +++ b/src/qmltest/quicktest.h > @@ -1,6 +1,6 @@ > /************************************************************************** > ** ** > -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). > +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the test suite of the Qt Toolkit. > @@ -44,8 +44,6 @@ > > #include > > -QT_BEGIN_HEADER > - > QT_BEGIN_NAMESPACE > > Q_QUICK_TEST_EXPORT int quick_test_main(int argc, char **argv, const char > *name, const char *sourceDir); @@ -82,6 +80,4 @@ Q_QUICK_TEST_EXPORT int > quick_test_main(int argc, char **argv, const char *name, > > QT_END_NAMESPACE > > -QT_END_HEADER > - > #endif > diff --git a/src/qmltest/quicktestglobal.h b/src/qmltest/quicktestglobal.h > index 9943156..32461fd 100644 > --- a/src/qmltest/quicktestglobal.h > +++ b/src/qmltest/quicktestglobal.h > @@ -1,6 +1,6 @@ > /************************************************************************** > ** ** > -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). > +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the test suite of the Qt Toolkit. > @@ -44,7 +44,6 @@ > > #include > > -QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > #ifndef QT_STATIC > @@ -58,6 +57,5 @@ QT_BEGIN_NAMESPACE > #endif > > QT_END_NAMESPACE > -QT_END_HEADER > > #endif > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:53:36 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:53:36 -0700 Subject: [Development] Header diff for QtQuick In-Reply-To: <1f4a33$7ogn9r@AZSMGA002.ch.intel.com> References: <1f4a33$7ogn9r@AZSMGA002.ch.intel.com> Message-ID: <6100562.hkJdF0RnBC@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.50.07, Thiago Macieira wrote: > diff --git a/src/quick/designer/designersupport.h > b/src/quick/designer/designersupport.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:55:21 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:55:21 -0700 Subject: [Development] Header diff for QtScriptTools In-Reply-To: References: Message-ID: <1749656.JRnDnWpZyh@tjmaciei-mobl2> All is fine. All no-op changes. On quarta-feira, 26 de junho de 2013 13.50.11, Thiago Macieira wrote: > diff --git a/src/scripttools/debugging/qscriptenginedebugger.h > b/src/scripttools/debugging/qscriptenginedebugger.h index e380086..9589f65 > 100644 > --- a/src/scripttools/debugging/qscriptenginedebugger.h > +++ b/src/scripttools/debugging/qscriptenginedebugger.h > @@ -1,6 +1,6 @@ > /************************************************************************** > ** ** > -** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). > +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the QtSCriptTools module of the Qt Toolkit. > @@ -45,8 +45,6 @@ > #include > #include > > -QT_BEGIN_HEADER > - > QT_BEGIN_NAMESPACE > > > @@ -132,6 +130,4 @@ private: > > QT_END_NAMESPACE > > -QT_END_HEADER > - > #endif > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:55:10 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:55:10 -0700 Subject: [Development] Header diff for QtScript In-Reply-To: References: Message-ID: <17594904.kCb89tPGne@tjmaciei-mobl2> All is fine. This module had no actual changes. On quarta-feira, 26 de junho de 2013 13.50.10, Thiago Macieira wrote: > diff --git a/src/script/api/qscriptable.h b/src/script/api/qscriptable.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:56:15 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:56:15 -0700 Subject: [Development] Header diff for QtSql In-Reply-To: <1f4a33$7ognbq@AZSMGA002.ch.intel.com> References: <1f4a33$7ognbq@AZSMGA002.ch.intel.com> Message-ID: <7798590.tdLdgh5anU@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.50.12, Thiago Macieira wrote: > diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:56:32 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:56:32 -0700 Subject: [Development] Header diff for QtSvg In-Reply-To: References: Message-ID: <4236967.uxPK5ZoIL6@tjmaciei-mobl2> All is fine. All no-op changes. On quarta-feira, 26 de junho de 2013 13.50.13, Thiago Macieira wrote: > diff --git a/src/svg/qgraphicssvgitem.h b/src/svg/qgraphicssvgitem.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:58:41 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:58:41 -0700 Subject: [Development] Header diff for QtXml In-Reply-To: <1f4a33$7ogneo@AZSMGA002.ch.intel.com> References: <1f4a33$7ogneo@AZSMGA002.ch.intel.com> Message-ID: <1790681.fcYC2sMqoJ@tjmaciei-mobl2> All is fine. On quarta-feira, 26 de junho de 2013 13.50.18, Thiago Macieira wrote: > diff --git a/src/xml/dom/qdom.h b/src/xml/dom/qdom.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Wed Jun 26 23:59:00 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 14:59 -0700 Subject: [Development] Header diff for QtXmlPatterns In-Reply-To: References: Message-ID: <2501130.KxYWnIjWED@tjmaciei-mobl2> All is fine. All changes are no-op. On quarta-feira, 26 de junho de 2013 13.50.20, Thiago Macieira wrote: > diff --git a/src/xmlpatterns/api/qabstractmessagehandler.h > b/src/xmlpatterns/api/qabstractmessagehandler.h -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Thu Jun 27 00:00:24 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 15:00:24 -0700 Subject: [Development] Qt 5.1 header diff In-Reply-To: <9B4D1DADF5006F4DB6666312421B98E50100EF22@IT-EXMB01-HKI.it.local> References: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> <1765379.5UmyvvMD4s@tjmaciei-mobl2> <9B4D1DADF5006F4DB6666312421B98E50100EF22@IT-EXMB01-HKI.it.local> Message-ID: <2040579.stDPnEceKj@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 21.00.23, Ahumada Sergio wrote: > can the script post to pastebin and just send one email with all the > pastebin links ? Write a shell script for that :-) for f in *.diff; do fpaste $f; done Then copy & paste the links onto an email. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From david.faure at kdab.com Thu Jun 27 02:52:23 2013 From: david.faure at kdab.com (David Faure) Date: Thu, 27 Jun 2013 00:52:23 +0000 Subject: [Development] Qt CI improvements In-Reply-To: References: Message-ID: <1864564.hBhN7ptair@asterix> Le mercredi 26 juin 2013 14:23:33 Sarajärvi Tony a écrit : > Hi all! > > Our IT has planned a few improvements to our CI. You might be glad to hear > about these. These changes are addressing random failures in autotests we > have experiencing. Yes, very glad. Thanks a lot for improving the CI ! -- David Faure | david.faure at kdab.com | Managing Director KDAB France KDAB (France) S.A.S., a KDAB Group company Tel. France +33 (0)4 90 84 08 53, Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-independent software solutions From 416365416c at gmail.com Thu Jun 27 02:10:52 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 17:10:52 -0700 Subject: [Development] Qt 5.1 header diff In-Reply-To: <2040579.stDPnEceKj@tjmaciei-mobl2> References: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> <1765379.5UmyvvMD4s@tjmaciei-mobl2> <9B4D1DADF5006F4DB6666312421B98E50100EF22@IT-EXMB01-HKI.it.local> <2040579.stDPnEceKj@tjmaciei-mobl2> Message-ID: Here's something on pastebin: http://pastebin.com/5H4R4su8 That's an awk script I'm using to filter out the copyright and header macro changes. It's really shrinking the size of those diffs for me... -- Alan Alpert On Wed, Jun 26, 2013 at 3:00 PM, Thiago Macieira wrote: > On quarta-feira, 26 de junho de 2013 21.00.23, Ahumada Sergio wrote: >> can the script post to pastebin and just send one email with all the >> pastebin links ? > > Write a shell script for that :-) > > for f in *.diff; do fpaste $f; done > > Then copy & paste the links onto an email. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > From 416365416c at gmail.com Thu Jun 27 02:13:53 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 17:13:53 -0700 Subject: [Development] Header diff for QtDeclarative Message-ID: > [...] Looks good to me. -- Alan Alpert From thiago.macieira at intel.com Thu Jun 27 02:22:57 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 17:22:57 -0700 Subject: [Development] Qt 5.1 header diff In-Reply-To: References: <1967466.Gq0jFrFLpo@tjmaciei-mobl2> <2040579.stDPnEceKj@tjmaciei-mobl2> Message-ID: <1516195.W85hFvTrN9@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 17.10.52, Alan Alpert wrote: > Here's something on pastebin: http://pastebin.com/5H4R4su8 > > That's an awk script I'm using to filter out the copyright and header > macro changes. It's really shrinking the size of those diffs for me... It should be easy to modify the script to ignore any changes before line 40 on each file. The output of git diff is read into the Perl script (line by line) before being written to the file. The exercise is left to the reader. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Thu Jun 27 02:23:45 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 17:23:45 -0700 Subject: [Development] Header diff for QtDeclarative In-Reply-To: References: Message-ID: <5719409.9BM5EeNO28@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 17.13.53, Alan Alpert wrote: > > [...] > > Looks good to me. For QtDeclarative and QtQml, I'd like to request a re-review of the deduplication of the functions we've done. Just a second look to make sure everything is fine. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Thu Jun 27 02:23:56 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 17:23:56 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: <1406113.adBsfGQ5RZ@tjmaciei-mobl2> References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> <1406113.adBsfGQ5RZ@tjmaciei-mobl2> Message-ID: On Wed, Jun 26, 2013 at 2:51 PM, Thiago Macieira wrote: > One minor oops found: > > On quarta-feira, 26 de junho de 2013 13.50.06, Thiago Macieira wrote: >> +++ b/src/qml/qml/qqmlextensionplugin.h >> -private: >> Q_DISABLE_COPY(QQmlExtensionPlugin) > > By removing the private:, with C++98 the error from trying to copy a > Q_DISABLE_COPY moves from compile time to link time (undefined reference to > QQmlExtensionPlugin's copy constructor or assignment operator). > > Bring it back. https://codereview.qt-project.org/#change,59944 . Also qqml.h now includes qdebug.h. While not harmful, do we have a convention of not including that in public headers? -- Alan Alpert From thiago.macieira at intel.com Thu Jun 27 02:28:19 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 17:28:19 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> <1406113.adBsfGQ5RZ@tjmaciei-mobl2> Message-ID: <7075198.inf6RbDckI@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 17.23.56, Alan Alpert wrote: > Also qqml.h now includes qdebug.h. While not harmful, do we have a > convention of not including that in public headers? Does it have a reason for the include? For example, does it declare debugging operators for anything? If not, it's probably accidental and can be safely removed. Removing includes is *technically* a source-incompatible change, but one we tolerate. glibc and GCC have been cleaning up their headers for the past half a dozen releases; every upgrade turns up missing includes that people relied on. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Thu Jun 27 02:42:54 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 17:42:54 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: <7075198.inf6RbDckI@tjmaciei-mobl2> References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> <1406113.adBsfGQ5RZ@tjmaciei-mobl2> <7075198.inf6RbDckI@tjmaciei-mobl2> Message-ID: On Wed, Jun 26, 2013 at 5:28 PM, Thiago Macieira wrote: > On quarta-feira, 26 de junho de 2013 17.23.56, Alan Alpert wrote: >> Also qqml.h now includes qdebug.h. While not harmful, do we have a >> convention of not including that in public headers? > > Does it have a reason for the include? For example, does it declare debugging > operators for anything? If not, it's probably accidental and can be safely > removed. It uses qWarning() in the definition of a new inline function (the url form of qmlRegisterType). Sounds like it's okay to leave it there, although the function could be un-inlined if the include is a problem. > Removing includes is *technically* a source-incompatible change, but one we > tolerate. glibc and GCC have been cleaning up their headers for the past half > a dozen releases; every upgrade turns up missing includes that people relied > on. The include is new in 5.1. Although you might just be warning me to be careful about what includes get in in the first place. -- Alan Alpert On Wed, Jun 26, 2013 at 5:28 PM, Thiago Macieira wrote: > On quarta-feira, 26 de junho de 2013 17.23.56, Alan Alpert wrote: >> Also qqml.h now includes qdebug.h. While not harmful, do we have a >> convention of not including that in public headers? > > Does it have a reason for the include? For example, does it declare debugging > operators for anything? If not, it's probably accidental and can be safely > removed. > > Removing includes is *technically* a source-incompatible change, but one we > tolerate. glibc and GCC have been cleaning up their headers for the past half > a dozen releases; every upgrade turns up missing includes that people relied > on. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > From chris.adams at qinetic.com.au Thu Jun 27 03:20:39 2013 From: chris.adams at qinetic.com.au (Chris Adams) Date: Thu, 27 Jun 2013 11:20:39 +1000 Subject: [Development] [QtPim] Pending Merge Requests In-Reply-To: References: Message-ID: Hi, Alex Blasche is looking at various QtAddOn modules which are evolutions of the old QtMobility modules. There's still some work to be done to determine which modules are candidates for improvement up to the point where they're releasable, and more work to be done to figure out how many community members we have who can commit to helping with these modules. I believe Alex was hoping to discuss the topic with folks at the QtCS. Currently, Robin Burchell, Lorn Potter, Aaron McCarthy and myself are all "interested" in helping Alex with this effort, but of course it's dependent on free time etc; the more people who are willing to help out (and the better organised we can make the effort) the better :-) Cheers, Chris. On Thu, Jun 27, 2013 at 4:02 AM, Renato Araujo wrote: > > Hi list, > > I would like to know if there is any official maintainer for the QtPim > module? or who I can ping on IRC to talk about the QtPim and some features > that I would like to implement? > > Another point I is that I have 3 pending MR for QtPim and I would like > receive some feedback about it. Two[1][2] MR are bug fix and I would be > happy to have this merged as soon as possible, and the other[3] is > some optimizations on the current QContactModel. > > > Thanks > Renato Araujo Oliveira Filho > > [1]https://codereview.qt-project.org/59156 > [2]https://codereview.qt-project.org/59473 > [3]https://codereview.qt-project.org/59931 > > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Thu Jun 27 05:10:26 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Wed, 26 Jun 2013 20:10:26 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> <7075198.inf6RbDckI@tjmaciei-mobl2> Message-ID: <1545171.hiBsdkJ7kX@tjmaciei-mobl2> On quarta-feira, 26 de junho de 2013 17.42.54, Alan Alpert wrote: > > Does it have a reason for the include? For example, does it declare > > debugging operators for anything? If not, it's probably accidental and > > can be safely removed. > > It uses qWarning() in the definition of a new inline function (the url > form of qmlRegisterType). Sounds like it's okay to leave it there, > although the function could be un-inlined if the include is a problem. I'd prefer that. Or use the non-streaming version of qWarning(), which doesn't require qdebug.h (only qlogging.h, which is included from qglobal.h). -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Thu Jun 27 06:30:17 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Wed, 26 Jun 2013 21:30:17 -0700 Subject: [Development] Header diff for QtQml In-Reply-To: <1545171.hiBsdkJ7kX@tjmaciei-mobl2> References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> <7075198.inf6RbDckI@tjmaciei-mobl2> <1545171.hiBsdkJ7kX@tjmaciei-mobl2> Message-ID: On Wed, Jun 26, 2013 at 8:10 PM, Thiago Macieira wrote: > On quarta-feira, 26 de junho de 2013 17.42.54, Alan Alpert wrote: >> > Does it have a reason for the include? For example, does it declare >> > debugging operators for anything? If not, it's probably accidental and >> > can be safely removed. >> >> It uses qWarning() in the definition of a new inline function (the url >> form of qmlRegisterType). Sounds like it's okay to leave it there, >> although the function could be un-inlined if the include is a problem. > > I'd prefer that. Or use the non-streaming version of qWarning(), which doesn't > require qdebug.h (only qlogging.h, which is included from qglobal.h). https://codereview.qt-project.org/#change,59948 implements the latter, for your perusal. -- Alan Alpert From Shawn.Rutledge at digia.com Thu Jun 27 07:38:34 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Thu, 27 Jun 2013 05:38:34 +0000 Subject: [Development] Header diff for QtQml In-Reply-To: <1406113.adBsfGQ5RZ@tjmaciei-mobl2> References: <84c8a8$a0ea4b@orsmga001.jf.intel.com> <1406113.adBsfGQ5RZ@tjmaciei-mobl2> Message-ID: <639AA918-1404-4B67-858A-1BA90C7075AB@digia.com> On 26 Jun 2013, at 11:51 PM, Thiago Macieira wrote: > One minor oops found: > > On quarta-feira, 26 de junho de 2013 13.50.06, Thiago Macieira wrote: >> +++ b/src/qml/qml/qqmlextensionplugin.h >> -private: >> Q_DISABLE_COPY(QQmlExtensionPlugin) > > By removing the private:, with C++98 the error from trying to copy a > Q_DISABLE_COPY moves from compile time to link time (undefined reference to > QQmlExtensionPlugin's copy constructor or assignment operator). > > Bring it back. Sorry about that; I'm not sure how that happened. From Thomas.Hartmann at digia.com Thu Jun 27 09:13:37 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Thu, 27 Jun 2013 09:13:37 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> Message-ID: <51CBE621.50201@digia.com> Hi Am 26/06/2013 20:09, schrieb Alan Alpert: > The difference is that 'when' is a binding evaluated as a boolean, not > a property change signal. You can do "when: alpha.ready && beta.ready > && maybeOtherStuff()". You cannot conceptually do "when: > alpha.readyChanged && beta.readyChanged" because signal && signal does > not compute. We could assign an arbitrary meaning to it, but I think > that's getting more confusing by that point... I agree. We just have to make sure that "triggers" can also react to several signals. We could consider something like this: State { name: "someState" triggers: [ SignalTrigger { leave: false //default target: someButton signal: clicked } ConditionTrigger { condition: someBackEnd.someValue === 10 } //Different from when, because state change is triggered when //condition becomes true, but we do not leave the state automatically //if the condition becomes false again. ConditionTrigger { leave: true leaveToState: "" condition: someBackEnd.someValue === 12 } //This time we leave the state to the base state ] } This is just brainstorming. We should also consider moving these "Triggers" into Transitions instead. Another feature that I needed sometimes (independent from tooling) was a state that automatically changes into another state (for animations). Something like: State { name: "someState" nextState: "someOtherState" } This is currently only doable by ScriptActions. Kind Regards, Thomas Hartmann From simon.hausmann at digia.com Thu Jun 27 09:32:33 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Thu, 27 Jun 2013 09:32:33 +0200 Subject: [Development] Header diff for QtMultimedia In-Reply-To: <1f4a33$7ogn2b@AZSMGA002.ch.intel.com> References: <1f4a33$7ogn2b@AZSMGA002.ch.intel.com> Message-ID: <2534538.L4NFk8CufI@rhea> [...] > @@ -66,6 +64,7 @@ struct Q_MULTIMEDIA_EXPORT QAudioSystemFactoryInterface > virtual QAbstractAudioInput* createInput(const QByteArray& device) = 0; > virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = 0; > virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& > device, QAudio::Mode mode) = 0; + virtual > ~QAudioSystemFactoryInterface(); > }; That's a known one I guess? Simon From Lars.Knoll at digia.com Thu Jun 27 09:39:57 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Thu, 27 Jun 2013 07:39:57 +0000 Subject: [Development] Header diff for QtMultimedia In-Reply-To: <2534538.L4NFk8CufI@rhea> Message-ID: On 6/27/13 9:32 AM, "Simon Hausmann" wrote: >[...] >> @@ -66,6 +64,7 @@ struct Q_MULTIMEDIA_EXPORT >>QAudioSystemFactoryInterface >> virtual QAbstractAudioInput* createInput(const QByteArray& device) >>= 0; >> virtual QAbstractAudioOutput* createOutput(const QByteArray& device) = >>0; >> virtual QAbstractAudioDeviceInfo* createDeviceInfo(const QByteArray& >> device, QAudio::Mode mode) = 0; + virtual >> ~QAudioSystemFactoryInterface(); >> }; > >That's a known one I guess? Yes. It's in the backend API, so that's fine. Cheers, Lars From mardy at users.sourceforge.net Thu Jun 27 09:43:50 2013 From: mardy at users.sourceforge.net (Alberto Mardegan) Date: Thu, 27 Jun 2013 10:43:50 +0300 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> Message-ID: <51CBED36.1060502@users.sourceforge.net> On 06/26/2013 08:38 PM, Alan Alpert wrote: > I agree. There should be a purely declarative approach for all the > "pure UI" parts, and a "triggers" property on State or a > StateChangeConnections element would be an improvement. What about this? onMySignal: PropertyChanges { target: myObject status: "dead" } Ciao, Alberto -- http://blog.mardy.it <- geek in un lingua international! From njeisecke at saltation.de Thu Jun 27 09:47:18 2013 From: njeisecke at saltation.de (Nils Jeisecke) Date: Thu, 27 Jun 2013 09:47:18 +0200 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: References: Message-ID: HI Alan, see the following example for a real use case. I wouldn't say this is bad QML. Destroying the loader's component will also destroy the component's myTools row, although it has been reparented to another item. For this use case it's just the right behavior but to be honest I've not yet fully understood why. There must be a visual parent and an independent ownership child list. mail.qml --- import QtQuick 2.0 Item { width: 400 height: 400 Row { id: toolContainer } Loader { id: loader anchors.top: toolContainer.bottom source: "DynamicallyLoadedComponent.qml" } MouseArea { anchors.fill: parent onClicked: loader.source = "" // click to destroy component instance } } DynamicallyLoadedComponent.qml ---- import QtQuick 2.0 Text { text: "Bla Bla" Row { id: myTools parent: toolContainer // <<<<< reparented! Component.onDestruction: console.log("destroyed") Repeater { model: 5 Text { text: "Tool " + modelData } } } } Nils From Fawzi.Mohamed at digia.com Thu Jun 27 10:55:34 2013 From: Fawzi.Mohamed at digia.com (Mohamed Fawzi) Date: Thu, 27 Jun 2013 08:55:34 +0000 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CABBC6.1010802@digia.com> Message-ID: <19C7819B-EA8C-4E3C-B6E3-299A1239BE58@digia.com> On 26 Jun 2013, at 14:26, Rutledge Shawn wrote: > > On 26 Jun 2013, at 12:00 PM, Thomas Hartmann wrote: > >>> - Editors: A lot of IDE's out there understand .js files. Writing a parser for only the declarative parts of QML is relatively easy. Writing a parser for .qml files that also understands all of JS, not so easy. >> >> We provide a QML parser that includes Java Script as open source. Anyone >> who wants to parse QML is most likely to use this one and even if not he >> has access to the complete grammar. So this is not really an issue. > > I see it as an issue if you had to write that parser. No wonder it's out of sync with the actual language parser. The one in declarative should have all the features that you need, with suitable (ideally even public) APIs to access those features, it should be in the declarative module, and there should be autotests to keep it consistent. So the workflow for tooling should be that you use the declarative parser to get the AST, the tooling has the opportunity to modify the AST whenever the user does something, then you can send it on to the engine for rendering a preview, and you can also regenerate the source code by pretty-printing the AST. That means the AST must be complete: it must include Javascript (even if they are only unmodifiable blobs) and comments, so that the pretty-printing will generate the same source code with only the changes the user wanted to make. But for optimization purposes there could be a parameter to the parser to ignore the comments, because > tooling needs them whereas the interpreter does not. Not sure what you mean here, "that parser" is generated automatically from the declarative parser, and should be up to date. I you know places where the parser is outdated (which would be strange seeing from where it comes) please file a bug (from your talking it seems common knowledge, but it definitely isn't so). Creator cannot use the declarative parser directly for a couple of reasons: * we want more recovery when things fail, as while editing it is easy to have incorrect code * creator is not bound to a single qt version, so to work consistently it needs its own version Parsing a language, doesn't mean tooling and understanding it. From frederik.gladhorn at digia.com Thu Jun 27 11:03:03 2013 From: frederik.gladhorn at digia.com (Frederik Gladhorn) Date: Thu, 27 Jun 2013 11:03:03 +0200 Subject: [Development] Header diff for QtGui In-Reply-To: <10722485.5qLMJ63geF@tjmaciei-mobl2> References: <453bf0$9k2ea9@azsmga001.ch.intel.com> <10722485.5qLMJ63geF@tjmaciei-mobl2> Message-ID: <1403805.d5RllJohEN@varney> Since we were unsure about the accessibility classes we had QAccessible* marked as internal documentation wise, but sadly not moved the headers to be _p.h. The plan is to make them public for 5.2. Onsdag 26. juni 2013 14.44.48 skrev Thiago Macieira: > One issue found: > > On quarta-feira, 26 de junho de 2013 13.49.40, Thiago Macieira wrote: > > class Q_GUI_EXPORT QAccessibleInterface > > { > > > > +protected: > > + virtual ~QAccessibleInterface(); > > + > > > > public: > > - virtual ~QAccessibleInterface() {} > > SC/BC BREAK > > Change in protection level is not acceptable (MSVC and Sun CC mangle the > protection level). The constructors are public, so it's possible to derive > from this class. > > The destructor should go back to public. > > This is also an SC break, because it makes it impossible to delete a > QAccessibleInterface. This was done intentionally since the class is currently internal and we want to prevent mis-use in the future (the interfaces are managed in a cache and should never be deleted by the user). This breakage was done intentionally since so far no one should have used the class. In my opinion making the dtor public is a step back and I seriously doubt that anyone is using this at the moment. > > The rest are comments: > > class Q_GUI_EXPORT QAccessible > > > > -#ifndef qdoc > > - :public QObject > > -#endif > > > > { > > > > - Q_OBJECT > > - Q_ENUMS(Role Event State) > > + Q_GADGET > > + Q_ENUMS(Role Event) > > Acceptable because QAccessible's only constructor is private. The change in > class size and vtable will not affect anyone. > > The change from Q_OBJECT to Q_GADGET means the virtual functions are gone > now (qt_metacall, qt_metacast, metaObject), but no one could call them > before either. > > The tr() functions are gone too. That's the only question I have, because it > was possible to call: > QAccessible::tr("Hello"); That would be misusing the tr function since the context should be the actual context not a random one (almost as bad as QObject::tr which is a no-no unless the string is in QObject). > > Opinions? > > > --- a/src/gui/kernel/qwindow.h > > +++ b/src/gui/kernel/qwindow.h > > > > @@ -261,10 +286,12 @@ public Q_SLOTS: > > void setWidth(int arg); > > void setHeight(int arg); > > > > - void setMinimumWidth(int w); > > - void setMinimumHeight(int h); > > - void setMaximumWidth(int w); > > - void setMaximumHeight(int h); > > + Q_REVISION(1) void setMinimumWidth(int w); > > + Q_REVISION(1) void setMinimumHeight(int h); > > + Q_REVISION(1) void setMaximumWidth(int w); > > + Q_REVISION(1) void setMaximumHeight(int h); > > The meta object system doesn't care about Q_REVISION. It will simply extract > the information. So this is neither BIC nor SIC. > > However, the information is relevant to QML. QML experts, please comment on > whether the change above is safe. If it was in the 5.0 release, I would say the properties should still be there and thus the Q_REVISION be removed since the classes otherwise suddenly lose the setters. -- Best regards, Frederik Gladhorn Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com From Lars.Knoll at digia.com Thu Jun 27 12:04:18 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Thu, 27 Jun 2013 10:04:18 +0000 Subject: [Development] Header diff for QtMultimediaWidgets In-Reply-To: <453bf0$9k2eah@azsmga001.ch.intel.com> Message-ID: Nothing to see here :) Cheers, Lars On 6/26/13 10:49 PM, "Thiago Macieira" wrote: >diff --git a/src/multimediawidgets/qcameraviewfinder.h >b/src/multimediawidgets/qcameraviewfinder.h >index 134ec41..4b3f7d08 100644 >--- a/src/multimediawidgets/qcameraviewfinder.h >+++ b/src/multimediawidgets/qcameraviewfinder.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the Qt Toolkit. >@@ -53,8 +53,6 @@ > #include > #include > >-QT_BEGIN_HEADER >- > QT_BEGIN_NAMESPACE > > >@@ -80,7 +78,5 @@ private: > > QT_END_NAMESPACE > >-QT_END_HEADER >- > > #endif // QCAMERA_H >diff --git a/src/multimediawidgets/qgraphicsvideoitem.h >b/src/multimediawidgets/qgraphicsvideoitem.h >index 6137846..6db81a5 100644 >--- a/src/multimediawidgets/qgraphicsvideoitem.h >+++ b/src/multimediawidgets/qgraphicsvideoitem.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the Qt Toolkit. >@@ -47,8 +47,6 @@ > #include > #include > >-QT_BEGIN_HEADER >- > QT_BEGIN_NAMESPACE > > class QVideoSurfaceFormat; >@@ -107,7 +105,5 @@ private: > > QT_END_NAMESPACE > >-QT_END_HEADER >- > > #endif >diff --git a/src/multimediawidgets/qtmultimediawidgetdefs.h >b/src/multimediawidgets/qtmultimediawidgetdefs.h >index b5da320..73b8b50 100644 >--- a/src/multimediawidgets/qtmultimediawidgetdefs.h >+++ b/src/multimediawidgets/qtmultimediawidgetdefs.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the Qt Toolkit. >@@ -55,7 +55,6 @@ > > #include > >-QT_BEGIN_HEADER > QT_BEGIN_NAMESPACE > > #ifndef QT_STATIC >@@ -69,7 +68,6 @@ QT_BEGIN_NAMESPACE > #endif > > QT_END_NAMESPACE >-QT_END_HEADER > > #endif // QMULTIMEDIAWIDGETS_P_H > >diff --git a/src/multimediawidgets/qvideowidget.h >b/src/multimediawidgets/qvideowidget.h >index 8ffaffb..ec71bb6 100644 >--- a/src/multimediawidgets/qvideowidget.h >+++ b/src/multimediawidgets/qvideowidget.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the Qt Toolkit. >@@ -47,8 +47,6 @@ > #include > #include > >-QT_BEGIN_HEADER >- > QT_BEGIN_NAMESPACE > > >@@ -131,7 +129,5 @@ private: > > QT_END_NAMESPACE > >-QT_END_HEADER >- > > #endif >diff --git a/src/multimediawidgets/qvideowidgetcontrol.h >b/src/multimediawidgets/qvideowidgetcontrol.h >index 8726210..b5c1306 100644 >--- a/src/multimediawidgets/qvideowidgetcontrol.h >+++ b/src/multimediawidgets/qvideowidgetcontrol.h >@@ -1,6 +1,6 @@ > >/************************************************************************* >*** > ** >-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). >+** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). > ** Contact: http://www.qt-project.org/legal > ** > ** This file is part of the Qt Toolkit. >@@ -47,8 +47,6 @@ > > #include > >-QT_BEGIN_HEADER >- > QT_BEGIN_NAMESPACE > > >@@ -97,7 +95,5 @@ Q_MEDIA_DECLARE_CONTROL(QVideoWidgetControl, >QVideoWidgetControl_iid) > > QT_END_NAMESPACE > >-QT_END_HEADER >- > > #endif >_______________________________________________ >Development mailing list >Development at qt-project.org >http://lists.qt-project.org/mailman/listinfo/development From Lars.Knoll at digia.com Thu Jun 27 14:22:51 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Thu, 27 Jun 2013 12:22:51 +0000 Subject: [Development] Header diff for QtGui In-Reply-To: <1403805.d5RllJohEN@varney> Message-ID: Ok, explanation sounds reasonable to me, and given that the classes were documented as internal this is acceptable IMO. Cheers, Lars On 6/27/13 11:03 AM, "Frederik Gladhorn" wrote: >Since we were unsure about the accessibility classes we had QAccessible* >marked as internal documentation wise, but sadly not moved the headers to >be >_p.h. >The plan is to make them public for 5.2. > >Onsdag 26. juni 2013 14.44.48 skrev Thiago Macieira: >> One issue found: >> >> On quarta-feira, 26 de junho de 2013 13.49.40, Thiago Macieira wrote: >> > class Q_GUI_EXPORT QAccessibleInterface >> > { >> > >> > +protected: >> > + virtual ~QAccessibleInterface(); >> > + >> > >> > public: >> > - virtual ~QAccessibleInterface() {} >> >> SC/BC BREAK >> >> Change in protection level is not acceptable (MSVC and Sun CC mangle the >> protection level). The constructors are public, so it's possible to >>derive >> from this class. >> >> The destructor should go back to public. >> >> This is also an SC break, because it makes it impossible to delete a >> QAccessibleInterface. > >This was done intentionally since the class is currently internal and we >want >to prevent mis-use in the future (the interfaces are managed in a cache >and >should never be deleted by the user). >This breakage was done intentionally since so far no one should have used >the >class. >In my opinion making the dtor public is a step back and I seriously doubt >that >anyone is using this at the moment. > >> >> The rest are comments: >> > class Q_GUI_EXPORT QAccessible >> > >> > -#ifndef qdoc >> > - :public QObject >> > -#endif >> > >> > { >> > >> > - Q_OBJECT >> > - Q_ENUMS(Role Event State) >> > + Q_GADGET >> > + Q_ENUMS(Role Event) >> >> Acceptable because QAccessible's only constructor is private. The >>change in >> class size and vtable will not affect anyone. >> >> The change from Q_OBJECT to Q_GADGET means the virtual functions are >>gone >> now (qt_metacall, qt_metacast, metaObject), but no one could call them >> before either. >> >> The tr() functions are gone too. That's the only question I have, >>because it >> was possible to call: >> QAccessible::tr("Hello"); >That would be misusing the tr function since the context should be the >actual >context not a random one (almost as bad as QObject::tr which is a no-no >unless >the string is in QObject). > >> >> Opinions? >> >> > --- a/src/gui/kernel/qwindow.h >> > +++ b/src/gui/kernel/qwindow.h >> > >> > @@ -261,10 +286,12 @@ public Q_SLOTS: >> > void setWidth(int arg); >> > void setHeight(int arg); >> > >> > - void setMinimumWidth(int w); >> > - void setMinimumHeight(int h); >> > - void setMaximumWidth(int w); >> > - void setMaximumHeight(int h); >> > + Q_REVISION(1) void setMinimumWidth(int w); >> > + Q_REVISION(1) void setMinimumHeight(int h); >> > + Q_REVISION(1) void setMaximumWidth(int w); >> > + Q_REVISION(1) void setMaximumHeight(int h); >> >> The meta object system doesn't care about Q_REVISION. It will simply >>extract >> the information. So this is neither BIC nor SIC. >> >> However, the information is relevant to QML. QML experts, please >>comment on >> whether the change above is safe. >If it was in the 5.0 release, I would say the properties should still be >there >and thus the Q_REVISION be removed since the classes otherwise suddenly >lose >the setters. > >-- >Best regards, >Frederik Gladhorn >Senior Software Engineer - Digia, Qt >Visit us on: http://qt.digia.com > >_______________________________________________ >Development mailing list >Development at qt-project.org >http://lists.qt-project.org/mailman/listinfo/development From thiago.macieira at intel.com Thu Jun 27 17:17:31 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 27 Jun 2013 08:17:31 -0700 Subject: [Development] Header diff for QtGui In-Reply-To: References: Message-ID: <2132496.TL6WRFnay3@tjmaciei-mobl2> On quinta-feira, 27 de junho de 2013 12.22.51, Knoll Lars wrote: > Ok, explanation sounds reasonable to me, and given that the classes were > documented as internal this is acceptable IMO. Agreed. But we need an explanation on the QML side for QWindow: > >> > --- a/src/gui/kernel/qwindow.h > >> > +++ b/src/gui/kernel/qwindow.h > >> > @@ -261,10 +286,12 @@ public Q_SLOTS: > >> > void setWidth(int arg); > >> > void setHeight(int arg); > >> > > >> > - void setMinimumWidth(int w); > >> > - void setMinimumHeight(int h); > >> > - void setMaximumWidth(int w); > >> > - void setMaximumHeight(int h); > >> > + Q_REVISION(1) void setMinimumWidth(int w); > >> > + Q_REVISION(1) void setMinimumHeight(int h); > >> > + Q_REVISION(1) void setMaximumWidth(int w); > >> > + Q_REVISION(1) void setMaximumHeight(int h); > >> > >> The meta object system doesn't care about Q_REVISION. It will simply > >>extract > >> the information. So this is neither BIC nor SIC. > >> > >> However, the information is relevant to QML. QML experts, please > >>comment on > >> whether the change above is safe. > > > >If it was in the 5.0 release, I would say the properties should still be > >there > >and thus the Q_REVISION be removed since the classes otherwise suddenly > >lose > >the setters. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From Lars.Knoll at digia.com Thu Jun 27 17:21:26 2013 From: Lars.Knoll at digia.com (Knoll Lars) Date: Thu, 27 Jun 2013 15:21:26 +0000 Subject: [Development] Header diff for QtGui In-Reply-To: <2132496.TL6WRFnay3@tjmaciei-mobl2> Message-ID: On 6/27/13 5:17 PM, "Thiago Macieira" wrote: >On quinta-feira, 27 de junho de 2013 12.22.51, Knoll Lars wrote: >> Ok, explanation sounds reasonable to me, and given that the classes were >> documented as internal this is acceptable IMO. > >Agreed. But we need an explanation on the QML side for QWindow: Alan, any comments? Lars > >> >> > --- a/src/gui/kernel/qwindow.h >> >> > +++ b/src/gui/kernel/qwindow.h >> >> > @@ -261,10 +286,12 @@ public Q_SLOTS: >> >> > void setWidth(int arg); >> >> > void setHeight(int arg); >> >> > >> >> > - void setMinimumWidth(int w); >> >> > - void setMinimumHeight(int h); >> >> > - void setMaximumWidth(int w); >> >> > - void setMaximumHeight(int h); >> >> > + Q_REVISION(1) void setMinimumWidth(int w); >> >> > + Q_REVISION(1) void setMinimumHeight(int h); >> >> > + Q_REVISION(1) void setMaximumWidth(int w); >> >> > + Q_REVISION(1) void setMaximumHeight(int h); >> >> >> >> The meta object system doesn't care about Q_REVISION. It will simply >> >>extract >> >> the information. So this is neither BIC nor SIC. >> >> >> >> However, the information is relevant to QML. QML experts, please >> >>comment on >> >> whether the change above is safe. >> > >> >If it was in the 5.0 release, I would say the properties should still >>be >> >there >> >and thus the Q_REVISION be removed since the classes otherwise suddenly >> >lose >> >the setters. >-- >Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center >_______________________________________________ >Development mailing list >Development at qt-project.org >http://lists.qt-project.org/mailman/listinfo/development From Marco.Bubke at digia.com Thu Jun 27 17:58:59 2013 From: Marco.Bubke at digia.com (Bubke Marco) Date: Thu, 27 Jun 2013 15:58:59 +0000 Subject: [Development] Qml/Quick Designe Decision Wiki or how to avoid generating work for other stakeholders Message-ID: Hi We have some implicit design decisions in Qml/Quick/FxItems but there is not really a documentation for it so changes are happen which are really hurting. Let give me a example: Every graphical item should be derived from QQuickItem. So for graphical content in a Qml file there should be a item as root object. But now there is ApplicationWindow which looks a little bit like a bastard. It is actually a QuickView aka a Window with the special property contentItem. So we break a design decisions which is really hurting the qml designer. Thomas has written some magic code after he has seen the wizard of Oz with his daughter but you know he hasn't still not seen all this Harry Potter movies so it is working somewhat but not very well. To get it working very well we had to rewrite our adaption code around the existing C++ interface of Qml. And how Alan stated it, it is not a clean interface. It would take much time and would generate new bugs. You see this is generating work. Work which would be not existing if we would had sticked to the design decision that every graphical item is a quick item. So my proposal is to write all this informal decisions down in a wiki. If anybody wants to change that he should ask every stakeholder if it is ok etc.. Maybe something like the PEPs in Python. Best regards, Marco -------------- next part -------------- An HTML attachment was scrubbed... URL: From frederik.gladhorn at digia.com Thu Jun 27 18:30:59 2013 From: frederik.gladhorn at digia.com (Frederik Gladhorn) Date: Thu, 27 Jun 2013 18:30:59 +0200 Subject: [Development] Header diff for QtGui In-Reply-To: References: Message-ID: <5026199.FKYGbcHdqq@varney> Torsdag 27. juni 2013 15.21.26 skrev Knoll Lars: > On 6/27/13 5:17 PM, "Thiago Macieira" wrote: > >On quinta-feira, 27 de junho de 2013 12.22.51, Knoll Lars wrote: > >> Ok, explanation sounds reasonable to me, and given that the classes were > >> documented as internal this is acceptable IMO. > > > >Agreed. But we need an explanation on the QML side for QWindow: > Alan, any comments? > > Lars After investigating Shawn wrote a patch to revert the Q_REVISION. https://codereview.qt-project.org/#change,60047 The properties were added wrongly and will break applications using the 5.0 import and this part of the API. Cheers Frederik > >> >> > --- a/src/gui/kernel/qwindow.h > >> >> > +++ b/src/gui/kernel/qwindow.h > >> >> > > >> >> > @@ -261,10 +286,12 @@ public Q_SLOTS: > >> >> > void setWidth(int arg); > >> >> > void setHeight(int arg); > >> >> > > >> >> > - void setMinimumWidth(int w); > >> >> > - void setMinimumHeight(int h); > >> >> > - void setMaximumWidth(int w); > >> >> > - void setMaximumHeight(int h); > >> >> > + Q_REVISION(1) void setMinimumWidth(int w); > >> >> > + Q_REVISION(1) void setMinimumHeight(int h); > >> >> > + Q_REVISION(1) void setMaximumWidth(int w); > >> >> > + Q_REVISION(1) void setMaximumHeight(int h); > >> >> > >> >> The meta object system doesn't care about Q_REVISION. It will simply > >> >> > >> >>extract > >> >> > >> >> the information. So this is neither BIC nor SIC. > >> >> > >> >> However, the information is relevant to QML. QML experts, please > >> >> > >> >>comment on > >> >> > >> >> whether the change above is safe. > >> > > >> >If it was in the 5.0 release, I would say the properties should still > >> > >>be > >> > >> >there > >> >and thus the Q_REVISION be removed since the classes otherwise suddenly > >> >lose > >> >the setters. > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development -- Best regards, Frederik Gladhorn Senior Software Engineer - Digia, Qt Visit us on: http://qt.digia.com From thiago.macieira at intel.com Thu Jun 27 19:46:56 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Thu, 27 Jun 2013 10:46:56 -0700 Subject: [Development] Announcing git-gerrit-pick In-Reply-To: <3660697.N1R1SakqtW@tjmaciei-mobl2> References: <3660697.N1R1SakqtW@tjmaciei-mobl2> Message-ID: <4211202.97xzzbHhJW@tjmaciei-mobl2> On terça-feira, 9 de abril de 2013 12.44.46, Thiago Macieira wrote: > https://codereview.qt-project.org/50795 And now it's abandoned. If anyone wants the script, contact me. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From oswald.buddenhagen at digia.com Thu Jun 27 20:59:02 2013 From: oswald.buddenhagen at digia.com (Oswald Buddenhagen) Date: Thu, 27 Jun 2013 20:59:02 +0200 Subject: [Development] FYI: mass disabling of (apparently) dead JIRA accounts Message-ID: <20130627185902.GA6481@troll08.it.local> moin, i shut down some tens of jira accounts that appear to belong to departed colleagues, to reduce the confusion when assigning tasks and assessing the likelihood of something getting fixed (not all accounts were helpfully marked with "closed nokia identity", and i'd like to get rid of that anyway). caveats: - if your account was disabled but you were no zombie to start with, you should complain, obviously. however, i'll demand a blood test. ;) - this disabling also affects gerrit accounts. so if you didn't use your jira account for a long time and it escaped my attention that you actually are an active contributor under that account, you may find yourself locked out. just give me a heads-up, and we'll figure it out. - in a few accounts which clearly are used i changed @nokia.com => @digia.com where i knew that the person was transferred (or re-hired later). however, i can't check every nokia account... - from some active accounts i removed "real name extensions" which were clearly meant to disambiguate them from the now deactivated accounts. just in case you wonder... - if you still find zombie accounts that should be disabled, let me know as well. From 416365416c at gmail.com Fri Jun 28 09:14:41 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 00:14:41 -0700 Subject: [Development] Qml/Quick Designe Decision Wiki or how to avoid generating work for other stakeholders In-Reply-To: References: Message-ID: On Thu, Jun 27, 2013 at 8:58 AM, Bubke Marco wrote: > Hi > > We have some implicit design decisions in Qml/Quick/FxItems but there is not > really a documentation for it > so changes are happen which are really hurting. Let give me a example: > > Every graphical item should be derived from QQuickItem. So for graphical > content in a Qml file there should be a item as root object. But now there > is ApplicationWindow which looks a little bit like a bastard. It is actually > a QuickView aka a Window with the special property contentItem. So we break > a design decisions which is really hurting the qml designer. Thomas has > written some magic code after he has seen the wizard of Oz with his daughter > but you know he hasn't still not seen all this Harry Potter movies so it is > working somewhat but not very well. To get it working very well we had to > rewrite our adaption code around the existing C++ interface of Qml. And how > Alan stated it, it is not a clean interface. It would take much time and > would generate new bugs. You see this is generating work. Work which would > be not existing if we would had sticked to the design decision that every > graphical item is a quick item. Every item in the graphical scene still is a QQuickItem. A QQuickWindow encapsulates a new graphical scene, and I don't quite have the magic to contain a new scene inside itself. I don't think we want to go down the QWidget route of having every top level item implicitly create a window. It worked for widgets because it fit naturally into their static and boxy implementation. In QtQuick, where you throw Items and Rectangles around like candy just to build the same functionality as a single widget (still less LoC, but a lot more QObjects...), I can't see that working very well (until someone builds it and proves me wrong ;)). > So my proposal is to write all this informal decisions down in a wiki. If > anybody wants to change that he should ask every stakeholder if it is ok > etc.. *informal* and *implicit* decisions are by their nature hard to reliably recognize and write down. I have no objection to writing up QtQuick architecture in a wiki page that we can all contribute to and discuss (here's a start: http://qt-project.org/wiki/Qt_Quick_Architecture ), but we can't rely on all the hidden details being there. Otherwise they wouldn't be hidden. As for asking every stakeholder, I fully agree that all changes to the design should be discussed on the development ML. If that doesn't reach every stakeholder, then maybe we need a new ML? > Maybe something like the PEPs in Python. I don't think that would work for an element set. Maybe for additions to the QML language, but the QtQuick QML types are not a language feature. They're also still in a rapid growth state, so I would prefer a process no more cumbersome than an ML discussion (maybe update a wiki page). PEPs looks a little heavy to me, at least for this stage in the maturation of the module. -- Alan Alpert From 416365416c at gmail.com Fri Jun 28 09:25:34 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 00:25:34 -0700 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: References: Message-ID: On Thu, Jun 27, 2013 at 12:47 AM, Nils Jeisecke wrote: > HI Alan, > > see the following example for a real use case. I wouldn't say this is bad QML. I would. You have two declarations about its place in the item tree. We could change the order of evaluation so that we evaluate "parent: ..." before the implicit "data: ..." and then it wouldn't work! And it's bad QML if you're relying on the order statements are evaluated in (something you shouldn't be doing in any declarative language). > Destroying the loader's component will also destroy the component's > myTools row, although it has been reparented to another item. For this > use case it's just the right behavior but to be honest I've not yet > fully understood why. There must be a visual parent and an independent > ownership child list. There is. The QQuickItem tree and the QObject tree are technically separate. Usually when you assign QQuickItem parentage it also assigns QObject parentage, but that's because of how the QML language implicitly defines a QObject tree in a similar way to how QQuickItem does it. Using "parent:" messes that up. -- Alan Alpert From Thomas.Hartmann at digia.com Fri Jun 28 09:34:35 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Fri, 28 Jun 2013 09:34:35 +0200 Subject: [Development] Qml/Quick Designe Decision Wiki or how to avoid generating work for other stakeholders In-Reply-To: References: Message-ID: <51CD3C8B.6000201@digia.com> Hi, >> Every graphical item should be derived from QQuickItem. So for graphical >> content in a Qml file there should be a item as root object. But now there >> is ApplicationWindow which looks a little bit like a bastard. It is actually >> a QuickView aka a Window with the special property contentItem. So we break >> a design decisions which is really hurting the qml designer. Thomas has >> written some magic code after he has seen the wizard of Oz with his daughter >> but you know he hasn't still not seen all this Harry Potter movies so it is >> working somewhat but not very well. To get it working very well we had to >> rewrite our adaption code around the existing C++ interface of Qml. And how >> Alan stated it, it is not a clean interface. It would take much time and >> would generate new bugs. You see this is generating work. Work which would >> be not existing if we would had sticked to the design decision that every >> graphical item is a quick item. > > Every item in the graphical scene still is a QQuickItem. A > QQuickWindow encapsulates a new graphical scene, and I don't quite > have the magic to contain a new scene inside itself. > > I don't think we want to go down the QWidget route of having every top > level item implicitly create a window. It worked for widgets because > it fit naturally into their static and boxy implementation. In > QtQuick, where you throw Items and Rectangles around like candy just > to build the same functionality as a single widget (still less LoC, > but a lot more QObjects...), I can't see that working very well (until > someone builds it and proves me wrong ;)). I was not paying enough attention when QQuickWindow was introduced. So am not innocent in this case. But I still think composition would have been the better choice. While I agree that a QQuickItem should never become a toplevel window in an implicit manner, we could have done a QQuickTopLevelItem that contains a QWindow but still is a QQuickItem. I think this would have made some things easier for QtQuick, for users and for tooling. For example a QQuickWindow has no states and transitions. This is just confusing and inconsistent. But now we have QQuickWindow and it is public API. So we have to live with it. But since QML/QtQuick is getting more mature I have to agree with Marco that introducing something like PES or RFCs to specify the language, item set and the general design more closely would help. This will of course not happen overnight and it will add some bureaucratic overhead, but changes to the language (QML) and to the core item set are not that common anymore and have a lot of impact for all stake holders. Kind Regards, Thomas Hartmann From 416365416c at gmail.com Fri Jun 28 09:59:59 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 00:59:59 -0700 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CBE621.50201@digia.com> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> <51CBE621.50201@digia.com> Message-ID: On Thu, Jun 27, 2013 at 12:13 AM, Thomas Hartmann wrote: > Hi > > Am 26/06/2013 20:09, schrieb Alan Alpert: > >> The difference is that 'when' is a binding evaluated as a boolean, not >> a property change signal. You can do "when: alpha.ready && beta.ready >> && maybeOtherStuff()". You cannot conceptually do "when: >> alpha.readyChanged && beta.readyChanged" because signal && signal does >> not compute. We could assign an arbitrary meaning to it, but I think >> that's getting more confusing by that point... > > I agree. We just have to make sure that "triggers" can also react to > several signals. > > We could consider something like this: > > State { > name: "someState" > triggers: [ > SignalTrigger { > leave: false //default > target: someButton > signal: clicked > } > > ConditionTrigger { > condition: someBackEnd.someValue === 10 > } > //Different from when, because state change is triggered when > //condition becomes true, but we do not leave the state automatically > //if the condition becomes false again. > ConditionTrigger { > leave: true > leaveToState: "" > condition: someBackEnd.someValue === 12 > } > //This time we leave the state to the base state > ] > } > > This is just brainstorming. We should also consider moving these > "Triggers" into Transitions instead. Looks interesting. These sound very similar to the transitions in the State Machine framework, something that people have wanted for a while but is risky because these are not the same States/Transitions. But if we add "Triggers", we're kinda at a super-set of State Machine functionality (while still using the terms all differently of course ). So I like the idea, but definitely on States and not Transitions (these Triggers have nothing to do with how a State change is animated). If someone wanted to pick this up and implement something, I bet it could make Qt 5.2 ;) . > > > Another feature that I needed sometimes (independent from tooling) was a > state that automatically changes into another state (for animations). > > Something like: > > State { > name: "someState" > nextState: "someOtherState" > } How is this supposed to work? That as soon as you reach state A, you immediately go to state B, just to apply the X->A->B transitions in sequence? Couldn't that be better done with an X->B transition which looks like Transition { SequentialAnimation { id: xToB; animations: [ xToA, aToB] } } Although I suppose that only works in certain situations... -- Alan Alpert From 416365416c at gmail.com Fri Jun 28 10:03:17 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 01:03:17 -0700 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: <51CBED36.1060502@users.sourceforge.net> References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> <51CBED36.1060502@users.sourceforge.net> Message-ID: On Thu, Jun 27, 2013 at 12:43 AM, Alberto Mardegan wrote: > On 06/26/2013 08:38 PM, Alan Alpert wrote: >> I agree. There should be a purely declarative approach for all the >> "pure UI" parts, and a "triggers" property on State or a >> StateChangeConnections element would be an improvement. > > What about this? > > onMySignal: PropertyChanges { > target: myObject > status: "dead" > } That's confusing, because onMySignal looks like a signal handler but behaves like a property (the RHS of a signal handler should be a JS expression with the return type discarded). -- Alan Alpert From 416365416c at gmail.com Fri Jun 28 10:13:30 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 01:13:30 -0700 Subject: [Development] Qml/Quick Designe Decision Wiki or how to avoid generating work for other stakeholders In-Reply-To: <51CD3C8B.6000201@digia.com> References: <51CD3C8B.6000201@digia.com> Message-ID: On Fri, Jun 28, 2013 at 12:34 AM, Thomas Hartmann wrote: > Hi, > >>> Every graphical item should be derived from QQuickItem. So for graphical >>> content in a Qml file there should be a item as root object. But now there >>> is ApplicationWindow which looks a little bit like a bastard. It is actually >>> a QuickView aka a Window with the special property contentItem. So we break >>> a design decisions which is really hurting the qml designer. Thomas has >>> written some magic code after he has seen the wizard of Oz with his daughter >>> but you know he hasn't still not seen all this Harry Potter movies so it is >>> working somewhat but not very well. To get it working very well we had to >>> rewrite our adaption code around the existing C++ interface of Qml. And how >>> Alan stated it, it is not a clean interface. It would take much time and >>> would generate new bugs. You see this is generating work. Work which would >>> be not existing if we would had sticked to the design decision that every >>> graphical item is a quick item. >> >> Every item in the graphical scene still is a QQuickItem. A >> QQuickWindow encapsulates a new graphical scene, and I don't quite >> have the magic to contain a new scene inside itself. >> >> I don't think we want to go down the QWidget route of having every top >> level item implicitly create a window. It worked for widgets because >> it fit naturally into their static and boxy implementation. In >> QtQuick, where you throw Items and Rectangles around like candy just >> to build the same functionality as a single widget (still less LoC, >> but a lot more QObjects...), I can't see that working very well (until >> someone builds it and proves me wrong ;)). > > I was not paying enough attention when QQuickWindow was introduced. So > am not innocent in this case. But I still think composition would have > been the better choice. > > While I agree that a QQuickItem should never become a toplevel window in > an implicit manner, we could have done a QQuickTopLevelItem that > contains a QWindow but still is a QQuickItem. What QtQuick scene (currently inseperable from QQuickWindow) would that QQuickItem be in? > I think this would have made some things easier for QtQuick, for users > and for tooling. For example a QQuickWindow has no states and > transitions. This is just confusing and inconsistent. There are loads of objects already which are not Items. Placing it in a separate QtQuick.Window import is supposed to help remind people that this isn't an Item derived type, so it doesn't have Item functionality, same as QtObject. If anything, this shows just how badly we've been documenting the inheritance hierarchy for types. We need to at least make the "Item"/"not Item" split clear for QtQuick. > > But now we have QQuickWindow and it is public API. So we have to live > with it. > > But since QML/QtQuick is getting more mature I have to agree with Marco > that introducing something like PES or RFCs to specify the language, > item set and the general design more closely would help. This will of > course not happen overnight and it will add some bureaucratic overhead, > but changes to the language (QML) and to the core item set are not that > common anymore and have a lot of impact for all stake holders. I don't think it's that mature yet. The slowness of changes, both to QtQml and QtQuick, I think are more because the shifting priorities over the last year has moved a lot of effort away temporarily. When Android, iOS, V4VM and QtQuick.Controls jumped in priority we had very little in those areas, once we've got those under control I hope to see the pace of QtQuick development 'quicken'. I certainly have plenty of stuff I want to change (for QtQuick, starting with the questions on that wiki page). Shame I can only do one thing at a time... -- Alan Alpert From njeisecke at saltation.de Fri Jun 28 10:48:27 2013 From: njeisecke at saltation.de (Nils Jeisecke) Date: Fri, 28 Jun 2013 10:48:27 +0200 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: References: Message-ID: Hi Alan, On Fri, Jun 28, 2013 at 9:25 AM, Alan Alpert <416365416c at gmail.com> wrote: > There is. The QQuickItem tree and the QObject tree are technically > separate. Usually when you assign QQuickItem parentage it also assigns > QObject parentage, but that's because of how the QML language > implicitly defines a QObject tree in a similar way to how QQuickItem > does it. Using "parent:" messes that up. thank you very much for your comments. But wouldn't this classify any reparenting of objects that are declared in the tree as "bad Qml"? Or does it make any difference whether parent is assigned during initialization (like in the example) or afterwards (e.g. in a state change). If it does that would imply an undefined behavior, which should be forbidden or at least generate a warning. Unfortunately using Qml also means experimenting a lot. And if something works as expected, you're easily tempted to consider this as good practice ;-) Nils From simon.hausmann at digia.com Fri Jun 28 11:02:05 2013 From: simon.hausmann at digia.com (Simon Hausmann) Date: Fri, 28 Jun 2013 11:02:05 +0200 Subject: [Development] Qt CI improvements In-Reply-To: <1864564.hBhN7ptair@asterix> References: <1864564.hBhN7ptair@asterix> Message-ID: <6520836.s8nnJe8fe6@rhea> On Thursday 27. June 2013 00.52.23 David Faure wrote: > Le mercredi 26 juin 2013 14:23:33 Sarajärvi Tony a écrit : > > Hi all! > > > > Our IT has planned a few improvements to our CI. You might be glad to hear > > about these. These changes are addressing random failures in autotests we > > have experiencing. > > Yes, very glad. Thanks a lot for improving the CI ! Ditto. Those improvements look very promising. Thank you Tony! Any improvement to the CI quickly multiplies and improves the productivity of many Qt developers immediately. Simon From Thomas.Hartmann at digia.com Fri Jun 28 11:36:34 2013 From: Thomas.Hartmann at digia.com (Thomas Hartmann) Date: Fri, 28 Jun 2013 11:36:34 +0200 Subject: [Development] Toolability of mixing QML and JS In-Reply-To: References: <5B2736A3C8B75B4BB66BC58DC5E889B08C593A@IT-EXMB01-HKI.it.local> <51CAAA67.6050100@digia.com> <51CABBCD.6070602@digia.com> <51CAE9EA.2050508@digia.com> <51CBE621.50201@digia.com> Message-ID: <51CD5922.5090308@digia.com> Hi, Am 28/06/2013 09:59, schrieb Alan Alpert: > So I like the idea, but definitely on States and not Transitions > (these Triggers have nothing to do with how a State change is > animated). If someone wanted to pick this up and implement something, > I bet it could make Qt 5.2 ;) . Maybe I find the time to do at least a prototype. >> Another feature that I needed sometimes (independent from tooling) was a >> state that automatically changes into another state (for animations). >> >> Something like: >> >> State { >> name: "someState" >> nextState: "someOtherState" >> } > > How is this supposed to work? That as soon as you reach state A, you > immediately go to state B, just to apply the X->A->B transitions in > sequence? > > Couldn't that be better done with an X->B transition which looks like > Transition { > SequentialAnimation { id: xToB; animations: [ xToA, aToB] } > } If I remember correctly I had two use cases. (1) Many animations have some kind of peak (Or even several peaks). And if the peak is a formal state it can be edited using the designer. This really helps with tooling, because key frames in animations are defined as normal states in this cases. Triggering the transition to the next "animation state" requires currently a ScriptAction which works, but is not declarative. (2) It sometimes helps with the logic of animations. Imagine you have to states A and B and add the animation state A_B explicitly as state. Now instead of going directly from A to B you enter A_B or if different B_A. The animations are defined in the transition from A to A_B and B to B_A, while A_B to B and B_A to A are not animated. Now B_A and A_B define the fact that the ui is animated and whenever the ui is fixed we are in either A or B. Now we can turn on/off effects in B_A and A_B or "disable" items during animation, easily. We can also skip animations (if required) by going directly from A to B or B to A. You of course get the same by using ScriptActions and setting a flag, but this also adds another state, which just is implicit in this case. In short these "epsilon" transitions allow to structure animations using intermediate states. Kind Regards, Thomas Hartmann From Shawn.Rutledge at digia.com Fri Jun 28 11:52:38 2013 From: Shawn.Rutledge at digia.com (Rutledge Shawn) Date: Fri, 28 Jun 2013 09:52:38 +0000 Subject: [Development] Qml/Quick Designe Decision Wiki or how to avoid generating work for other stakeholders In-Reply-To: References: Message-ID: <98F45B99-00A4-49A9-814B-C7CD57398390@digia.com> On 28 Jun 2013, at 9:14 AM, Alan Alpert wrote: > On Thu, Jun 27, 2013 at 8:58 AM, Bubke Marco wrote: >> Every graphical item should be derived from QQuickItem. So for graphical >> content in a Qml file there should be a item as root object. But now there >> is ApplicationWindow which looks a little bit like a bastard. It is actually >> a QuickView aka a Window with the special property contentItem. So we break >> a design decisions which is really hurting the qml designer. Thomas has >> written some magic code after he has seen the wizard of Oz with his daughter >> but you know he hasn't still not seen all this Harry Potter movies so it is >> working somewhat but not very well. To get it working very well we had to >> rewrite our adaption code around the existing C++ interface of Qml. And how >> Alan stated it, it is not a clean interface. It would take much time and >> would generate new bugs. You see this is generating work. Work which would >> be not existing if we would had sticked to the design decision that every >> graphical item is a quick item. > > Every item in the graphical scene still is a QQuickItem. A > QQuickWindow encapsulates a new graphical scene, and I don't quite > have the magic to contain a new scene inside itself. I know, but that's really too bad because it would make many things possible: - anchors only work with items, so if windows and screens were items we could use anchors with them more easily - on platforms which don't support multiple top-level windows (Android, RasPi etc.), we need to pretend that they do anyway, and synthesize the window decorations by putting the window contents into wrapper items. The dialogs module solves this its own way by creating a QML dialog inside of an Item, instead of putting it in a window. https://codereview.qt-project.org/#change,59474 But that's just a one-off solution, which will need to be repeated later on in other contexts such as - MDI windows and dockable windows - compositing window managers (but that's been done, even in Qt; goes to show the "magic" is really possible) - and of course the tooling, designers, debuggers and anything else that introspects and manipulates objects at runtime In old versions of Visio, a group, a stencil and an embedded drawing appeared to the user to be more or less the same thing. You could open up a group and modify its contents without ungrouping it first; and you could easily create your own stencils, and instances of those also behaved like instances of an embedded master drawing. Every drawing/diagramming/CAD tool should have this feature (but even Visio got broken later on). In the same way, a rectangular area should be an interface which has implementations such as: 1) a plain rectangle just for storing coordinates without implying anything else 2) scene-graph item 3) event-receiving area (like MouseArea etc.) 4) window 5) screen 6) desktop. It's crippling that nobody seems to have thought of abstracting it at the beginning. But it's easier to think that the application can only have one window from which there is no escape, and that therefore it's outside the scope of QtQuick. It just doesn't work for the long term; and then as soon as you add windows you run into the lack of homogeneity in the windowing system too, where a window is too heavyweight (and the operations to manipulate it are cross-process messages) so you can't afford to create a window for each item. But at least the abstract window could have created either a real window or an item transparently; and after all the trouble with implementing dock windows the first time, the need for abstraction should have been obvious to anyone with some experience. From olszak.tomasz at gmail.com Fri Jun 28 12:09:32 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Fri, 28 Jun 2013 12:09:32 +0200 Subject: [Development] Handling specific platform events in Qt Message-ID: Hi, I need to handle some specific system/wm events in Tizen OS [1]. Events are as follows: 1. Create 2. Reset- Is called at every launch or re-launch request 3. Pause - Is called when the window of the application becomes invisible. The application's tasks can be suspended in PAUSE state. 4. Resume - Is called when the window of application becomes visible again. The paused application's tasks can be resumed. 5. Terminate So several questions emerge: 1. Where should I handle such case in Qt. Use existing code (which) or create new code in QPA? 2. How to expose it to QML? Should I create new QML plugin? Should that be part of Qt.application? [1] https://developer.tizen.org/documentation/articles/application-fundamentals-developer-guide#appLifeCycle -- regards / pozdrawiam, Tomasz Olszak Qt for Tizen | http://qt-project.org/wiki/Tizen Qt Certified Developer | http://qt-project.org http://linkedin.com/in/tolszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From eskil.abrahamsen-blomfeldt at digia.com Fri Jun 28 12:09:57 2013 From: eskil.abrahamsen-blomfeldt at digia.com (Eskil Abrahamsen Blomfeldt) Date: Fri, 28 Jun 2013 12:09:57 +0200 Subject: [Development] Qt 5.2 In-Reply-To: References: Message-ID: <51CD60F5.3020808@digia.com> On 06/25/2013 02:38 PM, Knoll Lars wrote: > Our goal should be to release 5.2 in November, so we have a bit of slack > before christmas. Unfortunately we'll also need some time to still do > feature development, so the proposal would be to aim for releasing the > alpha end of September. Hi, In order to have the best possible tooling experience in Qt for Android, we really need a new minor release of Qt Creator to go along with Qt 5.2, because otherwise we won't be able to add features, strings, UI, etc. there. Therefore I'll propose adding a dependency for the Qt 5.2 release that it should not be released before after Qt Creator 3.0 is out, so that the binary packages we make for Qt 5.2 can bundle Qt Creator 3.0. Qt Creator 3.0 is scheduled for the end of November, and historically Creator has had very few and very short delays, so I don't think this adds any significant risk to Qt 5.2 release. Note that the only milestone which needs to be moved for this is the final release. Alpha, beta, etc. can still have the same target dates, so that we don't actually lose any of the slack planned for Qt 5.2. Thanks! -- Eskil From Friedemann.Kleint at digia.com Fri Jun 28 12:23:50 2013 From: Friedemann.Kleint at digia.com (Friedemann Kleint) Date: Fri, 28 Jun 2013 12:23:50 +0200 Subject: [Development] Handling specific platform events in Qt In-Reply-To: References: Message-ID: <51CD6436.5030000@digia.com> Hi, QApplicationStateChangeEvent and enumeration Qt::ApplicationState are intended for this purpose. Feel free to propose additional states if they are not sufficient for your purposes. On the QPA side, they are triggered by QWindowSystemInterface::handleApplicationStateChanged(). I can't be sure whether this is accessible by QML, currently? Regards, Friedemann -- Friedemann Kleint Digia, Qt From announce at qt-project.org Fri Jun 28 12:38:42 2013 From: announce at qt-project.org (List for announcements regarding Qt releases and development) Date: Fri, 28 Jun 2013 10:38:42 +0000 Subject: [Development] [Announce] Qt Creator 2.8 RC released Message-ID: <4A5CC42F-9E0C-45E9-9C9B-5BCA7BC3B68B@digia.com> We proudly present the Qt Creator 2.8 RC today! Blog: http://blog.qt.digia.com/blog/2013/06/28/qt-creator-2-8-rc-released/ Download: http://download.qt-project.org/development_releases/qtcreator/2.8/2.8.0-rc/ Best regards, The Qt Creator Team -- Eike Ziller, Senior Software Engineer - Digia, Qt Digia Germany GmbH, Rudower Chaussee 13, D-12489 Berlin Geschäftsführer: Mika Pälsi, Juha Varelius, Anja Wasenius Sitz der Gesellschaft: Berlin, Registergericht: Amtsgericht Charlottenburg, HRB 144331 B _______________________________________________ Announce mailing list Announce at qt-project.org http://lists.qt-project.org/mailman/listinfo/announce From olszak.tomasz at gmail.com Fri Jun 28 13:41:43 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Fri, 28 Jun 2013 13:41:43 +0200 Subject: [Development] Handling specific platform events in Qt In-Reply-To: <51CD6436.5030000@digia.com> References: <51CD6436.5030000@digia.com> Message-ID: 2013/6/28 Friedemann Kleint > Hi, > > QApplicationStateChangeEvent and enumeration Qt::ApplicationState are > intended for this purpose. Feel free to propose additional states if > they are not sufficient for your purposes. > > On the QPA side, they are triggered by > QWindowSystemInterface::handleApplicationStateChanged(). > > I can't be sure whether this is accessible by QML, currently? > > Regards, > Friedemann > > -- > Friedemann Kleint > Digia, Qt > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > Thanks, I will write some update here after checking this out. -- regards / pozdrawiam, Tomasz Olszak Qt for Tizen | http://qt-project.org/wiki/Tizen Qt Certified Developer | http://qt-project.org http://linkedin.com/in/tolszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From Jani.Heikkinen at digia.com Fri Jun 28 13:59:48 2013 From: Jani.Heikkinen at digia.com (Heikkinen Jani) Date: Fri, 28 Jun 2013 11:59:48 +0000 Subject: [Development] Qt5.1 new snapshot Message-ID: Hi all! Unfortunately there were again some new findings and that's why we cannot do RC2 today :( But new snapshot is available here: http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/ Known issues (will be corrected in RC2): - In the Mac user is not able to compile apps that use private headers - Occasional Qt Creator crashes when developing for android (QTCREATORBUG-9660) - issue related to QWindow o QWindow min/max width/height, contentOrientation are not new in 5.1 o Found by Thiago during header diff, see http://lists.qt-project.org/pipermail/development/2013-June/011584.html · Because of these we will do qt5.git update once again. Hoping everything goes smoothly and we will have RC2 out soon, latest on Monday, 1stof July. Changes since last informed snapshot: Qtsdk · Fix build for android · Remove patcher component in 5.0.2 and 5.1.0 qtbase · QTBUG-31329 QTBUG-31934 QNX: Fix screen rotation · mac frameworks: don't create bogus symlinks · Fix compilation with ICC 13.1: the MSVC 2005 & 2008 code is bad · QTBUG-30839 Replace win32-icc/qplatformdefs.h with the MSVC one · QTBUG-31701 Fix win32-icc build: _CHAR16T is not an indication of C++11 support · QTBUG-31984 Android: Fix initial window size for raster backend · QTBUG-31934 BlackBerry: fix delayed root window posting on OpenGL · QTBUG-29005 QTBUG-31811 QTBUG-31977 Mac OSX: get the correct key code when the control key is pressed · QTBUG-31969 install qconfig.h into framework bundles · fix bundled header creation for debug builds · disable non-framework header install also for debug builds · QTBUG-31641 install private headers into frameworks · don't needlessly do QMAKE_BUNDLE_DATA+=FRAMEWORK_HEADERS · un-nest conditionals · QTBUG-29003 mac framework build: always set QMAKE_FRAMEWORKPATH · Update for the newest Darwin-family operating systems. · Fixed testbuild with QT_NO_CURSOR Qtdeclarative · Undo presumably accidental line deletion · QTBUG-31898 photosurface: add C++ boilerplate launcher; open button · QTBUG-31898 Declarative dialog improvements for the non-Window use case · Update 5.1.0 changelog and what's new Qtjsbackend · [V8] Fix stack alignment corruption for MinGW32 build Br, Jani From: Heikkinen Jani Sent: 26. kesäkuuta 2013 12:08 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Hi all! New packages will be soon in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. Unfortunately windows android installer won't be there because of some build issues. Changes since last build: Qtsdk: · Remove system specific directories from qconfig.pri, QTBUG-31496 qtactiveqt: · QTBUG-29918 Fix licensing for static libraries Qtbase: · QTBUG-31862 Fix QDir::mkpath failing for drive paths on Windows · Mac: Ensure that C++11 is always used when linking against a static Qt build · QTBUG-29918 Use BSD licensing for QtOpenGLExtensions instead of LGPL · QTBUG-31333 Widgets: Set qt_button_down for each press. Qtdeclarative · QQmlPlatform: rename "mac" to "osx" · Add missing Q_REVISION Qtdoc · Doc:Updated information about tested platforms. Qtquickcontrols · Adapt to Qt.platform.os rename ("mac" -> "osx") · Doc: Small fix for SplitView This isn't the RC2 yet but the goal is to create it tomorrow. Things what we are still waiting: - Fix for Windows Android build issue (fix is already available) - Fixes/analysis if following 3 issues are really blocking our RC2 o QTBUG-31959: Crash when a tool-tip of a tool button is about to be displayed o QTBUG-31811: Sequential shortcuts don't work o QTBUG-31977: Regression: Key events while pressing ctrl have wrong key() Br, Jani From: Heikkinen Jani Sent: 25. kesäkuuta 2013 10:30 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Hi all, Quite many changes were missing from my previous mail, sorry about that. Here is list of missing changes: Qtbase: · CMake: Fix test for value starting with -L · Fix missing shortcuts for WindowContainers · QTBUG-31776 Fix missing focus events for mapped child windows · QTBUG-31806 Android: handle keyboard connect/disconnect · fix LD_LIBRARY_PATH manipulation in uic calls not being make-escaped · update QtNetwork changelog for 5.1.0 · QTBUG-30173 Tagged all those examples that work on an Android device · QTBUG-31476 QFactoryLoader: Release unused libraries. · QTBUG-31476 Remove unused member QFactoryLoaderPrivate::keyList. Qtdeclarative · QTBUG-31834 QColorDialogHelper: Force QWindow before setting flags · QTBUG-30173 Doc: Changed the title to avoid name conflicts and linking error Qtmultimedia · Add changes-5.1.0 file · QTBUG-31868 QTBUG-31476 Multimedia plugins now have a unique JSON metadata 'Keys' property. qtquick1 · Add changes-5.1.0 file qtquickcontrols · QTBUG-31796 Doc: Fix QCH filter attributes for Qt Quick Controls/Styles qtsensors · Fix loading of all sensorgesture plugins. Qttools · Add changes-5.1.0 file From: Heikkinen Jani Sent: 25. kesäkuuta 2013 8:55 To: development at qt-project.org; releasing at qt-project.org Subject: RE: New Qt5.1 snapshot available Good morning, There is again new snapshot(2013-06-25-65/) available in http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc2/backups/. It is already quite near of rc2 but some changes are still missing. Below is listed new changes since my previous mail: Qtsdk: · Fix warnings during installation, QTBUG-31955 · mkqt5bld: qtquickcontrols added to essentials list, QTBUG-31718 · Fix path for MaintenanceTool links * Make sure that createShortcuts() function is not global, QTIFW-294 * Add -no-c++11 to Mac configure options Qt5 · configure: Fix srcpath when you run configure in the top-level dir · rewrite top-level configures without perl, QTBUG-31786 qt-creator: · Fix broken list requests in CodePaster, QTCREATORBUG-9547 Br, Jani From: Heikkinen Jani Sent: 20. kesäkuuta 2013 12:58 To: development at qt-project.org; releasing at qt-project.org Subject: New Qt5.1 snapshot available Hi all, There is new snapshot available after RC1. Unfortunately there is problems in the Linux builds and that's why only Windows & Mac offline installers are available. Fixing is ongoing, let's hope we can have all installers available tomorrow! You can download newest installers from http://download.qt-project.org/snapshots/qt/5.1/5.1.0-rc1/backups/ Below is listed changes included since RC1: Qtsdk: · QTBUG-29802: Make database plug-ins/derivers avaliable by default · QTBUG-28963: cannot unmount DMG after installing Qt OSX package and starting creator · Update installer graphics · Do not mention SDK in user visible installer texts · Change "Qt" as a name of the field in online installer qt-creator · QTCREATORBUG-9558 · AndroidRunner: Fix CheckPidTimer to not fire forever qtbase: · Android Mute and FastForward keys mapped wrong · make Makefiles not depend on .qmake.super · QTBUG-31289 fix rcc & uic .depend_commands · always $-escape make commands · QTBUG-31289 fix command over-escaping in vcproj files · assemble the tool commands at use time, after all · QTBUG-31750 OSX: Disable window restoration for the Mac color panel · QTBUG-29161 Cocoa color dialog cannot be modal, but should show anyway · QTBUG-31566 OSX color dialog can be accepted repeatedly · QTBUG-31667 network requests: do not access 1st byte of empty byte array · QTBUG-31745 Doc: Remove Tweet Search demo from the list of highlighted examples · Adjust the cmake files to find the dlls in the bin dir. · qtdeclarative: · QTBUG-31699 photosurface demo: behavior depends on initialization order · stabilize tst_touchmouse. · QFileDialogHelper: Force QWindow before setting flags. qtdoc: · Doc: Added a link to Qt Quick Controls Overview · QTBUG-31737 Document the deprecation of WFlags Qtmultimedia: · Android: Fix for uncaught java exception. · Fix for url bug in the qmlvideo examples. Qtquickcontrols: · QTBUG-31778 Doc: Fix QCH documentation structure for Qt Quick Layouts · Revert "Add qml/js files in resource files" · Doc: Fixed Qt Quick Layouts listing in qch files. · QTBUG-31565 Add qml/js files in resource files qttools · QTBUG-31153 Find the cmake version template in the install location. Qttranslations · QTBUG-31727 fix qm output dir for non-prefix builds Qtwebkit · [Qt][Mac] Disable QTKit video on OS X. Br, Jani -------------- next part -------------- An HTML attachment was scrubbed... URL: From stephen.kelly at kdab.com Fri Jun 28 14:25:37 2013 From: stephen.kelly at kdab.com (Stephen Kelly) Date: Fri, 28 Jun 2013 14:25:37 +0200 Subject: [Development] Header diff for QtCore In-Reply-To: <4591096.FRjckQR22e@tjmaciei-mobl2> References: <1f4a33$7ogn1q@AZSMGA002.ch.intel.com> <4591096.FRjckQR22e@tjmaciei-mobl2> Message-ID: <2009348.qQtd3uGcff@hal> On Wednesday, June 26, 2013 14:28:24 Thiago Macieira wrote: > There are a few scary changes in the metatype and QObject connection code > that I'd like Stephen and Olivier (respectively) to take a look. Looks fine to me. Thanks, -- Stephen Kelly | Software Engineer KDAB (Deutschland) GmbH & Co.KG, a KDAB Group Company Join us in October at Qt Developer Days 2013 - https://devdays.kdab.com www.kdab.com || Germany +49-30-521325470 || Sweden (HQ) +46-563-540090 KDAB - Qt Experts - Platform-Independent Software Solutions -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 198 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Fri Jun 28 17:20:29 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 28 Jun 2013 08:20:29 -0700 Subject: [Development] Qt5.1 new snapshot In-Reply-To: References: Message-ID: <3813837.P9Vnxi6l90@tjmaciei-mobl2> On sexta-feira, 28 de junho de 2013 11.59.48, Heikkinen Jani wrote: > Unfortunately there were again some new findings and that's why we cannot do > RC2 today What prevented the RC2? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Fri Jun 28 18:36:35 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 09:36:35 -0700 Subject: [Development] Qml/Quick Designe Decision Wiki or how to avoid generating work for other stakeholders In-Reply-To: <98F45B99-00A4-49A9-814B-C7CD57398390@digia.com> References: <98F45B99-00A4-49A9-814B-C7CD57398390@digia.com> Message-ID: On Fri, Jun 28, 2013 at 2:52 AM, Rutledge Shawn wrote: > > On 28 Jun 2013, at 9:14 AM, Alan Alpert wrote: > >> On Thu, Jun 27, 2013 at 8:58 AM, Bubke Marco wrote: >>> Every graphical item should be derived from QQuickItem. So for graphical >>> content in a Qml file there should be a item as root object. But now there >>> is ApplicationWindow which looks a little bit like a bastard. It is actually >>> a QuickView aka a Window with the special property contentItem. So we break >>> a design decisions which is really hurting the qml designer. Thomas has >>> written some magic code after he has seen the wizard of Oz with his daughter >>> but you know he hasn't still not seen all this Harry Potter movies so it is >>> working somewhat but not very well. To get it working very well we had to >>> rewrite our adaption code around the existing C++ interface of Qml. And how >>> Alan stated it, it is not a clean interface. It would take much time and >>> would generate new bugs. You see this is generating work. Work which would >>> be not existing if we would had sticked to the design decision that every >>> graphical item is a quick item. >> >> Every item in the graphical scene still is a QQuickItem. A >> QQuickWindow encapsulates a new graphical scene, and I don't quite >> have the magic to contain a new scene inside itself. > > I know, but that's really too bad because it would make many things possible: > - anchors only work with items, so if windows and screens were items we could use anchors with them more easily > - on platforms which don't support multiple top-level windows (Android, RasPi etc.), we need to pretend that they do anyway, and synthesize the window decorations by putting the window contents into wrapper items. The dialogs module solves this its own way by creating a QML dialog inside of an Item, instead of putting it in a window. https://codereview.qt-project.org/#change,59474 But that's just a one-off solution, which will need to be repeated later on in other contexts such as > - MDI windows and dockable windows > - compositing window managers (but that's been done, even in Qt; goes to show the "magic" is really possible) > - and of course the tooling, designers, debuggers and anything else that introspects and manipulates objects at runtime > > In old versions of Visio, a group, a stencil and an embedded drawing appeared to the user to be more or less the same thing. You could open up a group and modify its contents without ungrouping it first; and you could easily create your own stencils, and instances of those also behaved like instances of an embedded master drawing. Every drawing/diagramming/CAD tool should have this feature (but even Visio got broken later on). In the same way, a rectangular area should be an interface which has implementations such as: 1) a plain rectangle just for storing coordinates without implying anything else 2) scene-graph item 3) event-receiving area (like MouseArea etc.) 4) window 5) screen 6) desktop. It's crippling that nobody seems to have thought of abstracting it at the beginning. > >But it's easier to think that the application can only have one window from which there is no escape, and that therefore it's outside the scope of QtQuick. It just doesn't work for the long term; and then as soon as you add windows you run into the lack of homogeneity in the windowing system too, where a window is too heavyweight (and the operations to manipulate it are cross-process messages) so you can't afford to create a window for each item. But at least the abstract window could have created either a real window or an item transparently; and after all the trouble with implementing dock windows the first time, the need for abstraction should have been obvious to anyone with some experience. The items-in-a-scene is an implementation detail (albeit one of the biggest ones), but if you can provide a better implementation for the existing APIs then that would be ideal. If not, we need to start considering trade-offs instead, and maybe these other use-cases are not as important as the application running with high performance on-device. The initial usecases were not MDI, and were not even multi-window. We aren't going to throw in extra abstraction layers for a "potential future". It's much better to maintain flexibility to be able to add abstractions later on, even though abstractions are easiest to implement at the start. One of the hopes for the QML-only API of QtQuick is that we are only restricted by QML versioning (separate from Qt versioning), and this gives us more flexibility. Maybe for QtQuick 3.0 we can apply an extra abstraction to fix this, or even a minor version of 2.x depending on how it's implemented. So long as we don't have the complete scene breakage (like between QtQuick 1 and QtQuick 2) or critical performance loss, there's scope to add this in later. -- Alan Alpert From 416365416c at gmail.com Fri Jun 28 18:50:40 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 09:50:40 -0700 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: References: Message-ID: On Fri, Jun 28, 2013 at 1:48 AM, Nils Jeisecke wrote: > Hi Alan, > > On Fri, Jun 28, 2013 at 9:25 AM, Alan Alpert <416365416c at gmail.com> wrote: >> There is. The QQuickItem tree and the QObject tree are technically >> separate. Usually when you assign QQuickItem parentage it also assigns >> QObject parentage, but that's because of how the QML language >> implicitly defines a QObject tree in a similar way to how QQuickItem >> does it. Using "parent:" messes that up. > thank you very much for your comments. But wouldn't this classify any > reparenting of objects that are declared in the tree as "bad Qml"? Or > does it make any difference whether parent is assigned during > initialization (like in the example) or afterwards (e.g. in a state > change). > If it does that would imply an undefined behavior, which should be > forbidden or at least generate a warning. During initialization or afterwards does make a big difference. The various initialization statements are the parts which a declarative language can theoretically implement in an undefined order. Anything tied to an actual event (a state change, or in a signal handler like Component.onCompleted) has a defined place in the program flow and thus is not bad (although doing something imperatively when you could do it declaratively is not great, that's a bit of a different issue). > Unfortunately using Qml also means experimenting a lot. And if > something works as expected, you're easily tempted to consider this as > good practice ;-) Yeah, can't fault you for sticking with what works :) . This is why we tend to be strict about what works in order to encourage good application patterns, like how anchors can't be set to un-related items. I think we might want to disable setting the "parent" property from QML in a future version of QtQuick, to prevent this kind of mistake. -- Alan Alpert From 416365416c at gmail.com Fri Jun 28 18:59:30 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 09:59:30 -0700 Subject: [Development] Handling specific platform events in Qt In-Reply-To: <51CD6436.5030000@digia.com> References: <51CD6436.5030000@digia.com> Message-ID: On Fri, Jun 28, 2013 at 3:23 AM, Friedemann Kleint wrote: > Hi, > > QApplicationStateChangeEvent and enumeration Qt::ApplicationState are > intended for this purpose. Feel free to propose additional states if > they are not sufficient for your purposes. > > On the QPA side, they are triggered by > QWindowSystemInterface::handleApplicationStateChanged(). > > I can't be sure whether this is accessible by QML, currently? This should be accessible via Qt.application.active (false if paused/minimized or otherwise not visible). -- Alan Alpert From Tuukka.Turunen at digia.com Fri Jun 28 20:53:52 2013 From: Tuukka.Turunen at digia.com (Turunen Tuukka) Date: Fri, 28 Jun 2013 18:53:52 +0000 Subject: [Development] Qt5.1 new snapshot In-Reply-To: <3813837.P9Vnxi6l90@tjmaciei-mobl2> References: , <3813837.P9Vnxi6l90@tjmaciei-mobl2> Message-ID: <1B00CEBCD57FD445BD8228C9300DAE294D84081D@IT-EXMB02-HKI.it.local> ________________________________________ Lähettäjä: development-bounces+tuukka.turunen=digia.com at qt-project.org [development-bounces+tuukka.turunen=digia.com at qt-project.org] käyttäjän Thiago Macieira [thiago.macieira at intel.com] puolesta Lähetetty: 28. kesäkuuta 2013 18:20 Vastaanottaja: development at qt-project.org Cc: Heikkinen Jani; releasing at qt-project.org Aihe: Re: [Development] Qt5.1 new snapshot On sexta-feira, 28 de junho de 2013 11.59.48, Heikkinen Jani wrote: > Unfortunately there were again some new findings and that's why we cannot do > RC2 today What prevented the RC2? There were a few issues that were found so late that it was not possible to get the fixes into today's packages any more. If all goes well they are in the packages tomorrow morning. It would not have made sense to release RC2 with those items - especially as all these were easy to fix. Details can be seen from codereview - submodule update with these fixes is running now. I hope we get a very good RC2 and can proceed soon to final based on it (perhaps even without any changes, of with a very, very small amount on modifications). Yours, Tuukka -- From olszak.tomasz at gmail.com Fri Jun 28 23:52:26 2013 From: olszak.tomasz at gmail.com (Tomasz Olszak) Date: Fri, 28 Jun 2013 21:52:26 +0000 Subject: [Development] Handling specific platform events in Qt In-Reply-To: References: <51CD6436.5030000@digia.com> Message-ID: 2013/6/28 Alan Alpert <416365416c at gmail.com> > On Fri, Jun 28, 2013 at 3:23 AM, Friedemann Kleint > wrote: > > Hi, > > > > QApplicationStateChangeEvent and enumeration Qt::ApplicationState are > > intended for this purpose. Feel free to propose additional states if > > they are not sufficient for your purposes. > > > > On the QPA side, they are triggered by > > QWindowSystemInterface::handleApplicationStateChanged(). > > > > I can't be sure whether this is accessible by QML, currently? > > This should be accessible via Qt.application.active (false if > paused/minimized or otherwise not visible). > > -- > Alan Alpert > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > Hi, Alan you are right, from QML side Qt.application.active is just enough. However I would like to ask for advice regarding where should I handle events. I have some callback handler from which I could create and send QApplicationStateChangeEvent. Additionally when I receive RESUME event then top level window should be raised(It goes background when e.g. hardware button is clicked). So question are: 1. Where should I put the code which will handle receiving events from Tizen and propagate them to Qt? 2. Where should I put code which will handle RESUME (in our case not Qt::ApplicationSuspended) event: QWindow *w = qGuiApp->topLevelWindows().at(0); if (w) { w->showNormal(); w->raise(); w->requestActivate(); } In the first case I thought about QXcbIntegration, in the second: 1. QXcbIntegration (add hooks to xcb integration) - Tizen uses xcb platform plugin. 2. QQmlApplicationEngine 3. QXcbWindow Thanks in advance -- regards / pozdrawiam, Tomasz Olszak -------------- next part -------------- An HTML attachment was scrubbed... URL: From thiago.macieira at intel.com Sat Jun 29 00:18:13 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 28 Jun 2013 15:18:13 -0700 Subject: [Development] Release branch change criteria Message-ID: <10559427.9SQxTGlapb@tjmaciei-mobl2> I'm seeing lots of changes going into the release branch that I really can't understand why. In general, those changes seem to fall into three categories: 1) fixes for showstoppers 2) fixes for important issues that we'd like to get released ASAP, if possible 3) changes I could not understand the reason for In other words: 1) P0 ("Blocker") and P1 ("Showstopper") 2) P2 ("Important") 3) ? So I'd like to propose the following: Every change to the release branch MUST have a Task-number associated and said task number must be classified as P0 to P2. Changes without Task-number or whose task are P3 or lower must be rejected and bounced off to "stable". If you find an issue that is important and you'd like fixed in the upcoming release, but there's no task for, open a task and classify it P0 to P2. This extra step is to make us think whether the change is really important for this release. I'm saying that because I know I am guilty of some changes to release that shouldn't have been there, on second thought. I am also the author of a couple of build fixes, which are technically P1 or P2, but there was no task associated explaining why they are P1 or P2. -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From thiago.macieira at intel.com Sat Jun 29 00:12:27 2013 From: thiago.macieira at intel.com (Thiago Macieira) Date: Fri, 28 Jun 2013 15:12:27 -0700 Subject: [Development] Qt5.1 new snapshot In-Reply-To: <1B00CEBCD57FD445BD8228C9300DAE294D84081D@IT-EXMB02-HKI.it.local> References: <3813837.P9Vnxi6l90@tjmaciei-mobl2> <1B00CEBCD57FD445BD8228C9300DAE294D84081D@IT-EXMB02-HKI.it.local> Message-ID: <1683992.KHzJEmdqHl@tjmaciei-mobl2> On sexta-feira, 28 de junho de 2013 18.53.52, Turunen Tuukka wrote: > > What prevented the RC2? > > There were a few issues that were found so late that it was not possible to > get the fixes into today's packages any more. If all goes well they are in > the packages tomorrow morning. It would not have made sense to release RC2 > with those items - especially as all these were easy to fix. Details can be > seen from codereview - submodule update with these fixes is running now. I > hope we get a very good RC2 and can proceed soon to final based on it > (perhaps even without any changes, of with a very, very small amount on > modifications). Hmm... something is off here. The last release team meeting said "release RC2 on Wednesday if sanity checking passes". You're telling me something different now: there were changes that didn't make it in, by Friday. Were those changes P0 or P1? If there were no P0 or P1 fixes, RC2 should have been released. Someone made a decision to not release today. I'd like to know the details. What changes are those? Why are they showstoppers? -- Thiago Macieira - thiago.macieira (AT) intel.com Software Architect - Intel Open Source Technology Center -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 190 bytes Desc: This is a digitally signed message part. URL: From 416365416c at gmail.com Sat Jun 29 01:40:26 2013 From: 416365416c at gmail.com (Alan Alpert) Date: Fri, 28 Jun 2013 16:40:26 -0700 Subject: [Development] Handling specific platform events in Qt In-Reply-To: References: <51CD6436.5030000@digia.com> Message-ID: On Fri, Jun 28, 2013 at 2:52 PM, Tomasz Olszak wrote: > 2013/6/28 Alan Alpert <416365416c at gmail.com> >> >> On Fri, Jun 28, 2013 at 3:23 AM, Friedemann Kleint >> wrote: >> > Hi, >> > >> > QApplicationStateChangeEvent and enumeration Qt::ApplicationState are >> > intended for this purpose. Feel free to propose additional states if >> > they are not sufficient for your purposes. >> > >> > On the QPA side, they are triggered by >> > QWindowSystemInterface::handleApplicationStateChanged(). >> > >> > I can't be sure whether this is accessible by QML, currently? >> >> This should be accessible via Qt.application.active (false if >> paused/minimized or otherwise not visible). >> >> -- >> Alan Alpert >> _______________________________________________ >> Development mailing list >> Development at qt-project.org >> http://lists.qt-project.org/mailman/listinfo/development > > > Hi, > Alan you are right, from QML side Qt.application.active is just enough. > However I would like to ask for advice regarding where should I handle > events. > I have some callback handler from which I could create and send > QApplicationStateChangeEvent. Additionally when I receive RESUME event then > top level window should be raised(It goes background when e.g. hardware > button is clicked). > > So question are: > 1. Where should I put the code which will handle receiving events from Tizen > and propagate them to Qt? > 2. Where should I put code which will handle RESUME (in our case not > Qt::ApplicationSuspended) event: > > QWindow *w = qGuiApp->topLevelWindows().at(0); > > if (w) { > > w->showNormal(); > > w->raise(); > > w->requestActivate(); > > } > > > In the first case I thought about QXcbIntegration, in the second: > > QXcbIntegration (add hooks to xcb integration) - Tizen uses xcb platform > plugin. > QQmlApplicationEngine > QXcbWindow > Definitely not at the QQmlApplicationEngine level, this needs to be implemented on the QApplication level so that all Qt applications benefit. But I'm really not sure how this should be handled for the variety of xcb-based platforms, probably in QXcbIntegration? I know that for Blackberry we can do it in the QNX platform plugin... -- Alan Alpert From Sergio.Ahumada at digia.com Sat Jun 29 11:04:51 2013 From: Sergio.Ahumada at digia.com (Ahumada Sergio) Date: Sat, 29 Jun 2013 09:04:51 +0000 Subject: [Development] Qt 5.1.0 rc2 is out Message-ID: <9B4D1DADF5006F4DB6666312421B98E50101130F@IT-EXMB01-HKI.it.local> Hi, We have now released Qt 5.1.0 rc2. Packages are available from http://download.qt-project.org/development_releases/qt/5.1/5.1.0-rc2/ All blockers for final should be fixed in this version so if no new blocker issues are found we should be able to release the final really soon. As agreed in the release team meeting, there is no blog post for RC2, it is announced for the development community only. Big thanks to everyone involved! Cheers, -- Sergio Ahumada Release Engineer - Digia, Qt From Olli.Hirvonen at digia.com Sat Jun 29 11:28:02 2013 From: Olli.Hirvonen at digia.com (Hirvonen Olli) Date: Sat, 29 Jun 2013 09:28:02 +0000 Subject: [Development] Qt5.1 new snapshot In-Reply-To: <1683992.KHzJEmdqHl@tjmaciei-mobl2> References: <3813837.P9Vnxi6l90@tjmaciei-mobl2> <1B00CEBCD57FD445BD8228C9300DAE294D84081D@IT-EXMB02-HKI.it.local>, <1683992.KHzJEmdqHl@tjmaciei-mobl2> Message-ID: <87B846C5-FA88-43FE-B390-3307816AEB9E@digia.com> RC2 is now out. Sorry about delay. There were some blockers. Now everything is fixed. Details from Jani Heikkinen on Monday. "Thiago Macieira" kirjoitti 29.6.2013 kello 1.20: > On sexta-feira, 28 de junho de 2013 18.53.52, Turunen Tuukka wrote: >>> What prevented the RC2? >> >> There were a few issues that were found so late that it was not possible to >> get the fixes into today's packages any more. If all goes well they are in >> the packages tomorrow morning. It would not have made sense to release RC2 >> with those items - especially as all these were easy to fix. Details can be >> seen from codereview - submodule update with these fixes is running now. I >> hope we get a very good RC2 and can proceed soon to final based on it >> (perhaps even without any changes, of with a very, very small amount on >> modifications). > > Hmm... something is off here. The last release team meeting said "release RC2 > on Wednesday if sanity checking passes". You're telling me something different > now: there were changes that didn't make it in, by Friday. > > Were those changes P0 or P1? If there were no P0 or P1 fixes, RC2 should have > been released. > > Someone made a decision to not release today. I'd like to know the details. > What changes are those? Why are they showstoppers? > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development From Simon.Hausmann at digia.com Sat Jun 29 15:12:14 2013 From: Simon.Hausmann at digia.com (Hausmann Simon) Date: Sat, 29 Jun 2013 13:12:14 +0000 Subject: [Development] Improving QtQuick internals (was Re: QML engine changes) In-Reply-To: References: , Message-ID: There was an attempt of disabling parent changes in qtquick 2 back in august, first behind QML_PARENT_TEST=1 for a transition. It was then intended to become the default once everything was ported. Unfortunately that never happened and the check is still there but disabled by default. Now I think too much would break. Simon Alan Alpert <416365416c at gmail.com> wrote: On Fri, Jun 28, 2013 at 1:48 AM, Nils Jeisecke wrote: > Hi Alan, > > On Fri, Jun 28, 2013 at 9:25 AM, Alan Alpert <416365416c at gmail.com> wrote: >> There is. The QQuickItem tree and the QObject tree are technically >> separate. Usually when you assign QQuickItem parentage it also assigns >> QObject parentage, but that's because of how the QML language >> implicitly defines a QObject tree in a similar way to how QQuickItem >> does it. Using "parent:" messes that up. > thank you very much for your comments. But wouldn't this classify any > reparenting of objects that are declared in the tree as "bad Qml"? Or > does it make any difference whether parent is assigned during > initialization (like in the example) or afterwards (e.g. in a state > change). > If it does that would imply an undefined behavior, which should be > forbidden or at least generate a warning. During initialization or afterwards does make a big difference. The various initialization statements are the parts which a declarative language can theoretically implement in an undefined order. Anything tied to an actual event (a state change, or in a signal handler like Component.onCompleted) has a defined place in the program flow and thus is not bad (although doing something imperatively when you could do it declaratively is not great, that's a bit of a different issue). > Unfortunately using Qml also means experimenting a lot. And if > something works as expected, you're easily tempted to consider this as > good practice ;-) Yeah, can't fault you for sticking with what works :) . This is why we tend to be strict about what works in order to encourage good application patterns, like how anchors can't be set to un-related items. I think we might want to disable setting the "parent" property from QML in a future version of QtQuick, to prevent this kind of mistake. -- Alan Alpert _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From qt at leemes.de Sat Jun 29 19:00:25 2013 From: qt at leemes.de (Sebastian Lehmann) Date: Sat, 29 Jun 2013 19:00:25 +0200 Subject: [Development] Future of QtOpenCL Message-ID: <20130629190025.09u4y2r74occcc0s@webmail.leemes.de> Hello Qt developers, I'm sadly noting that the QtOpenCL project [1] is dead since end 2010, yet it's still usable. I want to bring this module back to life. Currently, the module has a couple of issues such as const-correctness and missing support for Qt5. I see two options with that: Either rewriting the whole module with a new design, or improving the existing code base. Also, I'd love to have some basic, generic and reusable algorithms implemented in OpenCL and available with an interface similar to QtConcurrent. This could be in a separate module. I have some nice ideas for the design of this. Some people say that there's no big advantage in having a QtOpenCL module, as everything can also be done with CL library function calls. But both the advantage of RAII as well as having a Qt'ish interface are a huge help when writing applications with a lot of GPGPU computations, as the raw CL functions are way too painful to write (and read). How's your opinion about bringing QtOpenCL back to life (especially in Qt5)? Any concrete ideas or suggestions? Anyone out there who wants to help? How is the typical "workflow" for new modules in Qt5? Cheers, Leemes PS: I already read through the Qt Contribution Guidelines. PPS: I'm currently writing an OpenCL powered application with the "old" QtOpenCL module within the context of a GPGPU computing course I'm taking. I have quite a good knowledge of GPGPU computing as well as the old QtOpenCL module and its flaws. But I think this won't be enough to rewrite a whole new Qt5 module from scratch. So I think this won't work unless some people from the community can be found willing to help. [1]: http://doc.qt.digia.com/opencl-snapshot/ From lpapp at kde.org Sat Jun 29 19:40:00 2013 From: lpapp at kde.org (Laszlo Papp) Date: Sat, 29 Jun 2013 20:40:00 +0300 Subject: [Development] Future of QtOpenCL In-Reply-To: <20130629190025.09u4y2r74occcc0s@webmail.leemes.de> References: <20130629190025.09u4y2r74occcc0s@webmail.leemes.de> Message-ID: On Sat, Jun 29, 2013 at 8:00 PM, Sebastian Lehmann wrote: > Hello Qt developers, > > I'm sadly noting that the QtOpenCL project [1] is dead since end 2010, > yet it's still > usable. I want to bring this module back to life. Currently, the > module has a couple of > issues such as const-correctness and missing support for Qt5. > > I see two options with that: Either rewriting the whole module with a > new design, or > improving the existing code base. > > Also, I'd love to have some basic, generic and reusable algorithms > implemented in OpenCL > and available with an interface similar to QtConcurrent. This could be > in a separate > module. I have some nice ideas for the design of this. > > Some people say that there's no big advantage in having a QtOpenCL > module, as everything > can also be done with CL library function calls. It is good to have a choice, at least! > But both the > advantage of RAII as well > as having a Qt'ish interface are a huge help when writing applications > with a lot of > GPGPU computations, as the raw CL functions are way too painful to > write (and read). > > How's your opinion about bringing QtOpenCL back to life (especially in > Qt5)? Any concrete > ideas or suggestions? > +1 Disclaimer: I am not a maintainer, but I was also thinking of contributing 1-2 patches in that area. There were always other toys to play with though. ;-) I am sure, Sean for instance will support such a playground project as a (Qt3D) maintainer. > Anyone out there who wants to help? How is the typical "workflow" for > new modules in Qt5? > http://qt-project.org/wiki/Creating-a-new-module-or-tool-for-Qt Many thanks, Laszlo -------------- next part -------------- An HTML attachment was scrubbed... URL: From lpapp at kde.org Sat Jun 29 20:09:17 2013 From: lpapp at kde.org (Laszlo Papp) Date: Sat, 29 Jun 2013 21:09:17 +0300 Subject: [Development] Release branch change criteria In-Reply-To: <10559427.9SQxTGlapb@tjmaciei-mobl2> References: <10559427.9SQxTGlapb@tjmaciei-mobl2> Message-ID: I agree ... Laszlo On Sat, Jun 29, 2013 at 1:18 AM, Thiago Macieira wrote: > I'm seeing lots of changes going into the release branch that I really > can't > understand why. > > In general, those changes seem to fall into three categories: > 1) fixes for showstoppers > 2) fixes for important issues that we'd like to get released ASAP, if > possible > 3) changes I could not understand the reason for > > In other words: > 1) P0 ("Blocker") and P1 ("Showstopper") > 2) P2 ("Important") > 3) ? > > So I'd like to propose the following: > > > Every change to the release branch MUST have a Task-number associated and > said > task number must be classified as P0 to P2. Changes without Task-number or > whose task are P3 or lower must be rejected and bounced off to "stable". > > If you find an issue that is important and you'd like fixed in the upcoming > release, but there's no task for, open a task and classify it P0 to P2. > This > extra step is to make us think whether the change is really important for > this > release. > > > I'm saying that because I know I am guilty of some changes to release that > shouldn't have been there, on second thought. I am also the author of a > couple > of build fixes, which are technically P1 or P2, but there was no task > associated explaining why they are P1 or P2. > > -- > Thiago Macieira - thiago.macieira (AT) intel.com > Software Architect - Intel Open Source Technology Center > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > > -------------- next part -------------- An HTML attachment was scrubbed... URL: From nagymatef at freemail.hu Sat Jun 29 20:50:07 2013 From: nagymatef at freemail.hu (=?utf-8?B?TmFneS1FZ3JpIE3DoXTDqSBGZXJlbmM=?=) Date: Sat, 29 Jun 2013 18:50:07 +0000 Subject: [Development] =?utf-8?q?Future_of_QtOpenCL?= Message-ID: Hi! I myself would be interested also. RIght now I’m implementing a giant project using the cl.hpp headers to make use of RAII. I too think that having a Qt-ish interface would be beneficial, but only if all entities are QObjects, able to operate on their own (in a seperate thread if one wishes). That could greatly facilitate many things. Having generic parallel algorithms is a good thought, however implementing it in a performance-portable manner is no small feat. I consider myself to be a black-belt OpenCL programmer (having worked with OpenCL since it’s first beta releases with AMD Stream SDK), but even I would think twice about implementing STL-like algorithms in OpenCL, and claim them to be worthwhile using for someone who know practically nothing about things under the hood. (Bolt and stuff like that aim just this, and I wouldn’t claim I could do nearly as good of a job as the OpenCL vendor implementors themselves) I have thought about reviving the project myself, but bounced off the burden of contributing rules, and means. (gerrit, git and the likes, although I do use git myself with collegues) Anyhow, through the summer I would be happy to help designing the interfae and commenting on your work, but I fear I cannot promise anything more than that (actual code submission). Also, geting QtOpenCL to work would require reimplementing cl.hpp, as those headers change fairly quickly (every 6 months, when the AMD APPSDK is released, as the C++ headers are not truly standard, but a sideproject of AMD that Khronos publishes on their webpage), so I fear that the quality of portability that Qt requires would not allow us to use those headers, given the rate they change. As a sidenote, I think QOpenCL... class names would be a lot better, having QOpenGL... taking over QGL classes. The biggest advantage of implementing QOpenCL would be if it were to interoperate with the existing QOpenGL classes, and that is where the nasty stuff begin. I have created several interop applications, I am roughly familiar with OpenGL (able to write simple shaders myself, know a few advanced features) and designing the interop part is not easy either. If you need any help or theoretical input, I would be glad to help. Cheers, Máté Feladó: Laszlo Papp Elküldve: ‎szombat‎, ‎2013‎. ‎június‎ ‎29‎. ‎19‎:‎40 Címzett: Sebastian Lehmann Másolat: development at qt-project.org On Sat, Jun 29, 2013 at 8:00 PM, Sebastian Lehmann wrote: Hello Qt developers, I'm sadly noting that the QtOpenCL project [1] is dead since end 2010, yet it's still usable. I want to bring this module back to life. Currently, the module has a couple of issues such as const-correctness and missing support for Qt5. I see two options with that: Either rewriting the whole module with a new design, or improving the existing code base. Also, I'd love to have some basic, generic and reusable algorithms implemented in OpenCL and available with an interface similar to QtConcurrent. This could be in a separate module. I have some nice ideas for the design of this. Some people say that there's no big advantage in having a QtOpenCL module, as everything can also be done with CL library function calls. It is good to have a choice, at least! But both the advantage of RAII as well as having a Qt'ish interface are a huge help when writing applications with a lot of GPGPU computations, as the raw CL functions are way too painful to write (and read). How's your opinion about bringing QtOpenCL back to life (especially in Qt5)? Any concrete ideas or suggestions? +1 Disclaimer: I am not a maintainer, but I was also thinking of contributing 1-2 patches in that area. There were always other toys to play with though. ;-) I am sure, Sean for instance will support such a playground project as a (Qt3D) maintainer. Anyone out there who wants to help? How is the typical "workflow" for new modules in Qt5? http://qt-project.org/wiki/Creating-a-new-module-or-tool-for-Qt Many thanks, Laszlo -------------- next part -------------- An HTML attachment was scrubbed... URL: -------------- next part -------------- _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development From dangelog at gmail.com Sat Jun 29 21:34:56 2013 From: dangelog at gmail.com (Giuseppe D'Angelo) Date: Sat, 29 Jun 2013 21:34:56 +0200 Subject: [Development] Release branch change criteria In-Reply-To: <10559427.9SQxTGlapb@tjmaciei-mobl2> References: <10559427.9SQxTGlapb@tjmaciei-mobl2> Message-ID: On 29 June 2013 00:18, Thiago Macieira wrote: > > Every change to the release branch MUST have a Task-number associated and said > task number must be classified as P0 to P2. Changes without Task-number or > whose task are P3 or lower must be rejected and bounced off to "stable". > > If you find an issue that is important and you'd like fixed in the upcoming > release, but there's no task for, open a task and classify it P0 to P2. This > extra step is to make us think whether the change is really important for this > release. I agree, although I see the risk of not being 100% objective when doing such bug triaging and being very close to a (minor) release... -- Giuseppe D'Angelo From Liang.Qi at digia.com Sat Jun 29 21:35:17 2013 From: Liang.Qi at digia.com (Qi Liang) Date: Sat, 29 Jun 2013 19:35:17 +0000 Subject: [Development] Future of QtOpenCL In-Reply-To: <20130629190025.09u4y2r74occcc0s@webmail.leemes.de> References: <20130629190025.09u4y2r74occcc0s@webmail.leemes.de> Message-ID: +1 The old repo for it: http://qt.gitorious.org/qt-labs/opencl I could help to modularize it for Qt 5 if nobody wants to try it. At least I could review the modularize work. Regards, Liang ________________________________________ From: Sebastian Lehmann Sent: Saturday, June 29, 2013 7:00 PM To: development at qt-project.org Subject: [Development] Future of QtOpenCL Hello Qt developers, I'm sadly noting that the QtOpenCL project [1] is dead since end 2010, yet it's still usable. I want to bring this module back to life. Currently, the module has a couple of issues such as const-correctness and missing support for Qt5. I see two options with that: Either rewriting the whole module with a new design, or improving the existing code base. Also, I'd love to have some basic, generic and reusable algorithms implemented in OpenCL and available with an interface similar to QtConcurrent. This could be in a separate module. I have some nice ideas for the design of this. Some people say that there's no big advantage in having a QtOpenCL module, as everything can also be done with CL library function calls. But both the advantage of RAII as well as having a Qt'ish interface are a huge help when writing applications with a lot of GPGPU computations, as the raw CL functions are way too painful to write (and read). How's your opinion about bringing QtOpenCL back to life (especially in Qt5)? Any concrete ideas or suggestions? Anyone out there who wants to help? How is the typical "workflow" for new modules in Qt5? Cheers, Leemes PS: I already read through the Qt Contribution Guidelines. PPS: I'm currently writing an OpenCL powered application with the "old" QtOpenCL module within the context of a GPGPU computing course I'm taking. I have quite a good knowledge of GPGPU computing as well as the old QtOpenCL module and its flaws. But I think this won't be enough to rewrite a whole new Qt5 module from scratch. So I think this won't work unless some people from the community can be found willing to help. [1]: http://doc.qt.digia.com/opencl-snapshot/ From qt at leemes.de Sat Jun 29 22:18:04 2013 From: qt at leemes.de (Sebastian Lehmann) Date: Sat, 29 Jun 2013 22:18:04 +0200 Subject: [Development] Future of QtOpenCL In-Reply-To: References: Message-ID: <20130629221804.je8nkbve8o8ockko@webmail.leemes.de> Hi Máté, > Also, geting QtOpenCL to work would require reimplementing cl.hpp [...] > I fear that the quality of portability that Qt requires would not > allow us to use those headers, given the rate they change. I also think that we shouldn't depend on cl.hpp, only on cl.h. AFAIK, the old QtOpenCL implementation only uses cl.h. > I too think that having a Qt-ish interface would be beneficial, but > only if all entities are QObjects, able to operate on their own (in > a seperate thread if one wishes). That could greatly facilitate many > things. I'm not yet sure, but it sounds good for most classes. But I think we should allow copying QOpenCLBuffer / Vector classes for convenience. Not sure yet, as I said. But not many classes of the old QtOpenCL derive from QObject (if any?). > Having generic parallel algorithms is a good thought, however > implementing it in a performance-portable manner is no small feat. I > consider myself to be a black-belt OpenCL programmer (having worked > with OpenCL since it?s first beta releases with AMD Stream SDK), > but even I would think twice about implementing STL-like algorithms > in OpenCL, and claim them to be worthwhile using for someone who > know practically nothing about things under the hood. (Bolt and > stuff like that aim just this, and I wouldn?t claim I could do > nearly as good of a job as the OpenCL vendor implementors themselves) Yes, I see your point. I also think that implementing generic CL algos is very challenging. I thought of starting with basic algorithms like transform and reduction. In my current project, I implemented them in a very generic way: they can operate on any type and with any expression, both decided during runtime using strings (as they are compiled into the kernel). I think of something like QOpenCLType and QOpenCLFunctor which can then be used in the CL algorithm library analogous to template types and functors in STL. A 1:1 mapping is too hard, though (if even possible). But we shouldn't spend too much thoughts on this yet, as this makes only sense if the rest works. > I have thought about reviving the project myself, but bounced off > the burden of contributing rules, and means. (gerrit, git and the > likes, although I do use git myself with collegues) This would be my very first contribution to Qt. This is why I need others, as developing a new Qt module is not something I think I'm capable of without any help. > Anyhow, through the summer I would be happy to help designing the > interfae and commenting on your work, but I fear I cannot promise > anything more than that (actual code submission). We should start with a proper design anyhow, which I guess will take a couple of months. > As a sidenote, I think QOpenCL... class names would be a lot better, > having QOpenGL... taking over QGL classes. +1 > The biggest advantage of implementing QOpenCL would be if it were to > interoperate with the existing QOpenGL classes, and that is where > the nasty stuff begin. I have created several interop applications, > I am roughly familiar with OpenGL (able to write simple shaders > myself, know a few advanced features) and designing the interop part > is not easy either. I think we should split the interop in two "layers": First, make it possible to use the CL interop functionalities with the raw GL types. For example: to create a QOpenCLBuffer from a GLint, not from a QOpenGLBuffer. Then, we can add simple convenience functions which use QOpenGLBuffer::bufferId instead. I already worked with CL/GL interop, but I might have too little experience to see difficulties beyond this. Maybe we need more input on this. By the way, the old QtOpenCL was split into two modules: QtOpenCL + QtOpenCLGL. We should do the same. And *if* we decide to implement algos, this should be in a third module. I'm already looking forward on making progress with CL in Qt! Happy coding, Sebastian > > > Feladó: Laszlo Papp > Elküldve: ?szombat?, ?2013?. ?június? ?29?. ?19?:?40 > Címzett: Sebastian Lehmann > Másolat: development at qt-project.org > > > On Sat, Jun 29, 2013 at 8:00 PM, Sebastian Lehmann wrote: > > > > Hello Qt developers, > > I'm sadly noting that the QtOpenCL project [1] is dead since end 2010, > yet it's still > usable. I want to bring this module back to life. Currently, the > module has a couple of > issues such as const-correctness and missing support for Qt5. > > I see two options with that: Either rewriting the whole module with a > new design, or > improving the existing code base. > > Also, I'd love to have some basic, generic and reusable algorithms > implemented in OpenCL > and available with an interface similar to QtConcurrent. This could be > in a separate > module. I have some nice ideas for the design of this. > > Some people say that there's no big advantage in having a QtOpenCL > module, as everything > can also be done with CL library function calls. > > > > > It is good to have a choice, at least! > > > > But both the > advantage of RAII as well > as having a Qt'ish interface are a huge help when writing applications > with a lot of > GPGPU computations, as the raw CL functions are way too painful to > write (and read). > > How's your opinion about bringing QtOpenCL back to life (especially in > Qt5)? Any concrete > ideas or suggestions? > > > > > > +1 > > > > > Disclaimer: I am not a maintainer, but I was also thinking of > contributing 1-2 patches in that area. There were always other toys > to play with though. ;-) > > > > > I am sure, Sean for instance will support such a playground project > as a (Qt3D) maintainer. > > > > Anyone out there who wants to help? How is the typical "workflow" for > new modules in Qt5? > > > > > > http://qt-project.org/wiki/Creating-a-new-module-or-tool-for-Qt > > > > > > Many thanks, > > Laszlo From qt at leemes.de Sat Jun 29 22:26:09 2013 From: qt at leemes.de (Sebastian Lehmann) Date: Sat, 29 Jun 2013 22:26:09 +0200 Subject: [Development] Future of QtOpenCL In-Reply-To: References: <20130629190025.09u4y2r74occcc0s@webmail.leemes.de> Message-ID: <20130629222609.4khbbjb47408480g@webmail.leemes.de> Hi Liang, thanks for being proactive. If you could help modularizing it, this would actually be very helpful, as I'm new to Qt contribution. I am already busy getting started with gerrit, jira and stuff. I think we should start with a fresh reimplementation of these two modules in a new repo: * QtOpenCL * QtOpenCLGL This is how it was called in the old repo. We should copy over the code piece by piece, as I think we sould take the chance to make radical changes like deriving classes from QObjects (where it makes sense), constness, class names, etc. What do you think? Where is the design of a new (qt lab) module typically discussed? IRC #qt-lab or in this mailing list? What design tools do you use typically? Do you design UML diagrams very precise before starting to write code? Any favorite tools / formats? Regards, Sebastian Quoting Qi Liang : > +1 > > The old repo for it: > http://qt.gitorious.org/qt-labs/opencl > > I could help to modularize it for Qt 5 if nobody wants to try it. At > least I could review the modularize work. > > Regards, > Liang > > ________________________________________ > From: Sebastian Lehmann > Sent: Saturday, June 29, 2013 7:00 PM > To: development at qt-project.org > Subject: [Development] Future of QtOpenCL > > Hello Qt developers, > > I'm sadly noting that the QtOpenCL project [1] is dead since end 2010, > yet it's still > usable. I want to bring this module back to life. Currently, the > module has a couple of > issues such as const-correctness and missing support for Qt5. > > I see two options with that: Either rewriting the whole module with a > new design, or > improving the existing code base. > > Also, I'd love to have some basic, generic and reusable algorithms > implemented in OpenCL > and available with an interface similar to QtConcurrent. This could be > in a separate > module. I have some nice ideas for the design of this. > > Some people say that there's no big advantage in having a QtOpenCL > module, as everything > can also be done with CL library function calls. But both the > advantage of RAII as well > as having a Qt'ish interface are a huge help when writing applications > with a lot of > GPGPU computations, as the raw CL functions are way too painful to > write (and read). > > How's your opinion about bringing QtOpenCL back to life (especially in > Qt5)? Any concrete > ideas or suggestions? > > Anyone out there who wants to help? How is the typical "workflow" for > new modules in Qt5? > > Cheers, > > Leemes > > > PS: I already read through the Qt Contribution Guidelines. > > PPS: I'm currently writing an OpenCL powered application with the > "old" QtOpenCL module > within the context of a GPGPU computing course I'm taking. I have > quite a good knowledge > of GPGPU computing as well as the old QtOpenCL module and its flaws. > But I think this > won't be enough to rewrite a whole new Qt5 module from scratch. So I > think this won't > work unless some people from the community can be found willing to help. > > > [1]: http://doc.qt.digia.com/opencl-snapshot/ > From Uwe.Rathmann at tigertal.de Sun Jun 30 09:18:56 2013 From: Uwe.Rathmann at tigertal.de (Uwe Rathmann) Date: Sun, 30 Jun 2013 07:18:56 +0000 (UTC) Subject: [Development] Future of QtOpenCL References: <20130629221804.je8nkbve8o8ockko@webmail.leemes.de> Message-ID: On Sat, 29 Jun 2013 22:18:04 +0200, Sebastian Lehmann wrote: >> I have thought about reviving the project myself, but bounced off the >> burden of contributing rules, and means. (gerrit, git and the likes, >> although I do use git myself with collegues) Before starting with this project you should ask yourself if it is better to do develop it inside or outside of Qt - or in other words: what is the advantage of being a Qt module compared to addons like Qxt or Qwt ? The very first issue for an existing project is about checking its license. At the time when I was asking myself the same question for my project I would have had to change the license - giving Nokia control. Beside the fact, that I didn't want this: any change of the license requires permission of all contributors to the existing code - hard to collect for a project with some history ( in my case 16 years ). Hope this has changed nowadays. But even then you should be aware, that being a Qt module means administrative overhead and you should have an idea what real advantages to expect. Being a Qt module only because of being one doesn't make the project more useful or attractive to other users/developers. Uwe From qtnext at gmail.com Sun Jun 30 10:46:52 2013 From: qtnext at gmail.com (qtnext) Date: Sun, 30 Jun 2013 10:46:52 +0200 Subject: [Development] Multimedia :video : loop, in out property Message-ID: Hi, I have just test the last multimedia parts : it rocks now ! playback seems to works, camera is working on desktop mac, ... but there is a very important missing property : there is no way to smoothly loop a media : it's important for digital signage but also it can be very usefull on qml to have a dynamic background. The only way to do that is to check when the media comes to the end and restart the media, in this case the loop is not good, it's a too high level way to do that, and I am sure that on most backend it's easy to do on the low level backend. Is it possible to add theses properties to the multimedia : isLoopable, loop property and perhaps in/out property to allow a playback on a range ? -------------- next part -------------- An HTML attachment was scrubbed... URL: From andre at familiesomers.nl Sun Jun 30 11:21:56 2013 From: andre at familiesomers.nl (Andre Somers) Date: Sun, 30 Jun 2013 11:21:56 +0200 Subject: [Development] Multimedia :video : loop, in out property In-Reply-To: References: Message-ID: <51CFF8B4.8000808@familiesomers.nl> Op 30-6-2013 10:46, qtnext schreef: > Hi, > > I have just test the last multimedia parts : it rocks now ! playback > seems to works, camera is working on desktop mac, ... but there is a > very important missing property : there is no way to smoothly loop a > media : it's important for digital signage but also it can be very > usefull on qml to have a dynamic background. The only way to do that > is to check when the media comes to the end and restart the media, in > this case the loop is not good, it's a too high level way to do that, > and I am sure that on most backend it's easy to do on the low level > backend. Is it possible to add theses properties to the multimedia : > isLoopable, loop property and perhaps in/out property to allow a > playback on a range ? > > Using the C++ API at least, you can use the QMediaPlaylist class to achieve this. Just make a list of one, and set the playbackmode to Loop. I don't know if you can do something similar in QML though. André From qt at leemes.de Sun Jun 30 12:36:18 2013 From: qt at leemes.de (Sebastian Lehmann) Date: Sun, 30 Jun 2013 12:36:18 +0200 Subject: [Development] Future of QtOpenCL Message-ID: <20130630123618.6gyhif900c0gw0cs@webmail.leemes.de> Quoting Uwe Rathmann : > On Sat, 29 Jun 2013 22:18:04 +0200, Sebastian Lehmann wrote: > >>> I have thought about reviving the project myself, but bounced off the >>> burden of contributing rules, and means. (gerrit, git and the likes, >>> although I do use git myself with collegues) > > Before starting with this project you should ask yourself if it is better > to do develop it inside or outside of Qt - or in other words: what is the > advantage of being a Qt module compared to addons like Qxt or Qwt ? I see the strong developer community behind Qt as a huge advantage. QtOpenCL currently has to be considered dead. Of course, being a Qt module doesn't mean every developer of Qt helps developing this module. But things like release plans of Qt enforce that the module gets stable some time. I see the same advantage currently at Qt3D. It wasn't a Qt module until now AFAIK, but now it is going to be, so now we have "clear plans" to release it with Qt 5.2. Maybe I'm too new to Qt development to see the advantages / disadvantages clearly. Thanks for discussing alternatives. > The very first issue for an existing project is about checking its > license. At the time when I was asking myself the same question for my > project I would have had to change the license - giving Nokia control. > Beside the fact, that I didn't want this: any change of the license > requires permission of all contributors to the existing code - hard to > collect for a project with some history ( in my case 16 years ). Hope > this has changed nowadays. The old QtOpenCL seems to be LGPL, even more permissive? (LGPL_EXCEPTION.txt) > But even then you should be aware, that being a Qt module means > administrative overhead and you should have an idea what real advantages > to expect. Being a Qt module only because of being one doesn't make the > project more useful or attractive to other users/developers. The old QtOpenCL was a labs project, but it has been written with becoming an official Qt module some day in mind. We could first develop a new QtOpenCL module in the same way before making it an official Qt module. -- Sebastian From Uwe.Rathmann at tigertal.de Sun Jun 30 13:43:21 2013 From: Uwe.Rathmann at tigertal.de (Uwe Rathmann) Date: Sun, 30 Jun 2013 11:43:21 +0000 (UTC) Subject: [Development] Future of QtOpenCL References: <20130630123618.6gyhif900c0gw0cs@webmail.leemes.de> Message-ID: On Sun, 30 Jun 2013 12:36:18 +0200, Sebastian Lehmann wrote: > I see the strong developer community behind Qt as a huge advantage. Well, from the low traffic on the mailing lists on weekends it is quite obvious, that - even if being a real open source project - Qt is driven by companies with commercial interests. I would guess that there is only a very small minority of developers working on Qt projects beside there daily job. So IMHO in the end the right decision depends on if one of those companies will be interested in the code ( from the fact that it was dead so far the answer might be: no ). If not you might find yourself doing an one man show in an environment with tools and rules that are made for a big community project. Over the years I have lost some of my illusions about open source development. I usually don't even get answers when asking for support for my project ( Qwt ) - stuff like testing code on specific platforms, setting up a nicer project page or helping with the docs. If you don't do it yourself, nobody does it. F.e. look at projects like pyqwt or qwtplot3d. Nobody ever took this code when the authors lost their interest - even if their outdated versions are still popular. It is indeed an interesting question if there would appear more resources when being developed under the qt-project umbrella. Uwe From qt at leemes.de Sun Jun 30 14:05:59 2013 From: qt at leemes.de (Sebastian Lehmann) Date: Sun, 30 Jun 2013 14:05:59 +0200 Subject: [Development] Future of QtOpenCL In-Reply-To: References: <20130630123618.6gyhif900c0gw0cs@webmail.leemes.de> Message-ID: <20130630140559.ori8iko9k0ccg8go@webmail.leemes.de> Quoting Uwe Rathmann : > On Sun, 30 Jun 2013 12:36:18 +0200, Sebastian Lehmann wrote: > >> I see the strong developer community behind Qt as a huge advantage. > > Well, from the low traffic on the mailing lists on weekends it is quite > obvious, that - even if being a real open source project - Qt is driven > by companies with commercial interests. I would guess that there is only > a very small minority of developers working on Qt projects beside there > daily job. > > So IMHO in the end the right decision depends on if one of those > companies will be interested in the code ( from the fact that it was dead > so far the answer might be: no ). If not you might find yourself doing an > one man show in an environment with tools and rules that are made for a > big community project. AFAIK QtOpenCL died because the office in which it was developed (Brisbane Nokia) fired a lot developers. In 2012, the office was closed. It simply wasn't continued in another office or by the community. And I want to change this. Maybe if someone does the initial work, a company is interested to continue. (I'm thinking of KDAB as an example, as they are maintaining Qt3D and I think they might be interested (in the future).) > Over the years I have lost some of my illusions about open source > development. I usually don't even get answers when asking for support for > my project ( Qwt ) - stuff like testing code on specific platforms, > setting up a nicer project page or helping with the docs. If you don't do > it yourself, nobody does it. > > F.e. look at projects like pyqwt or qwtplot3d. Nobody ever took this code > when the authors lost their interest - even if their outdated versions > are still popular. Thanks for being not overly optimistic. Maybe I'm too excited to see the problems. It'd be so nice having QtOpenCL as an official module. I'd love to put effort into this, even in my spare time. I don't say the module could be ready in a few months; it might take one or two years if driven by a few people from the community only. I appreciate any further input. If it's a completely unrealistic plan, we shouldn't continue. But I'd love to. From Uwe.Rathmann at tigertal.de Sun Jun 30 14:23:24 2013 From: Uwe.Rathmann at tigertal.de (Uwe Rathmann) Date: Sun, 30 Jun 2013 12:23:24 +0000 (UTC) Subject: [Development] Future of QtOpenCL References: <20130630123618.6gyhif900c0gw0cs@webmail.leemes.de> <20130630140559.ori8iko9k0ccg8go@webmail.leemes.de> Message-ID: On Sun, 30 Jun 2013 14:05:59 +0200, Sebastian Lehmann wrote: > Thanks for being not overly optimistic. Maybe I'm too excited to see the > problems. It'd be so nice having QtOpenCL as an official module. I'd > love to put effort into this, even in my spare time. I don't say the > module could be ready in a few months; it might take one or two years if > driven by a few people from the community only. I don't want to discourage you - all I want to say is that this project probably depends mainly on you and you have to find a process that fits to your habits and the time you are able to spend on it. Keeping up the motivation heavily depends on that you work on the code exactly the way you want to - pressure because of schedules simply doesn't work for something you do as a hobby. Throwing an idea on a mailing list with some positive response + setting up some initial administrative steps is something I have seen often. But writing and maintaining code over a longer period is a very, very different thing. Uwe From cavendish.qi at gmail.com Sun Jun 30 15:50:54 2013 From: cavendish.qi at gmail.com (Liang Qi) Date: Sun, 30 Jun 2013 15:50:54 +0200 Subject: [Development] Some information about qt-labs projects from gitorious and gerrit Message-ID: http://qt-project.org/wiki/Category:Qt-Labs-Projects Welcome to update. | Gitorious | Gerrit | Project Name | Notes | | * | | wolfenqt | | | * | | graphics-dojo | | | * | * | jom | Active? last update 5 months ago | | | * | jira2gv | | | * | | itemviews-ng | | | * | * | qtscriptgenerator | last update Jan. 23, 2012 | | * | | qtscript-remote-debugging | | | * | | scxml | | | * | | qtestlib-tools | | | * | | segmentedbutton | | | * | | webclient | | | * | * | messagingframework | Active | | * | | widgets-ng | | | * | | mobile-demos | | | * | | qtspotify | | | * | | bm | | | * | | qt3d | | | * | | webscraps | | | * | | nacl | | | * | | modelviewer | | | * | | devdays-windowsystem-server | | | * | | devdays-graphicssystem-plugin | | | * | | maemo5-homescreen | | | * | | opencl | | | * | | coroutine | | | * | | doxygen2qthelp | | | * | | doctools | | | * | | simulator | | | * | | remotecontrolwidget | | | * | | qtuitest | | | * | | systemtests | | | * | | qmlogre | | | * | | qtjambi-awtbridge | | | * | | simplegl | | | * | | symbian-overlay | | | * | | qml-object-model | | | * | | qmlcanvas | graduated to qt5 | | * | * | vstools | Active | | * | * | gimp-qmlexporter | last update Jul. 05, 2010 | | * | | qml-gesturearea | | | * | | qml-gestures-examples | | | * | | scene-graph | graduated to qt5 | | * | * | photoshop-qmlexporter | last update Dec. 16, 2010 | | * | | qt-autotester | | | * | | kineticscroller | | | * | * | qtest-qml | Active | | * | | qml-toucharea | | | * | | qtmodularization | graduated to qt5 | | * | | qt-compositor | | | * | | qtscript-browser-env | | | * | | qml1-shadersplugin | | | * | | devscripts | | | * | * | qml-presentation-system | Active, last update May 15, 2013 | | * | | scene-graph-demo | | | * | | qtcollator | | | * | | qwebchannel | | | * | | devnet-examples | | | * | * | qtaddonmimetype | last update Sep. 19, 2011 | | * | | meespot | last update May 21, 2012 | | * | | qtgraphicaleffects | graduated to qt5 | | * | | bm2 | | | * | * | qbs | Active | | * | | qt5-launch-demo | | | * | * | qtwebengine | Active | -- http://www.qiliang.net -------------- next part -------------- An HTML attachment was scrubbed... URL: From qtnext at gmail.com Sun Jun 30 17:01:21 2013 From: qtnext at gmail.com (qtnext) Date: Sun, 30 Jun 2013 17:01:21 +0200 Subject: [Development] Multimedia :video : loop, in out property In-Reply-To: <51CFF8B4.8000808@familiesomers.nl> References: <51CFF8B4.8000808@familiesomers.nl> Message-ID: yes I know.... but you have far from a seamless loop ... and it should be so easy to do that on a low level side .. 2013/6/30 Andre Somers > Op 30-6-2013 10:46, qtnext schreef: > > Hi, > > > > I have just test the last multimedia parts : it rocks now ! playback > > seems to works, camera is working on desktop mac, ... but there is a > > very important missing property : there is no way to smoothly loop a > > media : it's important for digital signage but also it can be very > > usefull on qml to have a dynamic background. The only way to do that > > is to check when the media comes to the end and restart the media, in > > this case the loop is not good, it's a too high level way to do that, > > and I am sure that on most backend it's easy to do on the low level > > backend. Is it possible to add theses properties to the multimedia : > > isLoopable, loop property and perhaps in/out property to allow a > > playback on a range ? > > > > > Using the C++ API at least, you can use the QMediaPlaylist class to > achieve this. Just make a list of one, and set the playbackmode to Loop. > I don't know if you can do something similar in QML though. > > André > > _______________________________________________ > Development mailing list > Development at qt-project.org > http://lists.qt-project.org/mailman/listinfo/development > -------------- next part -------------- An HTML attachment was scrubbed... URL: From nagymatef at freemail.hu Sun Jun 30 20:25:24 2013 From: nagymatef at freemail.hu (=?utf-8?B?TmFneS1FZ3JpIE3DoXTDqSBGZXJlbmM=?=) Date: Sun, 30 Jun 2013 18:25:24 +0000 Subject: [Development] =?utf-8?q?Future_of_QtOpenCL?= Message-ID: The way I see it, is that Qt would definately benefit from stable, Qt interface to a cross-platform compute API. There are many things under the hood, that could be acomplished through it, if it is stable enough. The very long term plan of integrating it into QtConcurrent is practically what Microsoft is doing with their concurrent:: namespace and C++AMP. Problem is, that it is not implemented at all outside the MS ecosystem, while OpenCL can be called widespread enough (although there are some concerns with the NV implementation, but in the long run, they will have to stand in the long line of stable implementors). About community power for actual code writing, that is exactly why I said that I am very much interested, I might even be able to submit code (given the fact how much I am fascinated by the usability of Qt as a somewhat newbie to it), but I am a PhD physicist with a full-time administrator job, so my spare time is very limited. My contribution will most likely consist of code comments, and API design suggestions. Since I have a somewhat larger project (as part of my PhD thesis) built atop Qt, and I very much fancy readable/maintainable code, I would very much like having a cleaner, globally Qt-like infrastructure under the hood. I understand the concerns, but believe that 2-3-4 people could put the module together in 3-4-5 months time. (Educated guess) I am interested too how Qt module interfaces are designed. How much do the tools and strategies vary between module to module? Feladó: Sebastian Lehmann Elküldve: ‎vasárnap‎, ‎2013‎. ‎június‎ ‎30‎. ‎14‎:‎45 Címzett: development at qt-project.org Quoting Uwe Rathmann : > On Sat, 29 Jun 2013 22:18:04 +0200, Sebastian Lehmann wrote: > >>> I have thought about reviving the project myself, but bounced off the >>> burden of contributing rules, and means. (gerrit, git and the likes, >>> although I do use git myself with collegues) > > Before starting with this project you should ask yourself if it is better > to do develop it inside or outside of Qt - or in other words: what is the > advantage of being a Qt module compared to addons like Qxt or Qwt ? I see the strong developer community behind Qt as a huge advantage. QtOpenCL currently has to be considered dead. Of course, being a Qt module doesn't mean every developer of Qt helps developing this module. But things like release plans of Qt enforce that the module gets stable some time. I see the same advantage currently at Qt3D. It wasn't a Qt module until now AFAIK, but now it is going to be, so now we have "clear plans" to release it with Qt 5.2. Maybe I'm too new to Qt development to see the advantages / disadvantages clearly. Thanks for discussing alternatives. > The very first issue for an existing project is about checking its > license. At the time when I was asking myself the same question for my > project I would have had to change the license - giving Nokia control. > Beside the fact, that I didn't want this: any change of the license > requires permission of all contributors to the existing code - hard to > collect for a project with some history ( in my case 16 years ). Hope > this has changed nowadays. The old QtOpenCL seems to be LGPL, even more permissive? (LGPL_EXCEPTION.txt) > But even then you should be aware, that being a Qt module means > administrative overhead and you should have an idea what real advantages > to expect. Being a Qt module only because of being one doesn't make the > project more useful or attractive to other users/developers. The old QtOpenCL was a labs project, but it has been written with becoming an official Qt module some day in mind. We could first develop a new QtOpenCL module in the same way before making it an official Qt module. -- Sebastian _______________________________________________ Development mailing list Development at qt-project.org http://lists.qt-project.org/mailman/listinfo/development -------------- next part -------------- An HTML attachment was scrubbed... URL: From staniek at kde.org Sun Jun 30 23:30:42 2013 From: staniek at kde.org (Jaroslaw Staniek) Date: Sun, 30 Jun 2013 23:30:42 +0200 Subject: [Development] Qt for Tizen 1.0 Alpha 2 Released Message-ID: Dear All, This weekend we have released second alpha of Qt for Tizen 1.0. See http://qtfortizen.blogspot.com/2013/06/1.0alpha2.html Thanks to all Qt Project contributors that made it possible! -- regards / pozdrawiam, Jaroslaw Staniek Kexi & Calligra & KDE | http://calligra.org/kexi | http://kde.org Qt for Tizen | http://qt-project.org/wiki/Tizen Qt Certified Specialist | http://www.linkedin.com/in/jstaniek