summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* syncqt: Fix regexp capturing class names of partial specialisationOlivier Goffart2014-07-081-1/+1
| | | | | | | | | | | | Example with this code: "template <class Key> struct QHashNode<Key, QHashDummyValue> {" The previous regexp would take "QHashNode<Key," as some keyword, and "QHashDummyValue>" as the class name. By forbidding '<' in the keyword, we avoid such mistake Change-Id: I5d5077b9e5e764e91899bcaef137d99214ea5d63 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* nuke findtr scriptOswald Buddenhagen2014-05-211-229/+0
| | | | | | | | | | | it's a precursor of lupdate from the stone age. [ChangeLog][Tools] The obsolete findtr script was removed. Task-number: QTBUG-30900 Change-Id: Ic3efdc44df084573aec2512d8f86101832253d77 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: hjk <hjk121@nokiamail.com>
* automate handling of generated headers some moreOswald Buddenhagen2014-02-281-4/+19
| | | | | | | | | | | | | | let the syncqt + qt_module_header.prf pair handle generation of forwarding headers. in qtbase this is ineffective to some degree, as the need to create QtCore's forwarding headers early for QtBootstrap requires qtbase.pro already doing the real work, but at least we get the verification that nothing breaks. Other Modules (TM) will need the full functionality. Change-Id: Ifd3dfa05c4c8a91698a365160edb6dabc84e553f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* de-duplicate header install source calculationOswald Buddenhagen2014-02-281-3/+1
| | | | | Change-Id: I7c26d70fdfceac6d3c562e704cc725fad80c4f59 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove duplicated nested conditionOswald Buddenhagen2014-02-281-14/+11
| | | | | Change-Id: I433773dbf21a7a7625d4f763b3cebe75c746aa1f Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* un-pluralize codeOswald Buddenhagen2014-02-281-8/+5
| | | | | | | | since ever we've thrown out the phonon hack, each header is synced to only one location (CamelCase headers notwithstanding). Change-Id: Idfef33db9410908aefe309bc7a3edeae5fc5a671 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* merge %explicitheaders into %classnamesOswald Buddenhagen2014-02-281-18/+17
| | | | | | | | | | | | no need to have two mechanisms for the same thing. the values of %classnames can be comma-separated lists now, so one header can have multiple classes assigned. conversely, if an extracted class name reverse-maps to a different file name, it is omitted. Change-Id: Ia0a35d64764b6376f33b77bbfe59e1df70a3cf1a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove vestiges of uic class map codeOswald Buddenhagen2014-02-281-2/+0
| | | | | | | amends ad52be1ac. Change-Id: I2bfb10908217708c4f046d0d315dadd1b626da12 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-06-151-3/+8
|\ | | | | | | refs/staging/stable
| * don't process ANGLE and zlib headers like real qt modulesOswald Buddenhagen2013-06-101-3/+8
| | | | | | | | | | | | | | | | | | | | we run syncqt on them only to get normal forwarding headers and the headers.pri file. the module master include header and the module version header are useless, and scanning for qt class names just wastes time. Change-Id: I58e8d1eb36cea5c31cbd46ce673438316d1963dc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | don't touch deprecated headers unless they actually changeOswald Buddenhagen2013-06-121-22/+25
| | | | | | | | | | Change-Id: Iabeec90c2a6549cf92b3b8369a41764a576fd0aa Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | purge dead uic class map code.Oswald Buddenhagen2013-06-121-21/+0
| | | | | | | | | | Change-Id: I9b67924a66c847cd4cf2ce9f2996017ae7eb61a4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | remove unused symlinkFile() functionOswald Buddenhagen2013-06-121-30/+0
|/ | | | | Change-Id: Ie235fe65020ed7c4870d9c8784a181bf880b9e28 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move module master header generation back to syncqtOswald Buddenhagen2013-06-031-0/+42
| | | | | | | | | | now that we split out the part that depends on the project file, we can do it cleanly here. this way we can generate these headers at pre-build time already. and for git builds, perl is probably faster than qmake at this task. Change-Id: I343255c6de22329471a3ae2c2aac9ebeb160a501 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* let configure create the forwarding qconfig.h againOswald Buddenhagen2013-06-031-9/+1
| | | | | | | | | | | | this avoids that syncqt needs to forward to a yet unexisting file (which will have a yet unknown location, when syncqt is run at packaging time already). the %inject_headers syncqt config variable remains, so it can be told not to purge "foreign" files. Change-Id: I127ff6e0b7d5702fb0acaee9a5b7940b482d3608 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* move module version header generation back to syncqtOswald Buddenhagen2013-06-031-0/+13
| | | | | | | | | | | there is no particular reason for it being done by qmake. avoids that the logic is distributed over two source files, and allows us to generate these headers at pre-build time already, including not forwarding to a yet unexisting file (which would have a yet unknown location). Change-Id: I9c78ab425cf6f01d076c86fd1ee602626f231487 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* factor out writeFile() functionOswald Buddenhagen2013-06-031-17/+27
| | | | | Change-Id: I8e3e1665d7628c3210d000c46dfffa9f1af71009 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* get rid of syncqt wrapper scriptsOswald Buddenhagen2013-05-132-44/+0
| | | | | | | | | | | instead, rename it to syncqt.pl and rely on qtPrepareTool()'s new ability to correctly invoke it as a perl script even under windows. the wrappers themselves have been trivial at this point, so there is no added value in keeping them, either. Change-Id: I77cf65edbcfaa48ed1900defe940d4eb4b82d5b9 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Handle more drive fix situations in syncqtAndrew Knight2013-04-201-1/+1
| | | | | | | | Normalize paths that begin with <drive_letter>:/ as well. Task-number: QTBUG-30638 Change-Id: Icdc7ee9782a358771d06ae2500d32e59e6bbe866 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* restore compat with older perl versionsOswald Buddenhagen2013-04-191-1/+1
| | | | | | | | the // operator is a tad too new. Task-number: QTBUG-30637 Change-Id: I3672d41a4a17937ffea251f0937b09045d6c386d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't complain about missing macros in <module>version.hOswald Buddenhagen2013-04-021-0/+1
| | | | | | | we just generated them, and they really don't need QT_{BEGIN,END}_*. Change-Id: Ib7b2454ae80762e644d9667106960cc7632f90fc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Merge remote-tracking branch 'gerrit/release' into stableSamuel Rødal2013-03-211-26/+13
|\ | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/features/qt_module_headers.prf mkspecs/features/qt_tool.prf src/angle/angle.pro src/tools/bootstrap/bootstrap.pro tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp Change-Id: Ide5759fe419a50f1c944211a48f7c66f662684e0
| * pass module version to syncqtOswald Buddenhagen2013-03-201-26/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is cleaner than having it parse qmake project files. the only remaining built-in version extraction is the fallback to qglobal.h needed for bootstrapping. as a "side effect", this fixes the build of modules with mismatched versions centralized in .qmake.conf, as this was simply not handled so far. the -mkspecsdir syncqt option goes away, as there is no use case for it any more. Task-number: QTBUG-29838 Change-Id: I6912a38f0e93a26bc267a9e3d738506fd3ad431b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | syncqt: Use /usr/bin/env perl not /usr/bin/perlRay Donnelly2013-02-201-1/+1
| | | | | | | | | | | | | | | | This is because on some systems, /usr/bin/perl is too old to run syncqt. MSYS is one such system. Change-Id: I3e1aa2db557cc3919618350775e7218ae05aa93f Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* | Merge remote-tracking branch 'origin/stable' into devFrederik Gladhorn2013-02-141-6/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/concurrent/doc/qtconcurrent.qdocconf src/corelib/doc/qtcore.qdocconf src/corelib/global/qglobal.h src/dbus/doc/qtdbus.qdocconf src/dbus/qdbusmessage.h src/gui/doc/qtgui.qdocconf src/gui/image/qimagereader.cpp src/network/doc/qtnetwork.qdocconf src/opengl/doc/qtopengl.qdocconf src/opengl/qgl.h src/plugins/platforms/windows/qwindowswindow.cpp src/printsupport/doc/qtprintsupport.qdocconf src/sql/doc/qtsql.qdocconf src/testlib/doc/qttestlib.qdocconf src/tools/qdoc/doc/config/qt-cpp-ignore.qdocconf src/widgets/doc/qtwidgets.qdocconf src/xml/doc/qtxml.qdocconf Change-Id: Ie9a1fa2cc44bec22a0b942e817a1095ca3414629
| * purge broken line continuation parsingOswald Buddenhagen2013-01-301-6/+0
| | | | | | | | | | | | | | | | it would have taken only the last line, which is clearly wrong. as nobody noticed this, the handling is clearly not needed. Change-Id: I6f4f45ce8c90cb9b0ef60abbaa5ed49b54d8b47d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* | Fix missing namespace macro warnings when building Qt Addon modules.Aaron McCarthy2013-02-111-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | Addon modules may not be in the standard Qt namespace and therefore do not use the QT_{BEGIN,END}_NAMESPACE macros. Instead module specific QT_{BEGIN,END}_NAMESPACE_FOO macros are used. Extend the syncqt test to allow for this and ensure that the QT_END_NAMESPACE suffix matches the QT_BEGIN_NAMESPACE suffix. Change-Id: I33110c01118b0fb4376307db7447f747fc38bb29 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | syncqt: Don't check for QT_{BEGIN,END}_HEADER macrosSergio Ahumada2013-01-261-20/+0
|/ | | | | | | | | | | The QT_{BEGIN,END}_HEADER macros have never worked and might be potentially removed. Also removing the list of blacklisted files from sync.profile Change-Id: I601969cf8eddf3908c3ad46f63af9434670d4046 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fixqt4headers: Fix typo in QtMultimedia headers module nameLuís Pereira2013-01-181-5/+5
| | | | | | | | Commit 003860b5 introduced QtMultimedia, but with a typo. It broke the script. Change-Id: Ie3fd536d90f52419818f36ba1b28d437b965dcdc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Update copyright year in Digia's license headersSergio Ahumada2013-01-184-4/+4
| | | | | Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* fix installation of aux headersOswald Buddenhagen2012-12-131-5/+6
| | | | | | | | the source paths need to be made relative to the main source dir Change-Id: I98d74eca7e54d1179ab602bb87b96b66f3193ce4 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove phonon vestigesOswald Buddenhagen2012-12-131-12/+1
| | | | | Change-Id: Id345fdd986dd60d4e7212fde265bd7357794bd9a Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* don't check modules which were not requestedOswald Buddenhagen2012-12-051-1/+1
| | | | | Change-Id: I4928b37239af21dfc6edc84f1e989a2717614629 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* support flagging all headers from a particular source directory as privatesOswald Buddenhagen2012-12-041-2/+4
| | | | | Change-Id: Ia893abc95b358d8a8ffd690563f2f02bc20fd98d Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* fix support for multiple source directories per moduleOswald Buddenhagen2012-12-041-3/+4
| | | | | | Change-Id: I040cb928e016c3a8257a1bcbf20627d67f07c84d Reviewed-by: Liang Qi <liang.qi@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove vestiges of QT_MODULE() checking codeOswald Buddenhagen2012-12-041-6/+0
| | | | | Change-Id: Icf863c3ca7218af54cb5698d848db786d49481cc Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove support for hand-written module pri filesOswald Buddenhagen2012-12-031-14/+1
| | | | | | | | all modules have been migrated to auto-generation Change-Id: Ie7b3ebfd735a22f8e0b0339909b6385508d7a6b3 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* fixqt4headers: Remove QtQuick1 and add QtMultimediaLars Knoll2012-11-281-6/+6
| | | | | | | | | QtQuick1 is QtDeclarative again, so there's no header file renaming needed. But Multimedia got renamed from multimediakit and this needs to be included. Change-Id: Ie787d6841f0525e1dc290f7ca8d9cae148308e32 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Rename the syncqt -qtdir to -mkspecsdirThiago Macieira2012-10-191-13/+13
| | | | | | | | | It's actually looking for the mkspecs (so it can read qconfig.pri to get the Qt version), so give it exactly what it wants. Change-Id: I2957b2d93a8837b8492d313209d45ff3ec01704c Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* restore compat with old perl: don't use \h in regexpsOswald Buddenhagen2012-10-161-3/+3
| | | | | | | Task-number: QTBUG-27543 Change-Id: I94a1368de69faeabe359e2c5e1f22879e9e96cc8 Reviewed-by: Andy Shaw <andy.shaw@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* syncqt: Fix warnings about missing QT_BEGIN_HEADER/NAMESPACE.Friedemann Kleint2012-10-131-2/+4
| | | | | | | Do not print warnings when stop-processing pragma was encountered. Change-Id: I0dd3b317b3a685afe613527988eb137325037e16 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Change copyrights from Nokia to DigiaIikka Eklund2012-09-224-97/+97
| | | | | | | | Change copyrights and license headers from Nokia to Digia Change-Id: If1cc974286d29fd01ec6c19dd4719a67f4c3f00e Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
* move the module validation below the loading of sync.profileOswald Buddenhagen2012-09-191-2/+2
| | | | | | | otherwise the -module option will always die. Change-Id: I023ea5681a03a2848e1084eedbbcc66f8d060b69 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove setcepaths.batOswald Buddenhagen2012-09-111-163/+0
| | | | | | | | we don't need it any more, as the makefiles are self-contained now. Change-Id: I1a560a8331856e246e03c55ec1b1dd1a5cb112e4 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* introduce -minimal mode to syncqt and use it for bootstrappingOswald Buddenhagen2012-09-111-2/+13
| | | | | | | | | | the bootstrap does not need CamelCase includes, deprecated headers and whatnot, so just don't do it. the full thing will be run on qtbase by qmake. Change-Id: Idffdd4750a73574c8c32ee75d00080abfe37e03c Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* de-duplicate codeOswald Buddenhagen2012-08-281-26/+18
| | | | | Change-Id: Ic3f2bfeb5a16da86b1cd471b55dfc79f12dfadee Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* syncqt: parse classes that use Q_DECL_FINAL|final|sealedMarc Mutz2012-08-261-1/+2
| | | | | | | | | | | | I've introduced a variable $post_kw (post-class-keywords) that contains the patterns which are expected after a class name. This variable is used both for a negative look-ahead assertion in the class-name capture (so the regex doesn't parse the keywords as the class-name), as well as to carry the parser over the keywords into the subclass clauses. Change-Id: Ia534ca01a511e1c773d007f1b0b4f448e8d009d0 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Skip doc subfolders when checking includes.Lars Knoll2012-08-011-1/+2
| | | | | | | | | This removes the bogus warnings when running syncqt from configure about snippets in the doc/ folders. Change-Id: I8e3d258238c1cd1e763ce63b895d58b68bbc06f3 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* make sure that the stale header removal works the first time aroundOswald Buddenhagen2012-07-271-1/+1
| | | | | | | | | | sort backwards by ascii, so that the lowercase headers come first - otherwise the camelcase headers would survive the first round, as they include the lowercase forwarding headers which were not deleted yet. Change-Id: Iece2788206d31a11428f38da8d8f9f4d0b6dc992 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* generate the module version header directly in the include directoryOswald Buddenhagen2012-07-181-3/+7
| | | | | | | | | ... instead of having a forward from the include dir to the (shadowed) source dir of the module. Change-Id: I967227950e8aeb1b9f62befbf9fff3746a0486b6 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>