summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Changed fluidlauncher deployment to cope with Symbian makefile systemaxis2010-02-231-77/+93
|
* Implemented recursive "sis" target and enabled sis_targets feature.axis2010-02-239-128/+168
| | | | | | | | | | | | | | | | The sis target will depend on the main build target of each project, which should make it possible to simply run "make sis" in the root of a clean tree (after configure, of course), and have sis packages generated for everything. It works at least for Qt. This required some changes to the dependency generation in Qt, to make sure that s60installs builds its package after all of Qt, and that fluidlauncher has all the required files before building a package. In addition, all the sis target code was moved into its own qmake feature file, called sis_targets. It is currently enabled by default for Symbian.
* Fixed copy/paste error after commit a31e40295d.axis2010-02-231-1/+1
|
* Removed duplicate resource.axis2010-02-231-1/+0
|
* 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.
* Prevented pkg generation unless there are files to deploy.axis2010-02-221-1/+17
|
* Enabled the "make sis" target with the Symbian makefile build system.axis2010-02-192-74/+89
|
* 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.
* Merge branch 'master' into merge-with-qt-masteraxis2010-02-194-39/+7
|\
| * Fixed plugin locations in the pkg file.axis2010-02-161-10/+6
| | | | | | | | This broke after commit cfdf813056c5e6063e97bd01266c249ec2f9ecf1.
| * Fixed location of dll on Symbian after QtMultimedia was added.axis2010-02-161-1/+1
| |
| * Removed file templates no longer needed after pkg generator was impl.axis2010-02-163-28/+0
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵axis2010-02-19655-2098/+13947
|\ \ | | | | | | | | | | | | | | | | | | merge-with-qt-master Conflicts: qmake/generators/symbian/symmake.cpp
| * | Moved the "sis" target and friends from cpp code to qmake profiles.axis2010-02-196-134/+110
| | | | | | | | | | | | | | | | | | | | | | | | | | | This was done in order to use the same targets for multiple mkspecs. The "store_build" target of sbsv2 had to remain separate, because it depends on using flms. RevBy: Miikka Heikkinen
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-02-181-4/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Make the licenseheader check pass trivial files.
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-18649-1964/+13837
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits) Compile. Remove these friend declarations that aren't necessary in 4.7 Added a new flag to fine-tune gesture propagation policy AIX has a #define for hz, so undef it Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib" remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlib remove -lz from OPENSSL_LIBS so as to respect qt-zlib Fix compilation with IBM xlC 7: Fix compilation of Qt Assistant when WebKit isn't built. Mac: QSystemTrayIcon::DoubleClick and midmouse not working add test for toDateTime() using QLocale::LongFormat remove debug info add test case for QTBUG-7898 that QLocale::toDateTime(QString, FormatType) cannot convert value correctly fix QTBUG-7898 QNAM HTTP: More micro optimization in QHttpNetworkRequest QNAM HTTP: Some micro optimization in QHttpNetworkRequest QNAM HTTP: Trivial optimization Revert "Optimized QLocale to access system locale on demand." doc: Added "\sa {QML Basic Types} to each QML basic type page. Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages. ...
| | * | | Compile.Morten Johan Sørvig2010-02-184-2/+3
| | | | | | | | | | | | | | | | | | | | NSInteger is int/long on 32/64 bit.
| | * | | Remove these friend declarations that aren't necessary in 4.7Thiago Macieira2010-02-171-5/+0
| | | | |
| | * | | Added a new flag to fine-tune gesture propagation policyDenis Dzyubenko2010-02-173-7/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a graphicsobject subscribes to a gesture using the IgnoredGesturesPropagateToParent flag, normal propagation rules do not apply to the gesture, and instead all gestures of the given type that are started over the item will propagate to parent items only. Task-number: QTBUG-7400 Reviewed-by: Andreas
| | * | | AIX has a #define for hz, so undef itThiago Macieira2010-02-171-0/+4
| | | | |
| | * | | Revert "remove -lz from OPENSSL_LIBS so as to respect qt-zlib"Mark Brand2010-02-171-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 7228fdef61fd126481574e53d6d022d134219cc3. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | remove -lz from QT_LFLAGS_PSQL so as to respect qt-zlibMark Brand2010-02-172-15/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QT_LFLAGS_PSQL can introduce -lz. To respect qt-zlib, this must be be removed so that zlib will come from -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. This affects building shared Qt. This patch fixes the problem for win32-g++ and also unix. Assumed that QT_LFLAGS_PSQL is set in configure step if -lpq is not enough. Not sure why parallel logic is in src/sql/drivers/drivers.pri but I fixed that too. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | remove -lz from OPENSSL_LIBS so as to respect qt-zlibMark Brand2010-02-171-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OPENSSL_LIBS can introduce -lz. To respect qt-zlib, this must be replaced with -lQtCore4. Otherwise, linking can fail due to there being two different libraries providing zlib. Merge-request: 405 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | Fix compilation with IBM xlC 7:Thiago Macieira2010-02-171-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "../../../../../include/QtCore/../../src/corelib/kernel/qmetatype.h", line 202.49: 1540-0062 (S) The incomplete class "QMetaTypeId<qdesigner_internal::ArrowKeyOperation>" must not be used as a qualifier. So move the Q_DECLARE_METATYPE before the use. Reviewed-By: hjk <qtc-committer@nokia.com>
| | * | | Fix compilation of Qt Assistant when WebKit isn't built.Thiago Macieira2010-02-174-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | You need to ensure qconfig.h is included before you can check if QT_NO_WEBKIT is defined. Reviewed-by: kh1 <qt-info@nokia.com>
| | * | | Mac: QSystemTrayIcon::DoubleClick and midmouse not workingRichard Moe Gustavsen2010-02-174-73/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac, we never emit the activation signal of the tray icon with other reasons than triggered. The reason; it was never implemented. This patch connect the dots. Task-number: QTBUG-5770
| | * | | add test for toDateTime() using QLocale::LongFormatShenghua Su2010-02-171-20/+5
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | remove debug infoShenghua Su2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | add test case for QTBUG-7898 that QLocale::toDateTime(QString, FormatType) ↵Shenghua Su2010-02-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cannot convert value correctly Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | fix QTBUG-7898Shenghua Su2010-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: 455 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| | * | | QNAM HTTP: More micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-3/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Zeno Albisser
| | * | | QNAM HTTP: Some micro optimization in QHttpNetworkRequestMarkus Goetz2010-02-171-9/+16
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Thiago
| | * | | QNAM HTTP: Trivial optimizationMarkus Goetz2010-02-171-13/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reorder switch. Directly return instead of having a null QByteArray, using append and then returning it. Reviewed-by: Peter Hartmann
| | * | | Revert "Optimized QLocale to access system locale on demand."Denis Dzyubenko2010-02-174-149/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change introduces regression in QIntValidator and QInputDialog, which needs to be addressed before pushing the change again. Also reverted the following two compile fixes: Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)" Revert "Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS)" This reverts commit c786e0cd3c40193073ce2f59f98a4d83bbe1a9b9. This reverts commit 9e5176070cdeba3e96f1969cfbb71bbd407a651e. This reverts commit 8911ed8bfe7f918b93c758f9b5d93274b37739e6. Reviewed-by: trustme
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-171-1/+4
| | |\ \ \
| | | * | | Incorrect mouse coordinates used when compressing WM_MOUSEMOVE messages.Prasanth Ullattil2010-02-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the coordinates passed in the LPARAM parameter, the pt passed with the MSG is not always correct. Task-number: QTBUG-7637 Reviewed-by: Denis
| | * | | | doc: Added "\sa {QML Basic Types} to each QML basic type page.Martin Smith2010-02-171-0/+17
| | |/ / /
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-16639-1880/+13662
| | |\ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (42 commits) doc: Fixed some qdoc errors. doc: Fixed some qdoc errors. Fix copyright year. Fix broken license headers. doc: Fixed some qdoc errors. Reusing sheets on Mac OS X 10.5 & above shows painting artifacts. doc: Fixed some qdoc errors. QNetworkAccessManager: add method to send custom requests doc: Fixed some qdoc errors. Optimization: Avoid calling out to public API function Mac: submenu shows up at the wrong position Add operator< and qHash for QSharedPointer and fix operator-. Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Don't use QSystemLocale if QT_NO_SYSTEMLOCALE (like QWS) Optimized QLocale to access system locale on demand. Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX ...
| | * | | doc: Fixed some qdoc errors.Martin Smith2010-02-167-8/+9
| | | | |
| | * | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-16528-1160/+1462
| | |\ \ \
| | | * | | Fix copyright year.Jason McDonald2010-02-16481-481/+481
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1Jason McDonald2010-02-1613-19/+38
| | | |\ \ \
| | | * | | | Fix broken license headers.Jason McDonald2010-02-1648-679/+981
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | | doc: Fixed some qdoc errors.Martin Smith2010-02-163-2/+3
| | | |/ / / | | |/| | |
| | * | | | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1Martin Smith2010-02-161-0/+2
| | |\ \ \ \
generated by cgit v0.12 at 2025-03-06 04:03:59 (GMT)