summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* 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-248-13/+22
|\ | | | | | | | | | | | | | | | | | | | | | | 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
| |
| * 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-2424-57/+124
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | 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.
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵Qt Continuous Integration System2010-02-2424-57/+124
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * Add -mediaservice argument to configure.Andrew den Exter2010-02-241-11/+13
| | | | | | | | | | | | | | | | | | | | | | | | 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-2323-46/+111
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2323-46/+111
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | * 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-232-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-2474-13/+14852
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-2374-13/+14852
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| | * | | | 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-2274-13/+14835
| | | |\ \ \ \ | | | | |_|_|/ | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | |
| | * | | | Add locking to bearer code.Aaron McCarthy2010-02-2214-103/+297
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfigurationManagerPrivate and QBearerEngine derived classes need to be thread-safe.
| | * | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-221121-65649/+109503
| | |\ \ \ \ | | | | |_|/ | | | |/| | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkaccessmanager.cpp
| | * | | | Allow QNAM to be created as a global variable.Aaron McCarthy2010-02-182-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNetworkConfigurationManager cannot be loaded before QApplication as the plugins it loads may create timers. Which fail because timers can only be created in threads created with QThread.
| | * | | | Don't load NetworkManager plugin in NetworkManager is not available.Aaron McCarthy2010-02-184-6/+20
| | | | | |
| | * | | | Merge remote branch 'origin/master' into bearermanagement/unit-testsAaron McCarthy2010-02-1715-74/+86
| | |\ \ \ \
| | * | | | | Disable NLA plugin, build generic on win32 and mac.Aaron McCarthy2010-02-171-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NLA plugin locks up on exit for some programs, though not all. Disable for now until cause is found. Always build generic plugin on win32 and mac.
| | * | | | | Fix segfault.Aaron McCarthy2010-02-161-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | manager may be 0.
| | * | | | | Remove debug output.Aaron McCarthy2010-02-161-4/+4
| | | | | | |
| | * | | | | Don't block forever if no bearer plugins are loaded.Aaron McCarthy2010-02-161-0/+5
| | | | | | |
| | * | | | | Always build generic plugin when building NetworkManager plugin.Aaron McCarthy2010-02-161-1/+3
| | | | | | |
| | * | | | | Add QT_MODULE headers.Aaron McCarthy2010-02-153-0/+6
| | | | | | |
| | * | | | | Change docs: "phone" -> "device".Aaron McCarthy2010-02-151-1/+1
| | | | | | |
| | * | | | | Remove unused code.Aaron McCarthy2010-02-152-59/+0
| | | | | | |
| | * | | | | Simplify.Aaron McCarthy2010-02-151-2/+1
| | | | | | |
| | * | | | | Optimise iterations over QHash.Aaron McCarthy2010-02-153-34/+41
| | | | | | |
| | * | | | | Use snippets.Aaron McCarthy2010-02-151-8/+1
| | | | | | |
| | * | | | | Reorder members to remove hole.Aaron McCarthy2010-02-151-4/+4
| | | | | | |
| | * | | | | Expand documentation for QNAM::setConfiguration() and friends.Aaron McCarthy2010-02-151-4/+29
| | | | | | |
| | * | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-14340-163/+106772
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| | * \ \ \ \ \ Merge branch 'laptop/bearermanagement/integration' into ↵Aaron McCarthy2010-02-126-4/+5
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | bearermanagement/integration
| | | * | | | | | Fix build on Windows, typo.Aaron McCarthy2010-02-121-1/+1
| | | | | | | | |
| | | * | | | | | Fix build on Windows.Aaron McCarthy2010-02-125-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On Windows interface is #defined to struct. Make sure that qnetworksession.h is included before qplatformdefs.h.
| | * | | | | | | Merge remote branch 'staging/master' into bearermanagement/integrationAaron McCarthy2010-02-122-3/+16
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | | * | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵Qt Continuous Integration System2010-02-12129-213/+15035
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (165 commits) Add 'We mean it.' header. Use provided typedef for QNetworkConfigurationPrivatePointer. Fix public includes. Document networkSessionOnline() signal and mark as internal. Tag new classes as since 4.7. Fix documentation. Remove debug. Update copyright year to 2010. We don't need to migrate cached replies. Fix after reworking to use signals/slots. Remove debug. Rename and remove unused private slots. Add comments to private state enums. Revert "(ODBC) Use wchar_t instead of assuming 2 bytes." Move check for range header support to before deleting backend. Don't try to migrate finished or aborted requests. Clarify TemporaryNetworkFailureError docs. Remove functions used for testing. Connect signals between QNAM and QNetworkReplyImpl. Fix networkAccessEnabled implementation. ...
generated by cgit v0.12 at 2025-01-26 08:50:13 (GMT)