summaryrefslogtreecommitdiffstats
path: root/src/plugins/bearer
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Use shared socket server session everywhereShane Kearns2010-12-062-16/+4
|/ / | | | | | | | | | | | | Converted uses of RSocketServ in QtNetwork and the symbian bearer plugin to use the shared session from QtCore instead of creating their own Reviewed-by: Markus Goetz
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-251-1/+1
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/symbian/symmake.cpp src/corelib/global/qglobal.h src/gui/kernel/qwidget_p.h src/gui/painting/qtextureglyphcache.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h src/plugins/qpluginbase.pri src/qbase.pri tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp tests/auto/qthread/tst_qthread.cpp tests/auto/selftests/expected_cmptest.txt tests/auto/selftests/expected_crashes_3.txt tests/auto/selftests/expected_longstring.txt tests/auto/selftests/expected_maxwarnings.txt tests/auto/selftests/expected_skip.txt tools/assistant/tools/assistant/doc/assistant.qdocconf tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf tools/qdoc3/test/qdeclarative.qdocconf tools/qdoc3/test/qmake.qdocconf tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf tools/qdoc3/test/qt.qdocconf tools/qdoc3/test/qt_ja_JP.qdocconf tools/qdoc3/test/qt_zh_CN.qdocconf
| * Doc: Fixing typoSergio Ahumada2010-11-161-1/+1
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-193-17/+36
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/win32/msbuild_objectmodel.cpp src/gui/kernel/qgesturemanager.cpp tools/qdoc3/test/qt-build-docs.qdocconf tools/qdoc3/test/qt.qdocconf Changes in qmake/generators/win32/msvc_objectmodel.cpp come from commit 4ba3dadcae97bfde6216c32cfa339f8f0e0253c7
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Perttu Pohjonen2010-11-151-3/+3
| |\
| | * Fix for KERN-EXEC 0 caused by QNetworkAccessManager::getVille Pernu2010-11-121-3/+3
| | | | | | | | | | | | | | | | | | | | | QT-4155 bug. Canceling Network Session before canceling connection notifier notifications causes a call to an invalid RConnection instance. Fix: CanceL Network session after canceling notifications.
| * | Fix for E32User-CBASE 46 Panic when using CActiveSchedulerWaitPerttu Pohjonen2010-11-152-14/+33
| |/ | | | | | | | | | | | | | | Fixing the initial problem of this error opened up a possibility to start a new WLAN scan while there was one still ongoing. This caused a crash. Task-number: QT-3996
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-124-38/+53
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure doc/src/snippets/code/doc_src_qmake-manual.qdoc mkspecs/features/symbian/application_icon.prf mkspecs/features/symbian/default_post.prf mkspecs/features/symbian/symbian_building.prf qmake/generators/symbian/initprojectdeploy_symbian.cpp src/multimedia/audio/audio.pri src/network/access/qnetworkaccessmanager.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/phonon/mmf/mmf.pro tests/auto/qscriptvalue/tst_qscriptvalue.cpp tests/auto/qscriptvalue/tst_qscriptvalue.h tools/qdoc3/doc/qdoc-manual.qdocconf
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-113-37/+52
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: remove pointless assignment of deprecated variable fix tst_headers Fixed a shell syntax error in configure Clear X11 structure before use Make operator QRectF const Fix GC-related crash in QScriptValue::setData() get rid of dependency on QtGui Removed implicity QtGui linking from icd.pro as it is not needed. DFB: Make sure QPixmap::hasAlpha is respected fix build on mingw Fix some painting issues in QDirectFBPaintEngine QNAM: Do not need QNetworkSession in AlwaysCache load mode Don't crash if QScriptClass property getter returns an invalid value QNAM: Remove dead waitForUpstreamBytesWritten() code QNAM: Remove dead waitForDownstreamReadyRead() code fix memleak in test
| | * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7juhvu2010-11-102-36/+51
| | |\
| | | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-11-099-108/+39
| | | |\
| | | * | get rid of dependency on QtGuiLorn Potter2010-11-092-36/+51
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-15059 Reviewed-by: trustme
| | * | | Removed implicity QtGui linking from icd.pro as it is not needed.juhvu2010-11-091-1/+1
| | | |/ | | |/| | | | | | | | | Task-number: QTBUG-15059
| * | | Doc: Fixing typoSergio Ahumada2010-11-091-1/+1
| |/ /
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-11-081-1/+1
|\ \ \ | |/ /
| * | Task-number: QTBUG-15059juhvu2010-11-081-1/+1
| | | | | | | | | | | | | | | Removed implicit QtGui linking from qsymbianbearer plugin as it is not needed.
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-11-061-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (45 commits) mkspecs: Move QMAKE_CC and QMAKE_CXX from gcc-base.conf to g++-base.conf mkspecs: Make linux-x86-openkode-g++ not include g++.conf directly mkspecs: Include gcc-base-unix.conf from g++.conf to match old behavior configure: Deal with multiple redefinitions of qmake variables Split QScriptValue::call autotest into smaller tests. Optimize and clean up QClipData::fixup() There is no predefined qmake x11 scope for x11 builds. Refactor tst_QScriptContext::throwError test. Fixed whitespace. Don't use scopes in mkspecs as configure does not support them Fixed destination path for the S60 feedback plugin. Don't put Objective-C sources in SOURCES Fix regression in tst_maketestselftest::naming_convention. Split monolithic QScriptEngine autotests into smaller tests Add SunSpider and V8 benchmarks to benchmarks/script.pro Push and pop the thread-default context for the current thread Silence preprocessor warnings about __TARGET_ARCH_ARM not being defined. Import SunSpider benchmarks for QtScript Import V8 benchmarks for QtScript Add more microbenchmarks for QScriptValue ...
| * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-301-1/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
| | * \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-10-301-1/+2
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add autotest for QScriptExtensionPlugin Improve QtScript test coverage Don't crash when null-pointer is passed to qScriptValueFromValue() Simplify object lifetime management when moving objects to a QThread samegame: white space Move list of trusted benchmarks out of QA dungeon and into Qt Don't put Objective-C sources in SOURCES mkspecs: Emit warning when including g++.conf directly
| | | * | | Don't put Objective-C sources in SOURCESTor Arne Vestbø2010-10-271-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Alexis Ménard <alexis.menard@nokia.com>
* | | | | | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-11-052-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | / / | | |_|/ / | |/| | | | | | | | Conflicts: mkspecs/features/symbian/symbian_building.prf src/network/access/qhttpnetworkconnectionchannel.cpp
| * | | | Fix opening a network session multiple times in succession.Aaron McCarthy2010-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Don't try to open the network session if there is already an in progress open request.
| * | | | Fix synchronous dispatch in ICD in non-main threads.Aaron McCarthy2010-11-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ICD DBus signals always come in via the main thread. During synchronous dispatch these signals were not being emitted when expected because no event loop is running in the destination thread. Fixed by added a call to QCoreApplication::sendPostedEvents(object, QEvent::MetaCall) in the synchronous dispatch loop. Task-number: QTBUG-15004
* | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-301-4/+4
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | |
| * | | dbus does not use this. fix build.Lorn Potter2010-10-291-4/+4
| | | | | | | | | | | | | | | | Reviewed-by: trust me
* | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-294-107/+36
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | remove the connecting thread, and use async call to dbus instead.Lorn Potter2010-10-294-107/+36
| | | | | | | | | | | | | | | | | | | | | | | | This fixes the case where the connection threads are never stopped until desctuctor. Task-number: QTBUG-14836 Reviewed-by: trust me
* | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2010-10-252-2/+2
|\ \ \ | |/ /
| * | Fixed many spelling errors.Rohan McGovern2010-10-252-2/+2
| |/
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-10-251-7/+3
|\ \ | |/ | | | | | | | | | | | | | | | | Conflicts: demos/declarative/snake/snake.qml qmake/generators/symbian/symbiancommon.cpp src/network/access/qnetworkaccessmanager.cpp src/s60installs/s60installs.pro tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp
| * Fix User 46 Panic in bearer management on Symbian.Aaron McCarthy2010-10-131-7/+3
| | | | | | | | | | | | | | The active object made a request before it was set as active. Task-number: QT-3996 Written-by: Perttu Pohjonen <perttu.pohjonen@nokia.com>
* | enums are defined as typedefs for Windows Embedded 7Oliver Gutbrod2010-10-201-0/+3
| | | | | | | | Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
* | Don't use 'id' as variable name, it has special meaning in Objctive-CTor Arne Vestbø2010-10-151-2/+2
| | | | | | | | Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* | Merge remote branch 'origin/4.7' into master-from-4.7Rohan McGovern2010-10-0417-15/+2938
|\ \ | |/ | | | | | | | | | | | | | | | | | | Conflicts: doc/src/snippets/code/doc_src_qmake-manual.qdoc src/corelib/arch/symbian/arch.pri src/declarative/graphicsitems/qdeclarativeflickable.cpp src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h tests/auto/qfontmetrics/tst_qfontmetrics.cpp
| * Initialise pointer variables.Aaron McCarthy2010-09-291-2/+2
| |
| * An aborted QNetworkSession on Maemo must emit SessionAbortedError.Alex2010-09-291-2/+5
| | | | | | | | | | | | | | Currently it emits InvalidConfigurationError Task-number: QTMOBILITY-514 Reviewed-by: Aaron McCarthy
| * Fix compile warnings (unused variables).Aaron McCarthy2010-09-282-1/+9
| |
| * Removing libconninet 3rdparty component.Aaron McCarthy2010-09-2815-6/+2915
| | | | | | | | | | | | | | | | | | | | | | | | The use of libconninet caused Qt to have a cyclic build dependency. Which was solved by embedding a copy as a 3rd party library. Maemo has since donated the libconninet code to Qt because (1) it was a private Maemo API and (2) the Qt ICD plugin is the only user of the library. This commit moves the relevent code from src/3rdparty/libconninet to src/plugins/bearer/icd and deletes the rest. Task-number: QT-3893
| * Closes properly the dbus connection in icd backendAaron McCarthy2010-09-281-0/+2
| |
| * Connect/Disconnect requests needs to use the same dbus connection to ICD for ↵Aaron McCarthy2010-09-282-5/+6
| | | | | | | | | | | | the refcounting to work in ICD. Fixes NB#188145 - Network interface doesn't go down after last client disconnects
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Thiago Macieira2010-09-218-27/+37
|\ \ | |/ | | | | | | | | | | | | Conflicts: src/corelib/kernel/qobject.h src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativeflickable_p_p.h src/declarative/util/qdeclarativelistmodel.cpp
| * Remove pre-Symbian3 plugins from Symbian3 and later buildsMiikka Heikkinen2010-09-172-5/+8
| | | | | | | | | | | | | | | | | | Symbian3 and later builds are not compatible with pre-Symbian3 phones anyway, so no need to build and deploy older version plugins when building for Symbian3 or later. Task-number: QT-3949 Reviewed-by: Janne Koskinen
| * Check S60_VERSION instead of existence of certain files in bearer pluginMiikka Heikkinen2010-09-162-15/+15
| | | | | | | | | | | | | | | | | | Checking for existence of files does not work in clean platform builds, so check the S60_VERSION instead, which can be explicitly set by those builds to correct value. Task-number: QT-3949 Reviewed-by: axis
| * Don't add generic subdirs project twice.Aaron McCarthy2010-09-131-3/+3
| | | | | | | | Task-number: QTBUG-13519
| * Remove debug, quiet warnings.Aaron McCarthy2010-09-131-2/+0
| |
| * Fix memory leaks and valgrind errors.Aaron McCarthy2010-09-131-2/+9
| |
| * Bearer management: Fix compilation with namespace.Christian Kandeler2010-09-101-0/+2
| |
* | Merge remote branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2010-09-1012-188/+1592
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: bin/syncqt demos/declarative/snake/content/snake.js demos/declarative/snake/snake.qml doc/src/development/qmake-manual.qdoc src/corelib/plugin/plugin.pri src/gui/kernel/qapplication_win.cpp src/gui/kernel/qdesktopwidget_win.cpp src/gui/painting/qdrawhelper.cpp tests/auto/qdir/tst_qdir.cpp tools/qdoc3/test/assistant.qdocconf tools/qdoc3/test/designer.qdocconf tools/qdoc3/test/linguist.qdocconf
| * protect nil dictionary from release.Lorn Potter2010-09-031-38/+47
| | | | | | | | Task-number: QTBUG-13335
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-09-034-94/+152
| |\
generated by cgit v0.12 at 2025-04-08 14:57:10 (GMT)