summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* remove support for forwarding module pri creation via syncqtOswald Buddenhagen2012-07-161-40/+0
| | | | | | | | | now that all modules have migrated, this dead code can be removed. Change-Id: I5e9c7dd3fb271346d1b5f0e2930874da3e4d2d57 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com> Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com> Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove support for syncqt-based config testsOswald Buddenhagen2012-07-121-419/+0
| | | | | | | now that all modules have migrated, dispose of the clutter. Change-Id: Ib8937c1452536f645b76c0097b927df1108afc1a Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* Make QWindowSystemInterface part of QPA APIGirish Ramakrishnan2012-07-031-2/+12
| | | | | | | | | | | | | | | As discussed on mailing list and QtCS 2012. Any file starting with qwindowsystem is now marked as QPA API. This change drops _qpa from the filenames and adds gui-private where required for the code to compile. This change is backward compatible otherwise and compat headers are created for the old inclusion headers. Change-Id: I72ea0f394dee74f46e614fcf11ab5500ac9fef2a Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* let default_pre add modules to the qmake pathOswald Buddenhagen2012-06-191-16/+0
| | | | | | | | | | | | | | that way qmake is made aware of the forwarding pris which are generated for this module even when a top-level .qmake.cache prevents the module's root from being found automatically. the path is also added to the cache, so that subsequent partial qmake-ing of the tree will still find the module. this also makes the -cache-module-fwd parameter of syncqt useless, so remove it. Change-Id: I2afbc52a465c0b3260e9bcaf032c43a82ae8061f Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move generation of module master headers to qt_module_headersOswald Buddenhagen2012-06-191-80/+2
| | | | | | | | | this has the advantage that the %mastercontent assignments in sync.profile are not necessary any more. as it happens, most modules got them wrong anyway. Change-Id: Ibdf689be408f18e1d90c44ef4ecacd7c24b1f1c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make master phonon compat header a forwarding headerOswald Buddenhagen2012-06-191-1/+6
| | | | | | | | instead of writing the same file twice, just forward to the compat header, like it is done for every other header. Change-Id: I8c908f80149aff4720cca6d51ab5b550c31f78b1 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* do not route qtmodule-configtests invocation through syncqtOswald Buddenhagen2012-06-191-24/+0
| | | | | | | there is completely no reason to do it. Change-Id: Ie186ef4c1bbd12c256acb2fe374d12ebe777d6c9 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* auto-generate module prisOswald Buddenhagen2012-06-191-18/+18
| | | | | Change-Id: I654428771034221ccf424be34d5d9c7764daf3b4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move creation of module version header to qt_module_headersOswald Buddenhagen2012-06-191-44/+0
| | | | | Change-Id: I650b495ec1789eb03b31d796f9f475ba01aab2d3 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* create module version headers in build dir, not source dirOswald Buddenhagen2012-06-191-1/+2
| | | | | Change-Id: I07bf4dbeba2d35284ecf55542f9cd457b2e49b80 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make %inject_headers a per-module config valueOswald Buddenhagen2012-06-191-2/+2
| | | | | | | | it's module-specific. on the way, fix it to actually support multiple files. Change-Id: I796b0e98e38a54754022e0e2fa48cecb54d06ff4 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* automatically add the module version headers to %classnamesOswald Buddenhagen2012-06-191-0/+2
| | | | | Change-Id: I7706a0d54e704320e9e1e480b387e46417739ccf Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* make sure that forwards for injected headers are not garbage-collectedOswald Buddenhagen2012-06-191-1/+16
| | | | | | | | | qmake-generated version headers don't exist yet at the time syncqt runs, so the forwarding headers would be deleted - just to be re-created a moment later, thus changing the timestamp for no good reason. Change-Id: I1b4c2f05f57c2315adf4b8dd726ea413ede1be5b Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* fix status output for generated headersOswald Buddenhagen2012-06-191-3/+9
| | | | | Change-Id: I92c250037eb1b1838998cddbaea6ca065153e86e Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* generate fwd-pris in qt_module_config, not in syncqtOswald Buddenhagen2012-06-191-1/+1
| | | | | | | | the forwarding pri is loaded even if it was still created by syncqt, so a top-level qmake -r will still catch it even in the future. Change-Id: I2e4b556cd06eb88be9ee378662a2e6e1bff67ad7 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* write forwarding pris to $outpath/mkspecs/modulesOswald Buddenhagen2012-06-191-4/+1
| | | | | | | | | | this makes qmake find them automatically now. consequently, also do not write QMAKE_EXTRA_MODULE_FORWARDS to .qmake.cache. still write the cache file, though, as otherwise a top-level cache would mess up the module root detection. Change-Id: I998b94fcc73ca3f8bf1af09a394ff8d40cf1fb76 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* move $QTDIR handling out of syncqtOswald Buddenhagen2012-06-191-6/+1
| | | | | | | | | instead, always pass -qtdir (which, btw, is a slight misnomer - it should be -qtdatadir) with the correct path. this centralizes the relevant logic in default_pre.prf. Change-Id: Icc788d3f3e5f7b68b444e63e181efdea3b4ef160 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* rewrite fixPaths()Oswald Buddenhagen2012-06-191-41/+12
| | | | | | | | | now the phonon paths are actually normalized. just relying on File::Spec for the path relativization, so the code is much shorter. Change-Id: I69d6bac73e366ed0f754e1282a375871ce5559c4 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* remove dead variableOswald Buddenhagen2012-06-191-1/+0
| | | | | Change-Id: Ic37c2a0da6346f044df10c7d8b5ee1a95efcc29c Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* don't use abs_path on input argumentsOswald Buddenhagen2012-06-191-7/+5
| | | | | | | | | for one, the input paths are already absolute. second, if a path does not exists, abs_path will fail, which makes the fallback code which tries to create them rather pointless. Change-Id: Ie56ff09313e48e82e8bc8e8f06eca384644de464 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
* make syncqt work with MSys Perl and MSVCJoerg Bornemann2012-06-011-14/+34
| | | | | | | | | | | | | | | | | | | | | | The common root dir detection was broken, because of an inconsistent root drive path style: <srcbase> = /c/dev/qt/5.0/qtbase <outbase> = C:/dev/qt/5.0/qtbase Now we don't need ActivePerl anymore. The Perl that comes with msysgit is enough. After every Perl function call that returns a file path we need to normalize it to bring it into a form that can be used by - Perl functions that take a path as parameter, - C++ sources as include file path, - qmake's .pro files as include file path. Task-number: QTBUG-25912 Change-Id: If1cf56cc7246a9d6535cd3867222f225d1617712 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 02:04:04 +0000