| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |\
| |
| |
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/symbian/symmake.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
|
| | |
| |
| |
| | |
Reviewed-by: thiago
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Ensure that the threadpool QHostInfo uses internally has cleanup its
threads when the application exits. This avoids the warning from
QWaitCondition on Windows (which happens due to thread termination at
application exit).
Task-number: QTBUG-7691
Reviewed-by: mgoetz
|
| |\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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).
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits)
different approach to fixing "the other" aliasing issue
fix aliasing issue in node_construct()
detach in fewer cases, remove redundant calculation
SSL: Fix memleak related to local certificate
Improve keyboard layout detection on X11
Compile on ARM with -Werror -Wold-style-cast
Use the vista-style native dialog for QFileDialog::getExistingDirectory
Apply the stdset attribute for resource properties
doc: Completed sentence about HideNameFilterDetails
Doc fix in QLocale
Doc for for QGestureRecognizer::create.
Fix broken setCollectionFile (creating multiple models instead reusing)
Enable the fast paths when converting to Rgb565
qdoc: ifdefed out all the debug code.
Add missing QtScript API shims
Further fix license whitespace.
Remove NetworkManager test-bed application.
Remove configure test for NetworkManager.
Fix QDir::entryList regression
Add DEFINES to mingw32/windres.exe command line.
...
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Task-number: QTBUG-6504
Task-number: QTBUG-8924
Task-number: QTBUG-5645
Reviewed-by: andreas
Reviewed-by: Peter Hartmann
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
|
| | | | |
|
| |\ \ \
| |/ /
|/| /
| |/
| | |
Conflicts:
src/gui/styles/qs60style_s60.cpp
|
| | |
| |
| |
| |
| | |
Task-number: QTBUG-2515
Reviewed-by: Andreas Aardal Hanssen
|
| | |
| |
| |
| | |
Reviewed-by: TrustMe
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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
...
|
| | |\ \ |
|
| | | | | |
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Change how the defaultConfiguration is calculated when one is not
provided by an engine.
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Improves the polling mechanism by sharing a single timer for all poll
based engines. Updates are only performed for a poll based engine iff a
QNetworkConfigurationManager object has been constructed or a
QNetworkConfiguration is held externally from the engine.
|
| |\ \ \ \
| |_|/ /
|/| | /
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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: joao
|
| | | |
| | |
| | |
| | | |
Reviewed-by: Olivier Goffart
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Use qt_qhostinfo_lookup which avoids the event loop when the DNS
result is already cached.
Reviewed-by: Thiago
|
| | | |
| | |
| | |
| | |
| | |
| | | |
By default enabled, but it can be disabled via a compile flag.
Reviewed-by: Thiago
|
| | | |
| | |
| | |
| | | |
Reviewed-by: TrustMe
|
| | |/
|/| |
|
| |\ \
| | |
| | |
| | |
| | | |
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
|
| | |\ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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).
...
|
| | | | | | |
|
| | | |\ \ \
| | | |/ /
| | |/| /
| | | |/
| | | |
| | | | |
Conflicts:
qmake/generators/symbian/initprojectdeploy_symbian.cpp
qmake/generators/symbian/symmake_abld.h
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Peter Hartmann
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: TrustMe
|
| | | | |
| | | |
| | | |
| | | |
| | | | |
Reviewed-by: Peter Hartmann
Reviewed-by: David Boddie
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: Thiago
|
| | | | |
| | | |
| | | |
| | | | |
Reviewed-by: David Boddie
|
| | |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The compiler should have caught this error, but instead it accepted
the QDisableNetworkReply constructor without the const. And that led
to a linker error.
Reviewed-by: Trust Me
|
| |/ /
| |
| |
| | |
fca98911b75ce12e70d93cfc2932a9759758a605
|
| |\ \
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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.
...
|
| | | | |
|
| | | |
| | |
| | |
| | |
| | | |
QNetworkConfigurationManagerPrivate and QBearerEngine derived classes
need to be thread-safe.
|
| | |\ \
| | | |
| | | |
| | | |
| | | | |
Conflicts:
src/network/access/qnetworkaccessmanager.cpp
|
| | | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
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.
|
| | | | |
| | | |
| | | |
| | | | |
manager may be 0.
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
| | | | | |
|
