summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Doc update regarding threaded painting with QPainter in the QGL module.Trond Kjernåsen2010-09-093-9/+98
| | | | Reviewed-by: Gunnar
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-081-0/+17
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Add average frame timing to QDeclarativeView, ifdef'ed out.
| * Add average frame timing to QDeclarativeView, ifdef'ed out.Gunnar Sletta2010-09-081-0/+17
| | | | | | | | Reviewed-by: Aaron Kennedy
* | Designer/uic: Start on support for QIcon::fromTheme().Friedemann Kleint2010-09-084-21/+89
|/ | | | | | | | | | | | | | | | Schemas: Add "theme" attribute to <iconset> element of the UI format. uic: Extend it to generate the code for icons with themes and/or resource paths, add auto-test for it. Designer: Add 'theme'-member to PropertySheetIconValue + convenience functions including subproperty mask handling and simplify the existing code. Add new class IconThemeEditor to be used in action editor dialog and property editor. Theme names can now be specified in the action editor dialog. Reviewed-by: Jarek Kobus <jaroslaw.kobus@nokia.com> Task-number: QTBUG-7777
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-071-4/+0
|\ | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Do not > /dev/null gdb output. Remove unused local variable in myanmar shaper of harfbuzz
| * Remove unused local variable in myanmar shaper of harfbuzzJiang Jiang2010-09-071-4/+0
| | | | | | | | Reviewed-by: Lars Knoll
* | QDataStream doesn't check return values from QIODevice::writeCarlos Manuel Duclos Vergara2010-09-071-0/+12
|/ | | | | | | | | | | QDataStream does not check values from QIODevice::write and QIODevice::read since it cannot decide what to do in case of errors or less data written or read. The fix for this is to fix the documentation for QIODevice::writeData and QIODevice::readData to make sure implementations write and read all the requested data. Task-number: QTBUG-13108 Reviewed-by: David Boddie
* Enable QLibrary debugging via QT_DEBUG_PLUGINSArvid Ephraim Picciani2010-09-061-7/+5
| | | | Reviewed-by: janarve
* Allow QGLWidgets to draw them selves under -graphicssystem raster again...Gunnar Sletta2010-09-061-2/+5
| | | | Reviewed-by: Fabien Freling
* C++0x: being able to create a list with the {,,,} notationOlivier Goffart2010-09-032-1/+30
| | | | Reviewed-by: Joao
* C++0x move operatorsOlivier Goffart2010-09-0330-5/+137
| | | | | | | This makes assignement faster from temporaries, as the operator is fully inline, and doesn't do any atomic operations. Reviewed-by: joao
* Add define for c++0x initilizer listsOlivier Goffart2010-09-031-0/+1
| | | | Reviewed-by: Joao
* Add some constants for C++0x featuresThiago Macieira2010-09-031-0/+19
| | | | | Reviewed-by: Olivier Goffart Reviewed-by: Joao
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-09-022-0/+37
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: Added a QDebug operator for QSymbianEvent.
| * Added a QDebug operator for QSymbianEvent.axis2010-09-022-0/+37
| |
* | Enable the width-for-height codepath and add autotest for WFH.Jan-Arve Sæther2010-09-021-5/+0
| | | | | | | | Task-number: Side-effect of QTBUG-3570
* | Use hasHeightForWidth() and hasWidthForHeight() instead of sizePolicy()Jan-Arve Sæther2010-09-021-14/+24
| | | | | | | | | | | | | | | | | | | | hasHeightForWidth() already does the same check (if the widget has a layout, use the layouts size policy instead of the widgets'). Also generalized the implementation so that it now supports width-for-height. Also fixed a bug where we expected the other dimension to decrease when the first dimension increased. This is not always the case.
* | Add hasWidthForHeight in order to support WFH in QGraphicsLayout.Jan-Arve Sæther2010-09-022-9/+36
| | | | | | | | | | Task-number: Consequence of QT-3570 Reviewed-by: Paul
* | Compilation on S60 of external projects depending on private headersEskil Abrahamsen Blomfeldt2010-09-022-2/+5
|/ | | | | | | | | Minor change to allow external projects to include qdeclarativeanimation_p_p.h and still compile on Symbian. The inlined constructor with a templated object that contains a call to an non-exported function (execute()) caused a linker error. Reviewed-by: bnilsen
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-09-0116-88/+487
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Optimize plugin loading on ELF platforms Fix compiler warning in qtextformat.h Add gdb-index section to debug binaries. Clean up and clarify Mac font engine code Implemented suffix and prefix strings for the numbering in ordered lists as supported by ODF. Works also with HTML import/export by using Qt CSS properties extensions.
| * Optimize plugin loading on ELF platformsArvid Ephraim Picciani2010-09-014-6/+365
| | | | | | | | | | | | | | This is equal to 3c2a43f91e0225bde8d6e6d6076dfe2cddbc2f8e except the alignment checks have been relaxed. Reviewed-by: janarve
| * Fix compiler warning in qtextformat.hEskil Abrahamsen Blomfeldt2010-09-011-4/+4
| | | | | | | | | | | | | | | | When compiling with -Wshadow, function arguments that shadow a class member generate a warning. Change the name in the implementation of the new functions to avoid this warning. Reviewed-by: Samuel
| * Clean up and clarify Mac font engine codeJiang Jiang2010-08-312-74/+2
| | | | | | | | Reviewed-by: Eskil
| * Implemented suffix and prefix strings for the numbering in ordered lists as ↵Nils Jeisecke2010-08-3110-8/+120
| | | | | | | | | | | | | | supported by ODF. Works also with HTML import/export by using Qt CSS properties extensions. Merge-request: 1642 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* | Don't ignore interfaces that cannot multicast when querying the mcast ifaceBradley T. Hughes2010-09-011-2/+0
| | | | | | | | | | If getsockopt() returns an address for an interface that doesn't advertise that it can multicast, don't second guess the OS, just return the iface.
* | Fix IPv6 support on WindowsBradley T. Hughes2010-09-011-11/+62
| | | | | | | | | | | | | | | | | | We need to make sure that we use the right setsockopt level and option for the multicast TTL and loopback options. Like on UNIX, we need to use IPPROTO_IPV6 level when joining and leaving a group. Also, we cannot bind to a multicast address on Windows (but it is possible on UNIX). work around this by binding to the Any/AnyIPv6 addresses if a multicast address is passed to bind.
* | Fix IPv6 multicast on UNIXBradley T. Hughes2010-09-011-3/+10
| | | | | | | | | | The setsockopt() to join/leave a group should change level depending on the type of socket/address being used (and not always use IPPROTO_IP).
* | Add QUdpSocket::setMulticastInterface() and ::multicastInterface()Bradley T. Hughes2010-09-0111-11/+269
| | | | | | | | | | | | | | | | | | This API allows the programmer to set/query the outgoing interface for multicast packets for the socket. Both functions need an initialized socket to work. Autotest updated to test setting each interface in the system as the multicast interface for IPv4 and IPv6 UDP sockets.
* | Add multicastsender and multicastreceiver examplesBradley T. Hughes2010-09-011-3/+5
| | | | | | | | | | | | These are clones of the broadcastsender and broadcastreceiver examples, modified to use the multicast API. I've made sure that the examples are linked in the appropriate places as well.
* | Update QUdpSocket's overview docs to include multicast referencesBradley T. Hughes2010-09-011-0/+6
| | | | | | | | | | | | The API is very small, joinMulticastGroup(), leaveMulticastGroup(), and the two QAbstractSocket socket options, MulticastTtlOption and MulticastLoopbackOption.
* | Initial documentation for multicast socket options and APIBradley T. Hughes2010-09-012-4/+36
| |
* | Rename doMulticast() to multicastMembershipHelper()Bradley T. Hughes2010-09-012-34/+34
| | | | | | | | This is a simple rename done for clarity.
* | Don't use WSAIoctl() to get/set the multicast socket optionsBradley T. Hughes2010-09-011-26/+12
| | | | | | | | | | According to the MSDN docs, we can just use setsockopt() and getsockopt() like we do on UNIX, even if we are using Winsock2.
* | Add MulticastTtlOption and MulticastLoopbackOption to QAbstractSocketBradley T. Hughes2010-09-017-22/+54
| | | | | | | | | | | | | | | | | | | | | | | | These options only make sense and work in QUdpSocket when using multicasting. Previously, the loopback was set when joining a multicast group, but the loopback flag is not a per-group flag, it's per socket, hence this change. The ability to set the multicast TTL is needed as well, so this is added as a socket option as well. Autotest updated to test both.
* | Implement UDP multicast on WindowsBradley T. Hughes2010-09-016-16/+121
| | | | | | | | | | | | | | | | | | | | The code is very similar to the UNIX version, but not identical. It appears the Microsoft compiler does not like the "interface" variable name, so they have been renamed. The autotest had a bug in it that I failed to notice before. The sender was not sending to the multicast group, it was sending to the local address of the receiver (which fails on Windows).
* | Remove support for single-source multi-castBradley T. Hughes2010-09-0110-80/+25
| | | | | | | | | | It's not supported everywhere, so remove it for now until the need to re-add it arises.
* | Make ASM work on systems without SSM supportBradley T. Hughes2010-09-011-1/+1
| | | | | | | | | | | | | | QHostAddress::Null and QHostAddress::Any are not the same, and we use QHostAddress::Any to signify that we want any-source behavior in QUdpSocket::joinMulticastGroup(). Any means we should skip the single- support SSM, like Mac OS X).
* | Set multicast errors correctlyBradley T. Hughes2010-09-011-2/+4
| | | | | | | | | | | | | | | | If the system does not support SSM, but the source address is specified, the error is unsupported socket operation, not unsupported protocol. if setsockopt() returns an error we don't know about, set the error code/string to unknown error
* | Don't crash when trying to join/leave a group with not boundBradley T. Hughes2010-09-011-0/+2
| | | | | | | | | | d->socketEngine will be zero, which crashes. avoid this by returning if the socket is not in the BoundState
* | Compile on systems without IP_ADD_SOURCE_MEMBERSHIP supportBradley T. Hughes2010-09-011-0/+18
| | | | | | | | | | If a system does not support SSM (e.g. Mac OS X does not), then requesting a specific sender results in a socket error.
* | Implement multicast for the native socket engine on UNIXBradley T. Hughes2010-09-013-0/+160
| | | | | | | | | | | | According to the Stevens book, the socket must be in the bound state to be able to join the group, so we check for the same condition. We support ASM and SSM (for IPv4). Windows implementation TBD.
* | Implementation of multicast API for the HTTP and SOCKS5 enginesBradley T. Hughes2010-09-014-0/+50
| | | | | | | | | | We don't support multicast via proxy, so these function just return false.
* | Implement QUdpSocket::joinMulticastGroup() and leaveMulticastGroup()Bradley T. Hughes2010-09-012-1/+53
| | | | | | | | | | | | This is actually just done in the socket engine, so we need to add the API for setting the loopback socket option and joining/leaving the group. Implementation for the various engines will follow.
* | Add QUdpSocket::joinMulticastGroup() and leaveMulticastGroup()Bradley T. Hughes2010-09-011-0/+18
| | | | | | | | | | Each function takes a groupAddress and optional source address, network interface, and flags.
* | Align icon positions when using TextUnderIcon for tool buttonsJens Bache-Wiig2010-09-011-3/+0
|/ | | | | | | | | The widget would explicitly ignore the TextUnderIcon flag if no text was set. This is wrong because it should be up to the style to decide such details and the end result are unaligned icons by default. Task-number: QTBUG-3715 Reviewed-by: richard
* revert 3c2a43f91e0225bde8d6e6d6076dfe2cddbc2f8eArvid Ephraim Picciani2010-08-314-365/+6
| | | | | | to pass CI again after mystical failure Reviewed-by: Olivier Goffart
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-08-3111-99/+488
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix compilation on mac. Doc update: Mention the Qt::AA_X11InitThreads application attribute. Fix incorrect include order Add missing QT_BEGIN_NAMESPACE Fix crash introduced with d34287af6fc1c7558e8ed15dbb29c0e6b58b7b00 find .rodata in qt plugins to optimize loading of plugins with no qt section fix missing include Optimize plugin loading on ELF platforms use QFile:map instead of ::mmap QAbstractItemView: optimize handling of editors for view with large numbers of editors.
| * Fix compilation on mac.Olivier Goffart2010-08-301-2/+2
| | | | | | | | Commit d34287af6fc1c forgot to update this platform dependent code.
| * Doc update: Mention the Qt::AA_X11InitThreads application attribute.Trond Kjernåsen2010-08-301-6/+10
| | | | | | | | | | You need to know this if you're going to make threaded GL apps under X11.
| * Fix incorrect include orderArvid Ephraim Picciani2010-08-302-2/+4
| | | | | | | | Reviewed-by: Olivier Goffart