summaryrefslogtreecommitdiffstats
path: root/bin/syncqt
Commit message (Collapse)AuthorAgeFilesLines
* Fix #pragma message(), the message must be enclosed in parenthesesminiak2010-08-301-1/+1
| | | | | Merge-request: 796 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Fixed incorrect include/Qt/qconfig.h in binary packages.Rohan McGovern2010-08-051-1/+4
| | | | | | | | | | | | When building from a source package, src/corelib/global/qconfig.h exists. syncqt contained logic to force the creation of include/Qt/qconfig.h for the case where it _doesn't_ exist. This meant that running syncqt from a Qt source package resulted in include/Qt/qconfig.h including qconfig.h twice. Task: QTBUG-12637 Reviewed-by: Toby Tomkins
* fix epic fail from 4ba6646Oswald Buddenhagen2010-07-291-5/+3
| | | | Reviewed-by: joerg
* Merge remote branch 'origin/4.7' into 4.7-from-4.6Rohan McGovern2010-07-171-1/+5
|\ | | | | | | | | Conflicts: tests/auto/qtexttable/tst_qtexttable.cpp
| * fix qconfig.h reference for shadow buildsOswald Buddenhagen2010-07-141-1/+3
| | | | | | | | Reviewed-by: joerg
| * fix qconfig.h aliased header creationOswald Buddenhagen2010-07-141-0/+2
| | | | | | | | | | | | | | | | don't have configure create the forwarding headers (or symlinks on unix) for qconfig.h, but instead have syncqt create forwarding headers for not yet existing files. Reviewed-by: joerg
| * fix warning directive on gnucOswald Buddenhagen2010-07-141-1/+1
| |
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Thiago Macieira2010-07-151-2/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/3rdparty/webkit/WebCore/bridge/qt/qt_instance.cpp src/3rdparty/webkit/WebCore/bridge/qt/qt_runtime.h src/3rdparty/webkit/WebCore/page/FrameView.cpp src/3rdparty/webkit/WebCore/page/FrameView.h src/3rdparty/webkit/WebCore/platform/ScrollView.cpp src/3rdparty/webkit/WebCore/platform/ScrollView.h src/corelib/plugin/quuid.cpp src/gui/dialogs/qfontdialog.cpp src/multimedia/audio/qaudiodevicefactory.cpp src/opengl/qgl.cpp src/openvg/qpaintengine_vg.cpp tests/auto/qxmlquery/tst_qxmlquery.cpp
| * syncqt: don't try to split %module's valuesJoerg Bornemann2010-07-121-1/+1
| | | | | | | | | | | | | | | | Using semiconlon separated directory lists in module values is broken and unused. Removing this feature. Task-number: QTBUG-4586 Reviewed-by: ossi
| * syncqt: fix wrong paths in include/ActiveQt/headers.priJoerg Bornemann2010-07-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Assigning a semicolon separated list of directories to a Qt module does not work correctly. The values of %modules must be split into single values before operating on them. This doesn't happen in all places. ActiveQt is the only module where this feature is used. Also, it is not needed anymore for this particular module. Thus, I'll just remove the semicolon separated list from ActiveQt and replace it with the module directory. Task-number: QTBUG-4586 Reviewed-by: ossi
| * Revert changes to syncqt.Joerg Bornemann2010-06-071-392/+370
| | | | | | | | | | | | This reverts commit 24e198c15a807d4829d0f25d9169b8e188d57321. This reverts commit afdda55661ddf4e054624567e6d7ef2481d3998c. This wasn't meant for 4.6.
| * deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-041-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To resolve the header file conflict as described in QTBUG-10647, we * remove include/Qt/private * "syncqt -copy" creates in include/Qt local forwarding headers instead of header file copies In case of a conflict, e.g. qxmlstream.h, we include both header files. All header files in include/Qt now yield a preprocessor warning, if they're included. They should not be used and will vanish some day. Task-number: QTBUG-10647 Reviewed-by: ossi
| * syncqt: tabs changes to spacesJoerg Bornemann2010-06-041-369/+369
| |
* | syncqt: abort on permission error writing to include/QtArvid Picciani2010-06-291-3/+3
| | | | | | | | | | Merge-request: 707 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | deprecate header files in $$QT_BUILD_TREE/include/QtJoerg Bornemann2010-06-081-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To resolve the header file conflict as described in QTBUG-10647, we * remove include/Qt/private * "syncqt -copy" creates in include/Qt local forwarding headers instead of header file copies In case of a conflict, e.g. qxmlstream.h, we include both header files. All header files in include/Qt now yield a preprocessor warning, if they're included. They should not be used and will vanish some day. Task-number: QTBUG-10647 Reviewed-by: ossi
* | syncqt: change tabs to spacesJoerg Bornemann2010-06-081-376/+376
| | | | | | | | This file originally used tabwidth of 8.
* | Removed mediaservices.Kurt Korbatits2010-05-181-2/+1
| |
* | QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
* | Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+2
| |
* | A minor fix to allow multiple directories in modules name map of syncqtZeno Albisser2010-04-071-1/+2
| | | | | | | | | | Reviewed-by: Marius Storm-Olsen Task-number: QTBUG-4586
* | Updated syncqt to use relative include paths on cygwin as well.Zeno Albisser2010-03-011-1/+2
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-101-14/+25
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3377 commits) Expect fail. Expect fails. Attempt to clairify highlight range docs Make sure item release isn't deferred indefinately Expect fail. Missing file Exclude plugins example in test. Test Crash Fix tests Compile. Remove pathview test. Remove unneeded Fix repeater test. Revert "Remove unimplemented methods from header" Revert "Replace QList<>* support with QmlListProperty" Revert "Compile" Add expected fail and created QTBUG-8072 for qml animation auto-test Fix expected error message. Consolidate the two pathview tests and fix them all. ...
| * \ Merge branch 'kinetic-declarativeui' of ↵Warwick Allison2010-02-041-14/+25
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
| | * \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-141-15/+44
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
| | * \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-171-0/+6
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore tests/benchmarks/benchmarks.pro
| | * | | | Signature is:Warwick Allison2009-11-131-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | mkpath( $dir, $verbose, $mode )
| | * | | | fix -quietWarwick Allison2009-11-131-0/+9
| | | | | |
| | * | | | Quietness option.Warwick Allison2009-11-131-7/+9
| | | | | |
| | * | | | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-291-3/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| | * \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-131-1/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf src/corelib/global/qglobal.h src/corelib/kernel/qobject_p.h
| | * \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-06-241-24/+24
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/global/qglobal.h
| | * \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Aaron Kennedy2009-06-191-1/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe tools/qdoc3/htmlgenerator.cpp
| | * \ \ \ \ \ \ \ Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-05-271-2/+0
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: mkspecs/features/qt.prf src/corelib/animation/qanimationgroup.cpp src/corelib/animation/qparallelanimationgroup.cpp src/corelib/animation/qpauseanimation.cpp src/corelib/animation/qpropertyanimation.cpp src/corelib/animation/qsequentialanimationgroup.cpp src/corelib/kernel/kernel.pri src/corelib/kernel/qvariant_p.h src/corelib/tools/qeasingcurve.cpp src/gui/graphicsview/qgraphicsitem.cpp src/opengl/opengl.pro src/opengl/qgl_x11egl.cpp tests/auto/auto.pro
| | * | | | | | | | | Initial import of kinetic-dui branch from the old kineticMichael Brasser2009-04-221-0/+4
| | |/ / / / / / / /
| | * | | | | | | | Long live Qt!Lars Knoll2009-03-231-0/+1049
| | / / / / / / /
* | | | | | | | | Merge remote branch 'qt/4.6' into qt-master-from-4.6Qt Continuous Integration System2010-02-091-0/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | Conflicts: src/gui/kernel/qcocoapanel_mac.mm src/gui/kernel/qcocoasharedwindowmethods_mac_p.h
| * | | | | | | Make sure include for QAudio namespace is createdJustin McPherson2010-02-051-0/+2
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-7891 Reviewed-by: Kurt Korbatits
* | | | | | | Merge branch '4.6'Thiago Macieira2010-01-131-15/+44
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt doc/src/deployment/deployment.qdoc src/corelib/io/qfsfileengine_win.cpp src/corelib/xml/qxmlstream.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h tools/assistant/tools/assistant/centralwidget.cpp tools/linguist/lupdate/main.cpp
| * | | | | | [syncqt] Make -separate-module work with WebKit's directory structureSimon Hausmann2010-01-111-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed the syntax to allow for the situation where the .pro file is in a different directory than the header files to install. In this case the resulting Makefile is in WebCore/Makefile, so the references in headers.pri to for example qwebview.h has to be ../WebKit/qt/Api/qwebview.h. This doesn't affect any existing syncqt operations inside of Qt. Reviewed-by: Trust me
| * | | | | | [syncqt] Make it possible to synchronize headers for a separate moduleSimon Hausmann2010-01-111-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a -separate-module commandline option to syncqt that allows calling syncqt from outside of Qt to create header files. For WebKit package we call syncqt with -separate-module QtWebKit:WebKit/qt/Api to generate headers for the "QtWebKit" module for the headers in WebKit/qt/Api/*.h Reviewed-by: Thiago
| * | | | | | [syncqt] Make it possible to override the base directorySimon Hausmann2010-01-111-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need to set the QTDIR environment variable and makes it possible to call syncqt conveniently when creating webkit packages. Reviewed-by: Thiago
| * | | | | | Attempt at readding the capital P headers for PhononThiago Macieira2010-01-061-0/+6
| | | | | | |
| * | | | | | Remove special Phonon processing from syncqt.Thiago Macieira2010-01-061-12/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore original Qt 4.4 behaviour. The capital P headers are not correct because of frameworks on Mac. More info, see thread: http://lists.kde.org/?l=kde-multimedia&m=126045273702498&w=2 Task-number: QTBUG-4685 Reviewed-by: Trust Me
| * | | | | | Update copyright year to 2010Jason McDonald2010-01-061-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | | fix small leftovers from the Win9x removal in the codeminiak2009-12-221-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LoadLibraryW -> LoadLibrary RegOpenKeyExW -> RegOpenKeyEx qdesktopservices_win.cpp: buffer size fixed in launchWebBrowser() Windows NT 4.0 version condition removed Merge-request: 1627 Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | | | | | Merge commit 'origin/4.6'Olivier Goffart2009-12-151-0/+6
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/io/qfsfileengine.cpp src/network/access/qnetworkrequest.cpp tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
| * | | | | Install private headers when configuring Qt with -developer-build.Rohan McGovern2009-12-111-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Many Qt autotests require both private symbols and private headers. Private symbols are turned on using -developer-build. However, prior to this commit there was no way to install private headers into the Qt install directory. This is particularly relevant for packaging systems which use `make install' to determine what should be packaged. For example, Qt for Maemo debian packages are effectively unusable for Qt autotests without this commit. Reviewed-by: Michael Goddard
* | | | | | Merge branch '4.6'Thiago Macieira2009-11-101-0/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/styles/qcommonstyle.cpp tools/assistant/lib/lib.pro tools/assistant/lib/qhelp_global.cpp tools/assistant/tools/assistant/assistant.qch tools/assistant/tools/assistant/mainwindow.cpp
| * | | | | Declarative building infrastructure.Warwick Allison2009-11-041-0/+2
| | |_|_|/ | |/| | | | | | | | | | | | | Does nothing if no declarative directories installed.
* | | | | Merge branch '4.6'Thiago Macieira2009-09-291-3/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | Conflicts: doc/src/qt4-intro.qdoc
generated by cgit v0.12 at 2024-11-25 01:38:10 (GMT)