summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Simplify network manager settings code.Aaron McCarthy2010-08-021-112/+46
| | | | | There is no need to iterate over the outer and inner map as they are not multi-maps.
* Use an enum to return the bearer type of a network configuration.Aaron McCarthy2010-08-0217-222/+139
| | | | | Task-number: QTBUG-12378 Reviewed-by: Alex
* Merge remote branch 'staging/4.7' into bearermanagement/icd-static-libsAaron McCarthy2010-07-287-117/+209
|\
| * Cherry pick fix for MOBILITY-1234 from Qt Mobility.Aaron McCarthy2010-07-281-0/+2
| | | | | | | | e51af0d74f8bb6ca6100d2338671d2d053bfed01
| * Cherry pick fix for QTMOBILITY-408 from Qt Mobility.Aaron McCarthy2010-07-282-33/+34
| | | | | | | | 7f9a8ebcfe86d3df428707888c3ab5fcd10226a4
| * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-24/+68
| | | | | | | | f84bb604d745c512db8d53410c5fec835309f85e
| * Fix compilation error on Symbian^4.Aaron McCarthy2010-07-283-12/+12
| | | | | | | | | | The root cause is failing compilation test for SNAP when it shouldn't, but it should still not result in compilation errors in code.
| * Fix detection of OCC functionality.Aaron McCarthy2010-07-281-1/+1
| |
| * Cherry pick fix for MOBILITY-1194 from Qt Mobility.Aaron McCarthy2010-07-283-48/+93
| | | | | | | | 2f582953ecfc53f217317f58e4fc75b5b51a1126
* | Statically link to Qt based dependent librarys.Aaron McCarthy2010-07-281-2/+5
|/ | | | | | | | | | Some of the library dependencies of the ICD Bearer Management plugin use Qt. We include them in src/3rdparty and link against them statically to avoid the circular build dependency. Libraries that do not use Qt are still linked dynamically. The libraries which are statically linked are libconninet and libgq-gconf. Task-number: QTBUG-12354
* Cherry pick fix for MOBILITY-1145 from Qt Mobility.Aaron McCarthy2010-07-271-1/+3
| | | | f17d8a5dbef076046ff504fecb1fd445c9b785ac
* Cherry pick fix for MOBILITY-1144 from Qt Mobility.Aaron McCarthy2010-07-271-2/+15
| | | | 426ff79e49d4abb659167541bb67846443b9707e
* Order network configurations in service networks in priority order.Aaron McCarthy2010-07-231-37/+46
| | | | | | | | It is useful to know the priority order of the sub configurations of a service network. Task-number: QTBUG-11678 RevBy: juhvu <qt-info@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-07-221-0/+2
|\ | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added silent behavior to the most important Symbian build steps. Fixed compiling with symbian/linux-armcc and configure -silent option Removed some warnings from armcc that are unneeded. Made the makefile build system use QMAKE_CFLAGS.xxx properly. Automatically disabled unsupported modules for certain compilers. Fixed an incorrect profile inclusion.
| * Added silent behavior to the most important Symbian build steps.axis2010-07-221-0/+2
| | | | | | | | | | Task: QTBUG-11927 RevBy: Trust me
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-07-211-2/+6
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Revert "Compile fix for MSVC" Compile fix for MSVC Improve QAccessible for QAccessibleTabBar Improve QAccessible for QTabBar fix the export macros for the QtDBus module rebuild configure.exe make "configure -qt-gif" work again on Windows Fix a typo in harfbuzz thai line breaking. Ensure that font sizes that are > 0 and < 1 are still respected
| * Improve QAccessible for QAccessibleTabBarSebastian Sauer2010-07-211-2/+6
| | | | | | | | | | | | | | On QAccessibleTabBar::text return text of the current tab for the case the QTabBar itself is asked for it's Name. Merge-request: 2405 Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-07-211-2/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Use aligned load for the blending of RGB32 over RGB32 tst_moc: workaround gcc bug. Some more change to the changelog Fix compilation with QT_NO_GRAPHICSVIEW Updates changes-4.7.0 Fixes the Oracle nchar bug when NLS_CHARSET is different with NLS_NCHAR_CHARSET. Add a missing file in the config.test for SSE 4.2 Remove the masking when computing qAlpha() Add support for more vector instructions on x86 Workaround gcc bug, disable test with old version of gcc Do not crash due to a infinite recursion when using voiceover on MacOS doc: Fix qdoc errors for text related files QGraphicsItem: Animation leaves drawing artifacts when clipping is used. moc: Slot with complex template default value does not compile
| * \ Merge branch 'QTBUG-6843' into 4.7Jan-Arve Sæther2010-07-201-2/+2
| |\ \ | | |/ | |/|
| | * Do not crash due to a infinite recursion when using voiceover on MacOSJan-Arve Sæther2010-07-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The reason for the infinite recursion was that QAccessibleTitleBar::object() returned the titlebar's dockwidget. This could lead to a problem when the AT client tried to traverse the accessibility hierarchy: As a response to QAXChildrenAttribute (retrieve children) on a dock widget node, it would register it's children in the hierarchy manager. In this case, the object registered for the titlebar interface was the QDockWidget. In order to do further traversal, the bridge could call queryAccessibleInterface on the list of retrieved children to get the QAccessibleInterface for those objects, however, that would return the QAccessibleDockWidget interface that we just had traversed,.... Task-number: QTBUG-6843 Reviewed-by: Carlos Manuel Duclos Vergara
* | | Merge branch 'raptorConfigurePatches' into 4.7-s60axis2010-07-212-1/+39
|\ \ \ | |/ / |/| | | | | | | | | | | Conflicts: configure src/sql/drivers/drivers.pri
| * | Fixed automatic sqlite extraction on Symbian makefile build system.axis2010-07-212-1/+39
| |/ | | | | | | | | | | | | | | Since we cannot extract to the epocroot (it is considered R/O), we extract the header and the dso to the temporary build directories and include them from there. RevBy: Trust me
* | Do not crash if addrinfo signal does not contain ip address information.Jukka Rissanen2010-07-161-0/+3
| | | | | | | | | | Fixes: NB#176643 - Segmentation fault occurs while using networking Reviewed-by: Adrian Constantin
* | Merge branch '4.7' of ../oslo-staging-1 into 4.7Lorn Potter2010-07-1431-3915/+85
|\ \
| * \ Fixing merge conflicts.Martin Smith2010-07-132-17/+21
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch '4.7-upstream' into 4.7 Conflicts: doc/src/declarative/advtutorial.qdoc src/declarative/graphicsitems/qdeclarativeloader.cpp src/declarative/graphicsitems/qdeclarativetextedit.cpp src/declarative/qml/qdeclarativeengine.cpp src/declarative/util/qdeclarativexmllistmodel.cpp
| | * Quiet qmake warnings during configure.Aaron McCarthy2010-07-082-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | Configure runs qmake on all .pro files in the source tree. Wrapping symbian only code in symbian scopes prevents warnings about unset EPOCROOT on other platforms. Task-number: QTBUG-11996
| * | Consolidate sql driver configuration redundancyMark Brand2010-07-079-102/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously sql driver recipes each appeared in both the plugin pro file and src/sql/drivers/drivers.pri for building into QtSql. Split driver recipes into shared pri files. Also split bundled 3rd party sqlite code recipe into a shared pri. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * | Fixed whitespace formattingMark Brand2010-07-079-9/+9
| |/ | | | | | | | | Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix build failure with cs2009q3 toolchain.Aaron McCarthy2010-07-052-7/+7
| | | | | | | | Use Qt typedef for unsigned 32-bit integers.
| * make image handler includes privateOswald Buddenhagen2010-07-044-4/+4
| | | | | | | | | | now that they live in gui/image/ instead of plugins/imageformats/, the handlers need to get the usual _p suffix.
| * Fix incomplete support for built-in jpeg, mng, tiff and gif handlersMark Brand2010-07-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, although the configure shell script could configure built-in support for these image formats, the .pr[io] files would nevertheless build them as plugins. Support was also missing from qimagereader and qimagewriter. This has now been added. Configure.exe, while clearly intended to support this too, needed a few minor fixes. For example, the usage of values "qt" and "yes" was inconsistent. For both configure tools, the explanation of the *non*-related options has been clarified, i.e: -no-libjpeg -qt-libjpeg -system-libjpeg These options have nothing to do with the plugin/built-in distinction. There are (still) no configure options for specifying "plugin" or "built-in" for these image formats. Quite reasonably, "plugin" is selected for shared Qt and "built-in" is selected for static Qt. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Split image handler plugin project filesMark Brand2010-07-0212-3759/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | One pri for each handler, e.g. src/gui/image/qjpeghandler.pri. One pri for each 3rd party package, e.g src/3rdparty/libjpeg.pri. One shared pri for zlib dependency of 3rd party packages. This was really about image handler plugins, but PNG got the same treatment for consistency's sake. Also, moved image handler source files from plugins to src/gui/image so they are with the other image handlers. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * No explicit link to zlib/jpeg for system mng/tiffMark Brand2010-07-022-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For "system" mng or tiff, the shared library mechanism takes care of loading zlib. For exotic cases like static system mng/tiff/zlib, one should use configure's -l option. Trying to cover such cases in project files leads to clutter which is at best harmless for other cases. Png already had this arrangement. The same principle applies to jpeg which is a potential dependency of tiff and mng. However, bundled tiff and mng are built without jpeg. Shared system jpeg is loaded automatically if needed. Static system jpeg can be handled with configure's -l option. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix compiler warning.Aaron McCarthy2010-07-021-1/+1
| |
| * Abort if connection to DBus cannot be established.Aaron McCarthy2010-07-021-0/+5
| | | | | | | | | | | | | | Fixes network access issue when running Qt applications in scratchbox environment. Task-number: QT-3528
| * Reformat whitespace according to coding styleMark Brand2010-06-303-77/+77
| | | | | | | | | | | | | | | | Mostly indentation affected, but also standardized spaces adjacent to () in configureapp.cpp. Merge-request: 715 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| * Fix build failure on Symbian^3.Aaron McCarthy2010-06-301-2/+3
| |
* | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-301-22/+33
|\ \ | |/
| * When application calls QNetworkSession::close() or QNetworkSession::stop(), ↵Jukka Rissanen2010-06-291-22/+33
| | | | | | | | | | | | make sure the disconnected signal is sent even if the actual network connection is not closed. Fixes: NB#175064 - QNetworkSession signals wrong state after calling stop()
* | make sure ap's are removed when the device is removedLorn Potter2010-06-303-28/+74
| |
* | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-281-126/+124
|\ \ | |/
| * Build fix for src/plugins/phonon/mmfGareth Stockwell2010-06-281-93/+121
| | | | | | | | 447f2b41 broke src/plugins/phonon/mmf/mmf.pro
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-06-271-30/+0
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (31 commits) Make symbian/unix shadow builds work again. Change the files to camelcase as avkon now does that Update EABI and WINSCW DEF files for Symbian Fix linking on arm with def files Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to 4b88f595ab62b7c5f703a286c4f5f13f8784a936 Fixed incorrect parsing of TARGET.EPOCHEAPSIZE. Fixed make runonphone that looked for the package in the wrong place. Fixed several problems with the postlinker for Symbian (elf2e32). Don't crash when cleaning the uninitialized fontdatabase (Symbian) Revert "Fixing the race condition in event dispatcher implementation on" Revert "Fixing race condition in qeventdispatcher_symbian.cpp code path" Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to a80fd59e3b3b18116803a14e6369345933994236 Fixed memory restrictions not being passed on to elf2e32. Allow TLW translucency on Symbian without Qt::FramelessWindowHint Updated UIDs for spectrum demo Ensure that compiling with the no debug/warning output defines works Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28 Clean up HB_Anchor's DeviceTables on failure when loading format 3 Make sure ValueRecord's DeviceTables are cleaned up on failure ...
| | * Merge branch '4.6-s60' into 4.7-s60axis2010-06-241-30/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/webkit/VERSION src/3rdparty/webkit/WebCore/ChangeLog src/plugins/phonon/mmf/mmf.pro
| | | * Prevent warnings about EPOCROOT coming out when not on symbianAndy Shaw2010-06-211-125/+125
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the pro file is processed with qmake and it EPOCROOT is not set then it will give out warnings. This is really only an issue when configure on X11 is ran because this runs qmake on all pro files anyway. So rather than confusing users about what this warning message means on a non Symbian platform, we just ensure that the pro file specifically only does anything useful on Symbian platforms. Reviewed-by: Gareth Stockwell
| | | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-06-151-1/+1
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Bump version number after 4.6.3 release.
| | | | * Bump version number after 4.6.3 release.Jason McDonald2010-06-151-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
* | | | | Merge branch '4.7' of git://gitorious.org/qt/qt into 4.7Lorn Potter2010-06-277-241/+497
|\ \ \ \ \ | |/ / / /
| * | | | Avoid memory allocation when converting from Gbk to unicode.Benjamin Poulain2010-06-251-6/+15
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is the equivalent of 19e1b32bdeeeb5c7865038cab97b40dbac0e6c42 and 987458462994497f764baf253baca0faabdb63cc but for the Gbk case. It improve performance by avoiding the constructor of QChar and by allocating the memory once instead of doing it for each character. This also fix QTBUG-11704. Reviewed-by: Andreas Kling
| * | | Abort open early if network session is in the process of openning.Aaron McCarthy2010-06-242-5/+20
| | | |
generated by cgit v0.12 at 2025-01-03 23:22:53 (GMT)