| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
|
|
|
|
|
|
| |
QtDBus module is useless with QT_NO_PROPERTIES. Add D-Bus section and
DBUS feature which requires PROPERTIES. Update qfeatures.h. Disable
QtDBus module, a bearer management plugin for NetworkManager and a
script plugin for QtDBus when QT_NO_DBUS is defined.
Merge-request: 511
Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
|
|
|
|
| |
Merging bearer header.
|
|
|
|
| |
open is public.
|
|
|
|
| |
this fixes associating..
|
|
|
|
| |
Resources are not allocated on error. Only free on success.
|
| |
|
| |
|
| |
|
|
|
|
| |
Task-number: QT-3150
|
| |
|
|\
| |
| |
| |
| | |
Conflicts:
src/plugins/bearer/corewlan/qcorewlanengine.mm
|
| |
| |
| |
| | |
6fb31d1e287d7def45c115eb56bcb9b0c5cb3c40.
|
|/ |
|
| |
|
|
|
|
|
|
| |
Warnings are unnecessary when not building for Symbian.
Task-number: QTBUG-9156
|
|
|
|
| |
Task: QTBUG-9156
|
| |
|
|
|
|
| |
This reverts commit 39818f933b958d504b9cc18487658209d1df22da.
|
|\
| |
| |
| |
| | |
Conflicts:
mkspecs/common/symbian/symbian.conf
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits)
Fixed Symbian applications with DESTDIR set.
Removed a warning about generated rss files.
Revert "Temporarily disable problematic dll."
Fixed "Cannot install protected application" message on Symbian.
Worked around a crash in the elf2e32 postlinker tool.
Worked around case differences in Symbian^3 and Gnupoc.
Enabled compilation of plugins again.
Fixed a building bug where the DLL entry point was undefined.
Moved UID2 processing from cpp code to profiles.
Added rpp and rsg files to ignore filter.
Moved two profiles to the correct directory.
Fix build break caused by undefined symbol SetDialogPreference
Temporarily disable problematic dll.
Use the same concept for per-lib tweaks as armcc
Consistently use the * in configure
Symbian doesn't have large file support currently, just turn it off
Remove largefile config test
Make sure that we have all compile flags available always
Enabled dependencies for .dso and .lib libraries only.
Switched to using DEF_FILE, which is the official variable.
...
|
| | |\
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Conflicts:
mkspecs/common/symbian/symbian.conf
qmake/generators/makefile.h
qmake/project.cpp
src/3rdparty/webkit/WebCore/WebCore.pro
src/src.pro
|
| | | | |
|
| | | | |
|
|/ / / |
|
| | | |
|
| | | |
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The NetworkManager plugin for Brearer Management no longer has a compile
time dependency on NetworkManager.
Task-number: QTBUG-9005
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
the keychain.
Users will still see the keychain prompt when attempting to
connect/associate with a wifi network.
|
| | |
| | |
| | |
| | | |
Task-number: QTBUG-8954
|
| |/
|/| |
|
| | |
|
| | |
|
| | |
|
| |
| |
| |
| | |
Reviewed-by: Prasanth
|
| |
| |
| |
| | |
and change to better way of getting wifi interfaces.
|
|\ \ |
|
| | |
| | |
| | |
| | |
| | | |
handled by generic engine.
also fix release crash
|
| | | |
|
| | | |
|
| | | |
|
|/ /
| |
| |
| |
| |
| |
| | |
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:
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
|
| | |\ \
| | | |/
| | | |
| | | |
| | | | |
Conflicts:
configure.exe
|
| | | |\
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
master-integration
* 'master' of scm.dev.nokia.troll.no:qt/mobility-staging:
Speed up compilation of this test with MSVC.
Fix Symbian build when building for WINSCW with abld.
Fix file descriptor leak with generic engine on Linux.
|
| | | | |\
| | | | | |
| | | | | |
| | | | | | |
bearermanagement/staging
|
| | | | | | |
|
| | | | |/
| | | | |
| | | | |
| | | | | |
Fix include path to find private QtNetwork headers.
|
| | | | | |
|
| | | |/
| | |/| |
|