summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIXOswald Buddenhagen2010-02-2667-0/+67
| | | | | | | | | | the unix makefile generator can make files for "regular" unixes and macos (the difference being the framework handling). so far, the output choice was hard-wired to the host platform. the previous commit made that soft-configurable, and this one exploits this capability to enable limited cross-building. Reviewed-by: mariusSO
* give symbian an own platform modeOswald Buddenhagen2010-02-266-91/+19
| | | | | | ... instead of using the gross isForSymbian() magic Reviewed-by: mariusSO
* deprecate -win32/-unix/-macx which set both host and target modeOswald Buddenhagen2010-02-261-3/+3
| | | | Reviewed-by: mariusSO
* decouple host platform mode from target platform modeOswald Buddenhagen2010-02-268-16/+110
| | | | | | | | | | | derive the host mode from the generator - this doesn't work *too* well if the mode is different from the real host platform, so it's only for testing. get the target platform mode from the qmakespec, falling back to the host platform mode. Reviewed-by: mariusSO
* factor out applyHostMode()Oswald Buddenhagen2010-02-262-9/+14
| | | | | | more preparation work for delayed mode determination ... Reviewed-by: mariusSO
* make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtinsOswald Buddenhagen2010-02-261-9/+13
| | | | | | | this will allow setting their actual value depending on a delayed determination of the platform. Reviewed-by: mariusSO
* use QDir::separator() instead of Option::dir_sep where appropriateOswald Buddenhagen2010-02-263-3/+3
| | | | | | | | | in these cases, the separator depends on the *real* host platform, not on the one that will host the build. there are many more cases like that, but that's for (much) later ... Reviewed-by: mariusSO
* simplify string opsOswald Buddenhagen2010-02-261-1/+1
| | | | Reviewed-by: mariusSO
* sanitize evaluation of OS scopesOswald Buddenhagen2010-02-261-13/+14
| | | | | | | | | this is marginally behavior-incompatible in that adding the name of an OS scope to CONFIG will not make it true any longer. the cleaned up semantics (besides having merit by themselves) will enable optimizations. Reviewed-by: mariusSO
* instead of hard-coding recursion for symbian, add it to the specsOswald Buddenhagen2010-02-263-4/+2
| | | | Reviewed-by: mariusSO
* add possibility to request project recursion from within a pro fileOswald Buddenhagen2010-02-266-14/+44
| | | | | | | | | | | this is the same as specifying -r on the command line, but it can be set in pro and spec files for cases where no recursion would plain not work. the implementation is via a new option() instruction which at some point will be used to set other "modes of operation" as well. for now, only the "recursive" option is recognized. Reviewed-by: mariusSO
* fix ts-assistant targetOswald Buddenhagen2010-02-251-1/+1
|
* use QList::reserve() as appropriateOswald Buddenhagen2010-02-252-0/+6
|
* optimize appending of (empty) lists to (empty) listsOswald Buddenhagen2010-02-251-9/+16
| | | | | | | | if appending an empty lists, don't do anything. if appending to an empty list, just assign. this saves some needless detaches/reallocs. Reviewed-by: joao
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-2417-512/+1449
|\ | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). tr()-Fixes in Assistant/QHelpLib code. Remove QObject::tr() in the network module code.
| * suppress pointer aliasing warningsOswald Buddenhagen2010-02-241-3/+6
| | | | | | | | | | | | | | the code as such is safe, as no aliasing can occur here. so it is just a matter of making the compiler shut up. Reviewed-by: Olivier Goffart
| * Fix compilation with namespace.ck2010-02-241-0/+1
| |
| * Assistant: Make ~AbstractHelpViewer() virtual.ck2010-02-241-1/+1
| |
| * Prepare German translations for 4.7 (except Quick).Friedemann Kleint2010-02-245-488/+1416
| |
| * tr()-Fixes in Assistant/QHelpLib code.Friedemann Kleint2010-02-243-10/+10
| | | | | | | | Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
| * Remove QObject::tr() in the network module code.Friedemann Kleint2010-02-246-10/+15
| |
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2432-62/+181
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QMediaContent test; make sure to use network. Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| * QMediaContent test; make sure to use network.Justin McPherson2010-02-241-1/+1
| | | | | | | | Reviewed-by: Andrew den Exter
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2431-61/+180
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Add -mediaservice argument to configure. Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | * Rebuild configure.exeAndrew den Exter2010-02-241-0/+0
| | |
| | * Add -mediaservice argument to configure.Andrew den Exter2010-02-244-14/+43
| | | | | | | | | | | | | | | | | | | | | | | | Enables building the default media service backend for a platform. Is on by default if the build environment requirements are met and -no-mediaservice disables the option. Reviewed-by: Justin McPherson
| | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2326-47/+137
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2326-47/+137
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Remove active qDebugs. Player demo updated with more user-friendly previous button behaviour. Added QNetworkRequest constructor to QMediaContent. Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia. Add private header warning.
| | | | * Remove active qDebugs.Justin McPherson2010-02-2312-42/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change to qWarning where appropriate, otherwise comment Reviewed-by: Dmytro Poplavskiy
| | | | * Player demo updated with more user-friendly previous button behaviour.Nicholas Young2010-02-232-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing previous within the first five seconds will go to the previous item in the playlist. Otherwise, it will seek to the beginning of the current item. Reviewed-by: Kurt Korbatits
| | | | * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-stagingNicholas Young2010-02-2318-28/+212
| | | | |\
| | | | | * Change qml.{h,cpp} -> multimediaqml.{h,cpp} in QtMultimedia.Justin McPherson2010-02-234-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Nicholas Young
| | | | | * Add private header warning.Justin McPherson2010-02-235-0/+54
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Kurt Korbatits
| | | | * | Added QNetworkRequest constructor to QMediaContent.Nicholas Young2010-02-233-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now consistent with QMediaResource. Reviewed-by: Dmytro Poplavskiy
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵Qt Continuous Integration System2010-02-241-2/+0
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: compile fix with namespaces after a broken automatical merge
| * | | | | compile fix with namespaces after a broken automatical mergehjk2010-02-241-2/+0
| | | | | |
* | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-24131-117/+23094
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (121 commits) Make this function non-static. Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. ...
| * | | | | Make this function non-static.Aaron McCarthy2010-02-231-1/+1
| | | | | |
| * | | | | Merge remote branch 'staging/master' into bearermanagement/stagingAaron McCarthy2010-02-23127-2086/+2417
| |\ \ \ \ \
| | * \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-23131-117/+23094
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (120 commits) Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. ...
| * | \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-232-1/+15
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote branch 'origin/master' into bearermanagement/stagingAaron McCarthy2010-02-23277-2687/+2419
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Make compile on Maemo6.Aaron McCarthy2010-02-233-9/+16
| | | | | | | | |
| * | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-2315-28/+158
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-22131-117/+23077
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (118 commits) Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. Optimise iterations over QHash. Use snippets. ...
| * | | | | | | | | Fix build on Symbian.Aaron McCarthy2010-02-233-2/+12
| | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Change initialization order.Aaron McCarthy2010-02-221-1/+1
| | | | | | | | |
| * | | | | | | | Merge remote branch 'staging/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221-0/+1
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fixed qnetworksession test on Mac.Rohan McGovern2010-02-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use an app bundle for this helper app.
| | * | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-21129-115/+22880
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (114 commits) Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. Optimise iterations over QHash. Use snippets. Reorder members to remove hole. Expand documentation for QNAM::setConfiguration() and friends. Fix build on Windows, typo. Fix build on Windows. ...
generated by cgit v0.12 at 2025-03-02 12:56:50 (GMT)