summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Make QDeclarativeMetaType and QDeclarativeType privateAaron Kennedy2010-02-2413-26/+30
|
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlMartin Jones2010-02-2423-317/+328
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlAaron Kennedy2010-02-241-1/+1
| |\
| | * Fix wrong property name in qdeclarativeitem docsLeonardo Sobral Cunha2010-02-241-1/+1
| | |
| * | Fixup tests after QDeclarative class renamesAaron Kennedy2010-02-241-1/+1
| | |
| * | Simplify QML element registration headersAaron Kennedy2010-02-2421-315/+326
| |/
* | Don't crash if the currentIndex is set while creating a delegate.Martin Jones2010-02-242-1/+5
|/ | | | Task-number: QTBUG-8456
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qmlWarwick Allison2010-02-2410-62/+188
|\
| * Add an "asynchonous" property to Image.Martin Jones2010-02-248-58/+178
| | | | | | | | | | Allows loading/decoding local images in an asynchronous thread (already the case for network images).
| * Removed unnecessary update calls in qmlgraphicsitemLeonardo Sobral Cunha2010-02-241-4/+0
| | | | | | | | Reviewed-by: akennedy
| * Automatically connect to a notify signal if the requested signal isBea Lam2010-02-241-0/+10
| | | | | | | | | | | | | | in the "onFooChanged" form, even if the notify signal is not called "fooChanged". Task-number: QT-2783
* | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtWarwick Allison2010-02-2474-13/+14852
|\ \ | |/ |/| | | | | | | Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
| * 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. ...
| | | * | | | | | | Move http resume code into http backend.Aaron McCarthy2010-02-124-18/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds two new virtual functions to QNetworkAccessBackend: bool canResume() const; and void setResumeOffset(quint64) canResume() is used to query the existing backend if resuming is supported for the current request. setResumeOffset() is used to set an additional offset which should be applied when the backend posts the request. The default implementation of canResume() returns false (resuming not supported). The default implementation of setResumeOffset() does nothing.
| | | * | | | | | | Fix compiler warning, unused variable.Aaron McCarthy2010-02-121-2/+0
| | | | |/ / / / / | | | |/| | | | |
| | | * | | | | | Merge remote branch 'origin/master' into master-mobilityRohan McGovern2010-02-1113-124/+356
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
| | | * | | | | | | Add 'We mean it.' header.Aaron McCarthy2010-02-111-2/+13
| | | | | | | | | |
| | | * | | | | | | Merge remote branch 'origin/master' into bearermanagement/integrationAaron McCarthy2010-02-11260-3350/+9646
| | | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure
| | | * | | | | | | | Use provided typedef for QNetworkConfigurationPrivatePointer.Aaron McCarthy2010-02-114-15/+11
| | | | | | | | | | |
generated by cgit v0.12 at 2025-01-10 05:13:05 (GMT)