summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-086-7/+30
|\ | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix preprocessor directive. Fix compiling issue on Lion. Add support for Mac OS X 10.7 "Lion". Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38d Don't treat Objective-C property references as l-values
| * Fix preprocessor directive.Fabien Freling2011-03-041-1/+1
| | | | | | | | | | | | Reviewed-by: Andreas Kling Reviewed-by: Tor Arne Vestbø Reviewed-by: Morten Sørvig
| * Fix compiling issue on Lion.Fabien Freling2011-03-042-0/+14
| | | | | | | | | | | | | | On Lion, we have to declare the dragging methods before implementing them. Reviewed-by: Prasanth Ullattil
| * Add support for Mac OS X 10.7 "Lion".Fabien Freling2011-03-042-2/+9
| | | | | | | | Reviewed-by: Prasanth Ullattil
| * Unbreak build on Mac OS X 10.5 after b0b80d9e8d11c38dTor Arne Vestbø2011-03-041-1/+1
| | | | | | | | Reviewed-by: Fabien Freling
| * Don't treat Objective-C property references as l-valuesTor Arne Vestbø2011-03-021-4/+6
| | | | | | | | | | | | | | Fixes Clang compile issue as Clang is stricter than gcc on this. See http://llvm.org/bugs/show_bug.cgi?id=8770 Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-03-072-63/+64
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Fix a typo in an EXPECT_FAIL dataset name. Fix a test naming issue. Improve Q_GLOBAL_STATIC macors. Tests build fix. Refactor qscriptjstestsuite to make it more maintainable Refactor qscriptv8testsuite to make it more maintainable
| * | Improve Q_GLOBAL_STATIC macors.Jedrzej Nowacki2011-03-072-63/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The patch fix small issues inside the macros. New features: - Class friendly. The macro can be used inside class declaration to define a static method instead of function. - Encapsulation. Smaller default namespace pollution by hiding all this_ variables inside a function. Reviewed-by: Joao
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-03-0435-590/+1450
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: (40 commits) Readded a ';;' that was removed by mistake. Fixed mkspec detection for Symbian. Removed javascript-jit from default symbian-gcce build. QAbstractSocket: Check for socket state on Unbuffered reads Corrected a mismerge in GCCE link parameters. QAbstractSocket: Check for engine validity on Unbuffered reads tst_qnetworkreply: fix the MiniHttpServer. tst_qnetworkProxyFactory: fix debug output. Fixed incorrect referral to an include file. tst_qnetworkreply: getErrors() only ignore warning for the specific test Check engine existence before increasing reference count Fixed library casing. Fix Q_INVOKABLE declared after Q_PROPERTY tst_qnetworkreply: small improvements QNAM: Add a warning for misuse of the file backend. Keep reference count for cached font engines in QTextEngine QNAM HTTP: Be more strict with HTTP channel state tst_qnetworkreply: Add a test for broken gzip encoding QNAM HTTP: Add qWarning() for double-finished() bug fix documentation typos in isLowSurrogate and requiresSurrogates ...
| * \ \ Merge remote branch 'earth/master' into masterJoão Abecasis2011-02-2835-590/+1450
| |\ \ \
| | * | | QAbstractSocket: Check for socket state on Unbuffered readsMarkus Goetz2011-02-251-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the Unbuffered QTcpSocket mode the read() call could go to the socket engine even though we are not connected right now. Reviewed-by: Peter Hartmann
| | * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into earth-masteraxis2011-02-24310-2507/+9095
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/network/access/qnetworkreplyimpl.cpp tests/auto/moc/tst_moc.cpp
| | * | | | QAbstractSocket: Check for engine validity on Unbuffered readsMarkus Goetz2011-02-241-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not call read() if the socket engine is already invalid. This could happen when using the Unbuffered QTcpSocket mode which is currently only used inside QNetworkAccessManager. Reviewed-by: Shane Kearns
| | * | | | Check engine existence before increasing reference countJiang Jiang2011-02-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TrustMe
| | * | | | Fixed library casing.axis2011-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | RevBy: Trust me
| | * | | | Fix Q_INVOKABLE declared after Q_PROPERTYOlivier Goffart2011-02-241-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc was starting to parse function one token too late. This was usually unnoticed because there is usually a semi colon, or a colon, or some other token that are ignored. But in this case, a Q_PROPERTY is not ignored, the parsing would fail. Reviewed-by: brad
| | * | | | QNAM: Add a warning for misuse of the file backend.Martin Petersson2011-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17731 Reviewed-by: Markus Goetz
| | * | | | Keep reference count for cached font engines in QTextEngineJiang Jiang2011-02-241-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | So that if these font engines are deallocated elsewhere (by QFontCache for instance), we can still access them in QTextEngine. Task-number: QTBUG-17603 Reviewed-by: Eskil
| | * | | | QNAM HTTP: Be more strict with HTTP channel stateMarkus Goetz2011-02-242-11/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a case where finished() and finishedWithError() were both emitted for a single reply. Reviewed-by: Peter Hartmann
| | * | | | QNAM HTTP: Add qWarning() for double-finished() bugMarkus Goetz2011-02-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Proper bugfix will come with later commit.
| | * | | | fix documentation typos in isLowSurrogate and requiresSurrogatesJeremy Katz2011-02-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Trust Me
| | * | | | SSL backend: loat root certificates on demand on Unix (excluding Mac)Peter Hartmann2011-02-235-14/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, on initializing the first QSslSocket, we read all root certificates into memory (~ 150 files). Now, we tell OpenSSL where to find the root certificates, so that they can be loaded on demand (if supported, see 'man c_rehash' for details). Reviewed-by: Markus Goetz Task-number: QTBUG-14016
| | * | | | tst_qnetworkreply: Fix httpProxyCommands() on Windows.Martin Petersson2011-02-221-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * | | | QNAM File: Switch back to use QFileMarkus Goetz2011-02-212-36/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using file engines directly does not anymore have the benefit intended. We now use QFile again as we did before. Reviewed-by: Martin Petersson
| | * | | | QNAM HTTP: Define SynchronousRequestAttribute instead of enum hackMarkus Goetz2011-02-213-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Peter Hartmann
| | * | | | QNAM HTTP: Fix compilation 2Markus Goetz2011-02-211-2/+8
| | | | | |
| | * | | | QNAM HTTP: Fix compilationMarkus Goetz2011-02-211-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Olivier Goffart
| | * | | | QNAM: Threaded HTTP implementationMarkus Goetz2011-02-2117-507/+1272
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | HTTP requests are run in a separate thread now. This required some big changes in the QNetworkAccessHttpBackend. There is a new class QHttpThreadDelegate which lives in the HTTP thread and is the communication layer between HTTP code and QNetworkAccessHttpBackend. Communication is done via signals/slots. The synchronous HTTP code (private QtWebKit API) also had to be completely re-worked and uses its own thread now. Reviewed-by: Peter Hartmann Task-number: QTBUG-14162
| | * | | | Avoid warning when seting a window iconOlivier Goffart2011-02-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QPixmap::handle(): Pixmap is not an X11 class pixmap The problem was that the QBitmap constructor would re-create a copy of the bitmap in a image (because we are using the raster graphicssystem) Reviewed-by: sroedal
| | * | | | QNativeSocketEngine: Check for WSAEADDRNOTAVAIL on Windows.Martin Petersson2011-02-181-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the tst_qnetworkreply getFromUnreachableIp() test on Windows. Reviewed-by: Markus Goetz
| | * | | | QAbstractSocket: compile without QT3SupportMartin Petersson2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * | | | QNativeSocketEngine: Only do SIO_UDP_CONNRESET for UDP socketsMartin Petersson2011-02-181-9/+11
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Markus Goetz
| | * | | | QAbstractSocket: Do not always change notifier on setReadBufferSizeMartin Petersson2011-02-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the connecting process is in progress we should not enable the read notifier. This will be done when we are connected. This fixes the tst_qnetworkreply proxyChange() on Windows. Reviewed-by: Markus Goetz
| | * | | | Remove useless processEventOlivier Goffart2011-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17469 Reviewed-by: Joao
* | | | | | Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0327-168/+1407
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/openvg/qvg_symbian.cpp src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * \ \ \ \ \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2011-03-031-3/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Use the generic QVoltileImage implementation on S60 3.1 and 3.2.
| | * | | | | | Use the generic QVoltileImage implementation on S60 3.1 and 3.2.Laszlo Agocs2011-03-031-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BeginDataAccess() and EndDataAccess() is only available from S60 5.0 and QVolatileImage is not used on such platforms anyway. Reviewed-by: Jani Hautakangas
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-031-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Position the TextInput cursor correctly after IM text is commited.
| | * | | | | | | Position the TextInput cursor correctly after IM text is commited.Andrew den Exter2011-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If text is removed before the cursor position decrement not increment the cursor by the by the difference. Change-Id: If9558c88157cc884652af7aaf9bd5fad0ea822d8 Task-number: QTBUG-17863 Reviewed-by: Martin Jones
| * | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-03-026-19/+105
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Make the TextInput cursorRectangle relative to the item. Don't assert if font engine creates new glyphs Doc: remove experimental GestureArea from contents and add PinchArea Add QML file for TextEdit positionAt test. Don't return positions within preedit text from positionAt(). Add an is input method composing property to TextEdit and TextInput.
| | * | | | | | Make the TextInput cursorRectangle relative to the item.Andrew den Exter2011-03-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The rectangle returned was relative to the text and didn't adjust for horizontal scrolling. Change-Id: I09227d73bbd8b32d830744d5911d785246051c2f Reviewed-by: Martin Jones
| | * | | | | | Don't assert if font engine creates new glyphsAaron Kennedy2011-03-021-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id18f58822f990788b511cbce02f8e4cf7d787c21 Task-number: QTBUG-14734
| | * | | | | | Doc: remove experimental GestureArea from contents and add PinchAreaMartin Jones2011-03-021-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5eb6d2826f673c7067fde1447f25d3fc97b5aa5e Reviewed-by: Bea Lam
| | * | | | | | Don't return positions within preedit text from positionAt().Andrew den Exter2011-03-013-6/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preedit text isn't visible outside the inner workings of the Text elements so any position returned that is greater than the current cursor position is invalid. Change-Id: I433fc635dcd6d087bde13fc47a1a92e4222a3b2c Task-number: QTBUG-17834 Reviewed-by: Martin Jones
| | * | | | | | Add an is input method composing property to TextEdit and TextInput.Andrew den Exter2011-03-014-8/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows input handling to be disabled or changed while an input method is active. This might be used to allow mouse events through to the element or in conjunction with the cursor position to determine whether a click occurred on the preedit text. Change-Id: I35e148691920579c1d7c6f27b7e805d9551beadd Task-number: QTBUG-17835 Reviewed-by: Martin Jones
| * | | | | | | Have QVolatileImage backed by a bitmap in all cases.Laszlo Agocs2011-03-011-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The behavior now matches the raster (s60) pixmap: A bitmap is created immediately when constructing from a QImage. This is needed to reduce the heap usage of applications (by getting rid of the QImage as early as possible). Reviewed-by: Jani Hautakangas
| * | | | | | | Removing extra tabs from def file.Laszlo Agocs2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7Laszlo Agocs2011-03-01273-2557/+9088
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/eabi/QtGuiu.def
| * | | | | | | | Fix style issue in qvgimagepool.cppJani Hautakangas2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: TRUSTME
| * | | | | | | | Add internal function for releasing cached GPU resources.Jani Hautakangas2011-03-017-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17849 Reviewed-by: Samuel Rødal
generated by cgit v0.12 at 2025-02-07 05:10:45 (GMT)