summaryrefslogtreecommitdiff
path: root/src/plugins
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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()
* 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
* | | | 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
| | |
* | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-55/+37
| | | | | | | | | | | | 21abc07dc396f08c888bf3cac96b535cc296cb00
* | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-6/+29
| | | | | | | | | | | | 4713262c16cb3eba1f4beccb6962a1ae210479c0
* | | Cherry pick fix for MOBILITY-1063 from Qt Mobility.Aaron McCarthy2010-06-241-51/+18
| | | | | | | | | | | | 37ad80914f7acb8d4f3364d78e75d48cd14e8e2a
* | | Cherry pick fix for MOBILITY-965 from Qt Mobility.Aaron McCarthy2010-06-243-10/+147
| | | | | | | | | | | | 50de830ded2dcc1c6b4d8be71428d9a2bfed6ae7
* | | Cherry pick fix for MOBILITY-800 from Qt Mobility.Aaron McCarthy2010-06-242-6/+29
| | | | | | | | | | | | a05504d2a0c643c6f253527f07bcc0dba8a799b4
* | | Cherry pick fix for MOBILITY-853 from Qt Mobility.Aaron McCarthy2010-06-242-0/+71
| | | | | | | | | | | | 256e67963c4cb0fc150e6c47193e7c9b17296611
* | | Cherry pick fix for MOBILITY-1031 from Qt Mobility.Aaron McCarthy2010-06-243-22/+29
| | | | | | | | | | | | 7e8b55524bd8a00e49e11103e8c8091e1e59e612
* | | Cherry pick fix for MOBILITY-938 from Qt Mobility.Aaron McCarthy2010-06-242-54/+49
| | | | | | | | | | | | 216f4016d1b447d51630086afca179df11fd6997
* | | Cherry pick fix for QTMOBILITY-240 from Qt Mobility.Aaron McCarthy2010-06-242-62/+88
| | | | | | | | | | | | c84a6d828bcb7f66d1ac06e1a7a84c5a8ba9cec4
* | | Fix build on Symbian^3.Aaron McCarthy2010-06-231-0/+1
| | |
* | | Fix crash with large ClientCutMessagePaul Olav Tvete2010-06-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Don't try to read the text length more than once. Task-number: QTBUG-9977 Reviewed-by: Jørgen
* | | Fix crash at exit and out of bounds writePaul Olav Tvete2010-06-211-2/+2
| | | | | | | | | | | | | | | Task-number: QTBUG-11542, QTBUG-11196 Reviewed-by: Jørgen
* | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-171-2/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: doc: Added more DITA output to the XML generator Defer allocation of GIF decoding tables/stack. Make sure only started gestures can cause cancellations Updated JavaScriptCore from /home/khansen/dev/qtwebkit-qtscript-integration to javascriptcore-snapshot-16062010 ( 8b2d3443afca194f8ac50a63151dc9d19a150582 ) qmake: Fix CONFIG += exceptions_off with the MSVC project generator. Fix some kind of race condition while using remote commands. Work around ICE in Intel C++ Compiler 11.1.072 Reduce the memory consumption of QtFontStyle
| * | | Defer allocation of GIF decoding tables/stack.Andreas Kling2010-06-161-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebKit creates many image readers but will only retrieve the dimensions until the image itself is actually needed (i.e appears in the viewport.) This avoids allocating 16kB per GIF image until it's time to actually decode it. Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-1610-70/+107
|\ \ \ \ | |/ / /
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-1610-70/+107
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (62 commits) Use native locale aware string comparison on Symbian. Temporary fix for regression in QSslCertificate::fromPath() doc: Added more DITA output to the XML generator Fix symbian building of TARGET with a slash Fix a minor typo in QAbstractItemModel's documentation. QXmlSchema: allow usage of xsd:all QSslSocket: fix build for MinGW and VS 2005 Fix symbian-abld build failure with bearer plugins remove certificate bundle make QSslSocket::systemCaCertificates() use system certs Adjusted RegExp in QSslCertificate::fromPath() Fix QSystemTrayIcon::supportsMessages() on Windows Use NIM_SETVERSION to get the latest behavior Cleanup obsolete stuff doc: Added DITA XML generator Fixed a broken merge. Changed the way we detect touch screen on Windows. Fixed error deploying qsymbianbearer.qtplugin on Symbian. Revert "Attempt to fix build failure on Symbian." Attempt to fix build failure on Symbian. ...
| | * | | Fix symbian-abld build failure with bearer pluginsMiikka Heikkinen2010-06-114-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All different Symbian bearer plugins had same UID which caused duplicate extension makefiles. Assigned each dll different UID. Reviewed-by: Jason Barron
| | * | | Replaced redundant "!contains" scopes in "contains(A, B) {...} !contains(A, ↵Constantin Makshin2010-06-103-6/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | B) {...}" constructions with "else" Merge-request: 2411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Updated project files so it is now possible to use "-system-zlib" ↵Constantin Makshin2010-06-103-14/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configuration option on Windows and Symbian platforms. Improved support of "-system-jpeg" "-system-mng" "-system-png" and "-system-tiff" configuration options on Windows (thanks to Mark Brand <mabrand@mabrand.nl>) Merge-request: 2411 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| | * | | Split Symbian bearer plugin into three platform specfic pluginsAaron McCarthy2010-06-085-40/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Symbian bearer plugin has more functionality when built for newer platforms, so split the plugin into three platform specific plugins, and deploy the correct one depending on what the device supports. Written by: Miikka Heikkinen <miikka.heikkinen@digia.com>
| | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-06-071-8/+17
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: make corewlan more namespace friendly Add convenience constructor to QTextOption::Tab Make qbswap() use glibc's fast bswap_*() functions if available. Fix in Addressbook tutorial Avoid timer starvation during high posted event activity fix for using .lnk files when running app from UNC
| | | * | | make corewlan more namespace friendlyLorn Potter2010-06-071-8/+17
| | | | | |
* | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-163-10/+12
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | Conflicts: src/plugins/imageformats/gif/qgifhandler.cpp
| * | | | | Fixed QImageReader::format() inconsistency.Samuel Rødal2010-06-153-10/+12
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If state is set to ReadHeader before canRead() then setFormat("png") never gets called. We should make sure that setFormat() gets set whenever canRead() returns true. Task-number: QTBUG-2263 Reviewed-by: Kent Hansen
* | | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into qt-4.7-from-4.6Simon Hausmann2010-06-152-3/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| |
| * | | Fixed unit test failure in qimagereader.Kurt Korbatits2010-06-151-1/+1
| | | | | | | | | | | | | | | | This bug was introduced with bug fix 558089fb21e7f388f9810c51abbd9bf3872b2178
| * | | Regression Qt4.4: QMovie does not render properly some mng filesKurt Korbatits2010-06-101-1/+0
| | | | | | | | | | | | | | | | | | | | Task-number:QTBUG-2414 Reviewed-by:Dmytro Poplavskiy
View Lorry Controller Status