| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/openvg/qpaintengine_vg.cpp
src/script/bridge/qscriptqobject_p.h
tests/auto/bic/tst_bic.cpp
|
| | | |
|
| | |
| | |
| | |
| | |
| | | |
Instead of returning from the socket's readyRead() handler
break out of the switch() and continue parsing the data.
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Fail earlier. Use constant that was introduced in one of the previous
commits.
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | |
| | |
| | | |
Applications which are built against Qt 4.7 but choose to use the
bearer management module from Qt Mobility do not get to set/get the
network configuration used by QNAM.
|
|/ /
| |
| |
| |
| | |
Merge-request: 582
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (71 commits)
Autotest: increase wait time to 3s on Windows to bypass 2s-granularity limitation
Autotest: update to the new values for the locale
do not expand variables in read()'s file name
remove ability to use break() a block outside any loop
don't add -unix to the qmake command line
Increase the timeout for the QNAM getter test to 30 seconds
Remove unstable hosts from the list
qdoc: Output TOC for more class ref pages.
Other fixes to the remote network stresstester
Fix SSL connection problem.
Make sure we don't try URLs that aren't HTTP or HTTPS
Fix menu bar visibility.
Add SSL remote host tests
Split the remote and the local tests in two, in preparation for SSL tests
Add tests for remote hosts
Change the way we calculate the average transfer rates.
Finish renaming
Move these tests to tests/manual.
Add a QNetworkAccessManager stresstest
Add a non-blocking native function too
...
|
| |\ \ |
|
| | | |
| | | |
| | | |
| | | | |
This add addition ifdefs around code missed by MR 517.
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Merge-request: 517
Reviewed-by: Aaron McCarthy <aaron.mccarthy@nokia.com>
|
|\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/3rdparty/webkit/VERSION
src/3rdparty/webkit/WebCore/ChangeLog
src/3rdparty/webkit/WebCore/page/FrameView.cpp
src/3rdparty/webkit/WebCore/rendering/RenderWidget.cpp
src/3rdparty/webkit/WebKit/qt/symbian/eabi/QtWebKitu.def
src/s60installs/bwins/QtCoreu.def
src/s60installs/bwins/QtGuiu.def
src/s60installs/bwins/QtNetworku.def
src/s60installs/eabi/QtGuiu.def
tests/auto/qscriptextqobject/tst_qscriptextqobject.cpp
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-wrote some code to improve pipelining efficiency. Greatly helps
with combining into one TCP packet.
Task-number: QTBUG-9894
Task-number: QT-3280
Reviewed-by: Peter Hartmann
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-7359
|
|\ \ \
| |/ /
| | /
| |/
|/| |
Conflicts:
src/script/api/qscriptengine.cpp
|
| | |
|
|\ \
| |/ |
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Work done jointly by Gareth and me. Yields no qdoc errors.
Task-number: QTBUG-9342
Task-number: QTBUG-9120
Reviewed-by: Gareth Stockwell
Reviewed-by: David Boddie
|
|\ \
| |/
| |
| |
| | |
Conflicts:
src/multimedia/audio/qaudioinput_win32_p.h
|
| |
| |
| |
| |
| | |
Merge-request: 2332
Reviewed-by: Peter Hartmann
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (25 commits)
Fix compilation on WinCE and MinGW by memsetting the OVERLAPPED struct.
qdoc: Added <div> elements to some html output for class references.
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
...
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits)
Fix compile error on mingw.
MONILITY-645
Do not override alternate background color in Plastique
Fix QComboBox ignoring foreground role in some styles
Fix compilation on HP-UXi: _SC_MONOTONIC_CLOCK isn't defined
Fix compilation with Sun CC:
Ensure that we return QPair<long,long> in all cases.
Update PLATFORM(SPARC64) to CPU(SPARC64)
jui files are no c++ ...
scan some more file types by default
Support EtchDisabledText with spin box on Windows style
QNAM HTTP: Fix invoking a method when being destructed right now
Fixed a typo in the QDoubleValidotor doc.
Trivial fix to JavaScriptCore to fix building with MSVC 2010
Autotest: oops, fix oops: remove qguard from auto.pro
Autotests: oops, remove last traces of QGuard
Remove QGuard.
Unskip test that used to crash
QtScript: Add yet more missing API shims
QtScript: Make sure the old identifier table is restored
...
|
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thiago Macieira
|
| |\ \ \
| | |/ /
| | | |
| | | |
| | | | |
Conflicts:
src/declarative/graphicsitems/qdeclarativeitem.cpp
|
| |\ \ \
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
|\ \ \ \ \
| |_|_|/ /
|/| | | /
| | |_|/
| |/| |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
RVCT has trouble when QPointer is instantiated on classes with inlined
constructors/functions.
Compile fix for 43e1cffb16c2eea54392f5c56210b10abb2f044e,
cc22a14f3d2159a8f760b44e3fe1636a3721ce95 and 656c02f128c56177c48b3de47f7b1e17dbbfa4d3
Reviewed-by: Peter Hartmann
Reviewed-by: Prasanth
|
| | | | |
|
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This fixes a crash in tst_qnetworkreply and in some QtWebKit
based browsers.
It was related to adding a QPointer on an already
deleted QHttpNetworkConnection object. By converting
an existing normal pointer to a QPointer we set
it a 0-pointer and are safe.
https://bugs.webkit.org/show_bug.cgi?id=36290
Reviewed-by: joao
Reviewed-by: gabi
|
| | |
| | |
| | |
| | | |
Reviewed-by: thiago
|
| | |
| | |
| | |
| | | |
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
|
| | | |
|
|\ \ \
| |_|/
|/| |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits)
Moc: Add support for rvalue references in signals and slots.
Add support for polyphonic greek
Fix build failure on WinCE.
Autotests: if you use X11 libs, you must link to X11 libs explicitly.
Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x
Compile Phonon in C++0x mode.
Compile Qt in C++0x mode.
Avoid a data relocation by not trying to store a pointer in the .data section of plugins.
Fix cast-from-ascii warning
Fix compilation on Linux
Fix compilation with WINSCW: #include doesn't find files in the same dir
Rename m_volume to m_vol
Add 2 signals, introduce side widget, make it possible to reset startId
Do not create native window handle just because a parent has one.
Tab color fix for document mode on Snow Leopard.
Revert "Don't emit open signal on session close/error."
Rename networkAccess property to networkAccessible.
Don't emit open signal on session close/error.
Rename private signal.
Autotest: fix instability by accepting rounding errors
...
|
| | |
| | |
| | |
| | | |
This reverts commit 39818f933b958d504b9cc18487658209d1df22da.
|
| | |
| | |
| | |
| | | |
Add unit test and update docs.
|
| | | |
|
| | | |
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
mkspecs/common/symbian/symbian.conf
src/gui/graphicsview/qgraphicswidget.h
src/gui/kernel/qapplication.cpp
src/gui/text/qtextlayout.cpp
src/openvg/qpixmapdata_vg.cpp
src/s60installs/s60installs.pro
tools/runonphone/main.cpp
tools/runonphone/serenum_unix.cpp
qtextlayout.cpp fixed up together with Eskil.
Kept the configure.exe from 4.7 without recompile.
|
| |
| |
| |
| | |
Reviewed-by: Thiago
|
| |
| |
| |
| | |
Reviewed-by: Peter Hartmann
|
| |
| |
| |
| |
| | |
Abort waiting QNetworkReplys with an error on session errors. Non
waiting replies will likely fail by other means (e.g. broken sockets).
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Bearer Management is of little use on desktop platforms. Change
QNetworkAccessManager to only create a QNetworkSession for the default
configuration on platorms where it is useful (Symbian & Maemo). On other
platforms Bearer Management is still available, but needs to be
explicitly enabled by the application developer by calling
QNetworkAccessManager::setConfiguration().
Use of Bearer Management by default from QNetworkAccessManager is
controlled by the QT_QNAM_BEARERMANAGEMENT_ENABLED define.
|
| |
| |
| |
| |
| |
| | |
If QNAM::setConfiguration(QNetworkConfiguration()) is called before the
first network request is processed new session using the default
configuration would be incorrectly created.
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits)
fix corewlan detection error when building for 10.5 when 10.6 is also
fixed treatment of zlib on Mac when crossbuilding
Partial overloading support for qdbus cli tool.
Allow empty authority in QUrl::setAuthority as per docs.
Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority.
fixed case of GL include directory
check in MAC_APPLICATION_MENU translations
Re-generate the Unicode tables after updates to the program that generates them
Fix the code after merge: DerivedNormalizationProps has two or more columns
add some usefull definitions to qunicodetables_p.h
qchar.cpp: fix identation
finish last commit
prefer DerivedNormalizationProps.txt over CompositionExclusions.txt
improve error reporting a bit more
improve error reporting
fix incorect condition
check if string to int conversions were done w/o errors
improve error reporting for unassigned grapheme/word/sentence break classes
avoid using of qunicodetables_p.h in generator
use QHash for line break map
...
|
| | | |
|
|\ \ \
| |/ /
|/| /
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Conflicts:
configure.exe
examples/multimedia/audioinput/audioinput.cpp
src/corelib/io/qfsfileengine.cpp
src/gui/egl/qegl_wince.cpp
src/gui/egl/qeglproperties.cpp
src/gui/egl/qeglproperties_p.h
src/gui/embedded/directfb.pri
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qdrawutil.cpp
src/opengl/qgl_p.h
src/sql/drivers/odbc/qsql_odbc.cpp
src/sql/drivers/odbc/qsql_odbc.h
tests/auto/auto.pro
tests/auto/qgl/tst_qgl.cpp
translations/assistant_adp_ru.ts
|
| |
| |
| |
| | |
Reviewed-by: Olivier Goffart
|
|\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/declarative/graphicsitems/qdeclarativeevents.cpp
src/declarative/graphicsitems/qdeclarativeflickable.cpp
src/declarative/graphicsitems/qdeclarativegridview.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativeeasefollow.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativespringfollow.cpp
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qmlstateoperations.cpp
src/multimedia/qml/qdeclarativeaudio.cpp
src/multimedia/qml/qdeclarativevideo.cpp
|
| |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits)
fix "configure -fast" on Windows for other maketools than nmake
Get qmake to add pdb files to install target in debug configuration.
add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX
give symbian an own platform mode
deprecate -win32/-unix/-macx which set both host and target mode
decouple host platform mode from target platform mode
factor out applyHostMode()
make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins
use QDir::separator() instead of Option::dir_sep where appropriate
simplify string ops
sanitize evaluation of OS scopes
instead of hard-coding recursion for symbian, add it to the specs
add possibility to request project recursion from within a pro file
fix ts-assistant target
use QList::reserve() as appropriate
optimize appending of (empty) lists to (empty) lists
suppress pointer aliasing warnings
Fix compilation with namespace.
Assistant: Make ~AbstractHelpViewer() virtual.
Prepare German translations for 4.7 (except Quick).
...
|
| | | | |
|