summaryrefslogtreecommitdiffstats
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* Mutex is already locked when private member function is called.Aaron McCarthy2010-08-161-3/+2
| | | | | | Conflicts: src/plugins/bearer/icd/qicdengine.cpp
* Fixed a typo when doing a lock.Aaron McCarthy2010-08-161-2/+1
| | | | | | Conflicts: src/plugins/bearer/icd/qicdengine.cpp
* The QNetworkConfigurationManager did not get the online status correctly ↵Tomasz Bursztyka2010-08-162-28/+71
| | | | | | | | | even when there was an active connection. Fixes: NB#181984 - QNetworkConfigurationManager reports offline even when connected. Signed-off-by: Tomasz Bursztyka <tomasz.bursztyka@nokia.com> Signed-off-by: Jukka Rissanen <jukka.rissanen@nokia.com>
* Release lock before calling into icd engine.Aaron McCarthy2010-08-161-5/+6
|
* Do not change the session configuration state because of changesJukka Rissanen2010-08-161-2/+0
| | | | | | | in QNetworkConfigurationManager. The session state is only changed according to status messages sent by icd. Fixes: NB#182148 - QNetworkSession changes to disconnected state immediately after opening session
* Clean up rasterfallback mechanism in DirectFBDonald Carr2010-08-121-103/+84
| | | | | | | | | | | | | | Being able to debug which paint operations are slow with Qt/DirectFB is currently only possible in debug builds (which defeats the purpose somewhat) or by frequent recompilation (with different defines). This patch cleans up the mechanism somewhat and makes it available in release builds as well. The overhead is a single int comparison so it really isn't a performance issue to have this code in place at all times. Reviewed-by: Anders Bakken <agbakken@gmail.com>
* dont leak theseLorn Potter2010-08-051-0/+1
|
* Fix compilation with QT_NO_DBUSTasuku Suzuki2010-08-042-0/+12
| | | | | Merge-request: 2441 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge remote branch 'staging/4.7' into qtbug-12631Aaron McCarthy2010-08-043-23/+148
|\
| * new icons for cell and bt networks.Lorn Potter2010-08-031-20/+33
| |
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Lorn Potter2010-08-0321-342/+207
| |\ | | | | | | | | | | | | Conflicts: src/plugins/bearer/connman/qconnmanengine.cpp
| * | add convience methods for getting ethernet service details.Lorn Potter2010-07-302-4/+110
| | |
| * | fix spellingLorn Potter2010-07-301-1/+1
| | |
| * | fix crashLorn Potter2010-07-301-1/+1
| | |
| * | try harder to get cell nameLorn Potter2010-07-291-2/+8
| | |
* | | Fix deadlocks in ICD and NetworkManager engines.Aaron McCarthy2010-08-044-46/+41
| |/ |/| | | | | | | | | Ensure that locks are not held when signals are emitted. Task-number: QTBUG-12631
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-08-0318-334/+185
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (23 commits) Removed the unfinished sentence. Fix for QTBUG-10173. Fixed the addressbook tutorial and some spelling mistakes. Fix for QTBUG-7071 and QTBUG-10173 Unbreak QImage::rgbSwapped() for many image formats. Crash when pressing the '£' key on Belgian Keyboard layout (Cocoa) Doc: Adding content to installation guide and fixing printing bugs Cocoa: Active QDockWidget does not stay on top of inactive QDockWidget Made changes to qdoc to allow it to accept a "style level" flag Doc: Correcting bugs in the CSS Return 'Unknown' bearer type name for unknown bearer type. Update def files. Doc: updating index page, x platform and platform spec. Removing redundant style files Added notice that some links are online documents. Modified qtdemo so error does not appear when there is no demo/example description availablei (QTBUG-12522). There is already output when building Qt that a description is missing -- the user does not need to witness an error about ensuring the documentation has been built just because a description has not been contributed. Fix Japanese characters not displayed in webkit on Mac Cocoa 64 (Regression) configure: don't symlink the mkspecs/features directory Doc: adding changes to getting started and fixing redirection links doc: Fixed many qdoc errors. Fixed potential infinite loop in QFileSystemWatcher on Mac. qdoc: Removed exclusion of declarative directories in qt-api-only.qdocconf Fixed comment about all enums being accessible in QML. Fix for QTBUG-12527. ...
| * | 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
* | Fixed additional case differences between Gnupoc and Symbian^3.axis2010-07-304-7/+21
|/ | | | RevBy: Trust me
* 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>
generated by cgit v0.12 at 2025-01-15 21:15:20 (GMT)