Hi, If you are a module maintainer, please check the patches below and provide comments.
As per the previous discuss, I renamed all the _qpa.h to _p.h with a couple of helper scripts - one script renamed the files and another fixed the includes. Practically all the hardwork was done by my trusty i-7 :) I lost one the renaming scripts because of a git clean -dxf. The other scripts is below [2]. The scripts are not important since I have done most of the work already. There's no need to test anything now, let's just wait for api_changes to merge. Once api_changes is merged, I will rebase and fix any conflicts in the patches below. And then each module owner has to check if the below compiles well. The main reason for this mail is the size of the change itself and if there is any concern now is a good time to voice it. The patch is ~13000 lines: (tests, examples all compile and work) (qtbase) https://codereview.qt-project.org/#change,23443 (qtdeclarative) https://codereview.qt-project.org/#change,23444 (qtsystem - not compiled) https://codereview.qt-project.org/#change,23445 (qtwayland - not uncompiled) https://codereview.qt-project.org/23446 QtWebKit needs to have a small fix too. Girish # script is something like this # QtGui/QPlatformHeader # QPlatformHeader # QtGui/qplatformheader_qpa.h # qplatformheader_qpa.h # QtGui/private/qplatformheader_qpa_p.h # private/qplatformheader_qpa_p.h # inputcontext and evendispatcher are special.. for file in `find . -name "*.h" -or -name "*.cpp"`; do sed -i -e 's,#include <\(QtGui/\)\?\(QPlatform.*\)>,#include <QtGui/private/\L\2_p.h>,g' \ -e 's,#include "\(QtGui/\)\?\(QPlatform.*\)",#include <QtGui/private/\L\2_p.h>,g' \ -e 's,#include <\(QtGui/\|QtGui/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)>,#include <QtGui/private/\2_p\3>,g' \ -e 's,#include "\(QtGui/\|QtGui/private/\|private/\)\?\(qplatform.*\)_qpa\(.*\)",#include <QtGui/private/\2_p\3>,g' \ $file done _______________________________________________ Development mailing list Development@qt-project.org http://lists.qt-project.org/mailman/listinfo/development