summaryrefslogtreecommitdiffstats
path: root/bin
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'remotes/origin/4.7' into symbian47Thomas Zander2010-05-191-2/+1
|\ | | | | | | | | Conflicts: src/gui/kernel/qapplication_s60.cpp
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Andrew den Exter2010-05-181-7/+22
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe src/imports/multimedia/qdeclarativeaudio.cpp src/imports/multimedia/qdeclarativeaudio_p.h src/multimedia/mediaservices/mediaservices.pro src/plugins/mediaservices/mediaservices.pro src/plugins/mediaservices/symbian/mediaplayer/s60audioplayersession.h src/plugins/mediaservices/symbian/mediaplayer/s60videoplayersession.h src/s60installs/s60installs.pro src/src.pro
| * | Removed mediaservices.Kurt Korbatits2010-05-181-2/+1
| | |
* | | Do not autopatch <app>_installer.pkg when self-signingMiikka Heikkinen2010-05-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | <app>_installer.pkg produces self-signable packages by default, so no need to patch it. Task-number: QTBUG-10746 Reviewed-by: Janne Koskinen
* | | Fix generation of stub sis filesShane Kearns2010-05-141-1/+1
| |/ |/| | | | | | | | | | | | | Convert paths in DEPLOYMENT to the rom drive (z:) Filter out unwanted parts of the header (dependencies) Task-number: QTBUG-10118 Reviewed-by: Alessandro Portale
* | Provide a way to specify the final sis name with createpackage/make sisMiikka Heikkinen2010-05-121-7/+22
|/ | | | | | | | The -n parameter can be used to specify the final sis name when using createpackage script or "make sis" with QT_SIS_OPTIONS. Task-number: QTBUG-9400 Reviewed-by: Janne Koskinen
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-04-261-1/+1
|\ | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: DEF file updates for BWINS and EABI for Symbian Fix typo Revert "Add QML imports to s60installs.pro" Assigned a UID3 to qml.exe.
| * Fix typoThomas Zander2010-04-261-1/+1
| | | | | | | | Reviewed-by: TrustMe
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵Qt Continuous Integration System2010-04-181-1/+2
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Three fixes from Shane after QtMultimedia was split into two dlls. Fix compile errors in Direct Show media service. Add EXPORT defines for QtMediaServices library. Fixed configure check for gstreamer. WebKit; build with change to mediaservices. QtMediaservices -> QtMediaServices. configure; Fixes for changes to use mediaservices. Fixed compile errors in pulseaudio backend for soundeffect Rebuild configure.exe following e85223d233c0e1d6beca748332b8fbaba3ebbf2d Fixed compile errors with gstreamer plugin Create Mediaservices lib, separate from Multimedia. Gstreamer media backend: seek to media start on end of stream.
| * QtMediaservices -> QtMediaServices.Justin McPherson2010-04-161-1/+1
| | | | | | | | Reviewed-by: Dmytro Poplavskiy
| * Create Mediaservices lib, separate from Multimedia.Justin McPherson2010-04-151-1/+2
| |
* | Fixed automatic patching of self-signed packagesMiikka Heikkinen2010-04-162-10/+30
|/ | | | | | | | | | | | - Don't autopatch when just preprocessing pkg or creating stub package - Copy binaries before patching so that originals are preserved. - Only autopatch the preprocessed file so that original template is preserved. - Added clear warning to patch_capabilities.pl to notify users that patched package is not suitable for distribution. Task-number: QTBUG-9972 Reviewed-by: Shane Kearns
* 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
* Fixed "Cannot install protected application" message on Symbian.axis2010-03-161-4/+5
| | | | | | | | | This was due the patch_capabilities step running too late in the sis creation process. This led to the package ID being wrong the first time "make sis" was run, but correct on subsequent runs. RevBy: Trust me Task: QTBUG-8770
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-03-111-1/+2
|\ | | | | | | | | | | | | | | | | Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
| * Updated syncqt to use relative include paths on cygwin as well.Zeno Albisser2010-03-011-1/+2
| | | | | | | | Reviewed-by: TrustMe
| * Merge remote branch 'origin/master' into qt-master-from-4.6Thiago Macieira2010-02-131-14/+25
| |\ | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| * \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-131-38/+52
| |\ \ | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp
| * \ \ Merge remote branch 'origin/4.6' into qt-master-from-4.6Thiago Macieira2010-02-121-5/+11
| |\ \ \
* | | | | Added wrapper for patch_capabilities on non-Windows platforms.axis2010-03-011-0/+3
| | | | |
* | | | | Made redirection to /dev/null cross platform.axis2010-03-011-1/+4
| | | | |
* | | | | Made patch_capabilities.pl not raise capabilities unnecessarily.axis2010-03-011-12/+40
| | | | |
* | | | | Make createpackage.pl auto-patch the capabilites for self signed packagesMarius Storm-Olsen2010-02-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows you to simply call 'make ok_sis' to have a sis package which is self signed with patched capabilities, ready for install on an consumer system. Reviewed-by: Shane Kearns (cherry picked from commit 1f9e501bf9f3287a424b36915d4436a74cf21847)
* | | | | Switched the order of message and execution in patch_capabilities.axis2010-02-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | It seems more natural to have the message first, so that you can tell which file is taking long to complete.
* | | | | Enabled patch_capabilities to work on Linux.axis2010-02-261-3/+8
| | | | |
* | | | | Made createpackage.pl return error when one of the tools fail.axis2010-02-231-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Not strictly necessary for normal building, but nice to catch build system bugs.
* | | | | Removed winewrapper.axis2010-02-191-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | It is no longer needed after we switched to gnupoc as the S60 SDK for Linux.
* | | | | Removed the .sh extension from the createpackage script.axis2010-02-191-0/+0
| | | | | | | | | | | | | | | | | | | | None of our other tools have a .sh extension. Why should this one?
* | | | | Prevented lowercasing of the sis file.axis2010-02-191-3/+3
| | | | | | | | | | | | | | | | | | | | This does not work well on case sensitive file systems.
* | | | | Changed createpackage script to use relative paths.axis2010-02-191-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | This was done in order to support signsis on Linux, where relative paths are required.
* | | | | Got rid of some warnings when using "perl -w".axis2010-02-191-5/+10
| | | | |
* | | | | Changed check for platform and target to depend on macro existence.axis2010-02-191-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This change was done in order to support build systems that do not use platform and target in the pkg file.
* | | | | Changed phrasing slightly.axis2010-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a better sentence and has the added benefit of not confusing emacs' highlighting, causing the last quote mark to generate a string running through the rest of the file. ;-)
* | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-publicaxis2010-02-163-65/+87
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
| * \ \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60axis2010-02-161-38/+58
| |\ \ \ \ \ | | | |_|/ / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
| | * | | Add make stub_sis target, and add webkit stub to qt.ibyShane Kearns2010-02-121-38/+52
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qmake - add targets to wrapper make file make stub_sis createpackage - use -s or --stub to run makesis with the -s argument also copies the file to the right place in epoc32\data\system\installs qt.iby - add qt_stub.sis and qt_webkit_stub.sis Task-number: QTBUG-6570 Reviewed-by: Miikka Heikkinen
| * | | 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 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵Qt Continuous Integration System2010-02-051-14/+25
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
| | | * \ 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-02-021-1/+20
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
| | | | * \ \ Merge commit 'qt/4.6' into kinetic-declarativeuiBjørn Erik Nilsen2010-01-271-0/+1
| | | | |\ \ \
| | | | * \ \ \ Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵Warwick Allison2010-01-146-20/+49
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-10-191-0/+10
| | | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: tools/qdoc3/cppcodemarker.cpp
| | | | * \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-294-8/+14
| | | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| | | | * \ \ \ \ \ \ \ Merge commit 'qt-mainline/4.6' into kinetic-declarativeuiAndreas Aardal Hanssen2009-09-155-20/+20
| | | | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsitem.h src/gui/graphicsview/qgraphicsscene.cpp tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp
| | | | * \ \ \ \ \ \ \ \ Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Martin Jones2009-09-083-35/+219
| | | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui
generated by cgit v0.12 at 2024-11-10 14:22:39 (GMT)