summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change spacing of title in offline style.Casper van Donderen2011-08-161-3/+9
| | | | Reviewed-by: Daniel Molkentin
* Add support for rawFonts loaded from data in FaceIdPierre Rossi2011-08-153-2/+28
| | | | | | | | | | | | | The problem was that with an empty filename and index of 0, all raw fonts loaded from data had the same FaceId, and we wouldn't bother to load another one after doing this once. This commit introduces a uuid in FaceId to help distinguish them in that case. Change-Id: I93655ff07a7d8856af1f854024e207c519f8ed1a Reviewed-on: http://codereview.qt.nokia.com/1882 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
* examples: fix compilation with namespaced Qt.hjk2011-08-158-6/+12
|
* Russian translation updateSergey Belyashov2011-08-124-288/+687
| | | | | Merge-request: 1303 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Update Japanese translations for Qt 4.8.Takumi ASAKI2011-08-124-468/+640
| | | | | Merge-request: 1315 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* directfb: Include directfbgl.h directlyHolger Hans Peter Freyther2011-08-121-1/+1
| | | | | | | | | | | directfb.h is included directly in all other files, include directfbgl.h without the directfb/ prefix as well. $ pkg-config --cflags directfb -D_REENTRANT -I/home/foo/install/directfb/include/directfb Merge-request: 2643 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* tests: fix QNetworkProxyFactory testCorentin Chary2011-08-121-1/+1
| | | | | | | | | QNetworkProxy takes an hostname, not an url. Signed-off-by: Corentin Chary <corentin.chary@gmail.com> Merge-request: 1319 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* don't detach until the list is going to be modifiedRitt Konstantin2011-08-121-1/+0
| | | | | | | removeAt() does detach()'ing for us Merge-request: 1285 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* optimize QList::removeAll()Ritt Konstantin2011-08-124-11/+275
| | | | | | | | | | | | | | | | | | | | | | | | | | a) don't detach until an occurrence found b) don't memmove every time an occurrence found c) truncate quickly ) well, numbers are better than words: before: RESULT : tst_QList::removeAll_primitive(): 2,617,902 CPU ticks per iteration (total: 261,790,171, iterations: 100) RESULT : tst_QList::removeAll_movable(): 2,547,540 CPU ticks per iteration (total: 254,753,960, iterations: 100) RESULT : tst_QList::removeAll_complex(): 16,852,099 CPU ticks per iteration (total: 1,685,209,906, iterations: 100) after: RESULT : tst_QList::removeAll_primitive(): 73,520 CPU ticks per iteration (total: 73,520,442, iterations: 1000) RESULT : tst_QList::removeAll_movable(): 90,422 CPU ticks per iteration (total: 90,422,464, iterations: 1000) RESULT : tst_QList::removeAll_complex(): 9,667,073 CPU ticks per iteration (total: 9,667,072,670, iterations: 1000) Merge-request: 1285 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-121-13/+15
|\ | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Always disconnect signals on aborted reply objects
| * Always disconnect signals on aborted reply objectsBea Lam2011-08-121-13/+15
| | | | | | | | | | | | | | | | reload() did not disconnect the model from an aborted reply's signals, and if it received a finished() signal from the aborted reply it crashed when trying to access the deleted d->reply. Task-number: QTBUG-20842
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-1241-179/+182
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: QmlInspector: Fix moc error QmlInspector: Fix compile for QT_NO_CURSOR QmlInspector: Remove unused toolbar JSDebugger: Only hit breakpoints in user code Prevent Binding from crashing when its target object is deleted. Cleanup QMLViewer properly when exiting via File->Quit. Fix crash when assigning a list property to transitions. Qml Debugging: only read properties that can be displayed in the debugger qmldump: Fix creation of objects from QDeclarativeTypes. Document state fast-forwarding. qmlplugindump: Update qmltypes file format documentation.
| * Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-08-1116655-1088194/+2268376
| |\
| * | QmlInspector: Fix moc errorKai Koehne2011-08-111-1/+0
| | | | | | | | | | | | | | | | | | | | | Fix regression introduced in 857c7072320339a6ff1. Change-Id: Ie08e8cd75055081976059a3af60b2c60a52260ee Reviewed-by: TrustMe
| * | QmlInspector: Fix compile for QT_NO_CURSORKai Koehne2011-08-103-0/+6
| | | | | | | | | | | | Change-Id: I0686ba006e6ab42dbd08cda6d36874d1c99009fe
| * | QmlInspector: Remove unused toolbarKai Koehne2011-08-1026-136/+2
| | | | | | | | | | | | | | | | | | This got disabled ages ago, but we never cleaned up the sources. Change-Id: I69e7e5a431e2092ef925e48f81a306a3d316d2c7
| * | JSDebugger: Only hit breakpoints in user codeKai Koehne2011-08-101-18/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check that the topmost stack entry is a user defined ScriptFunction. This avoids hitting the anonymous functions used for bindings, e.g. onClicked: Qt.quit() leads to script code (function onClicked() { Qt.quit(); }) which will be hit twice for the debugger: Once for the function call itself, then for the execution of Qt.quit(). Change-Id: Id431cacaef84172dc3474018cdf61f3dcc05cf93
| * | Prevent Binding from crashing when its target object is deleted.Michael Brasser2011-08-033-1/+43
| | | | | | | | | | | | | | | | | | Change-Id: Ic83cfcaeccf6639976864bb2f38f5bcff16e2b11 Task-number: QTBUG-20692 Reviewed-by: Martin Jones
| * | Cleanup QMLViewer properly when exiting via File->Quit.Michael Brasser2011-07-261-0/+1
| | | | | | | | | | | | | | | | | | Change-Id: I7a20d46f753f5caa809e3150e44a58f4af55a506 Task-number: QTBUG-14972 Reviewed-by: Charles Yin
| * | Fix crash when assigning a list property to transitions.Michael Brasser2011-07-263-1/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the crash, but doesn't actually assign any Transitions (the transitions list will now be empty, rather than contain a null Transition object). Correct assignment is a general language issue, and will be fixed separately. Change-Id: I6aaba4eaf6faa513e54d99b27fe9f9a705eea40b Task-number: QTBUG-20227 Reviewed-by: Alan Alpert
| * | Qml Debugging: only read properties that can be displayed in the debuggerChristiaan Janssen2011-07-202-7/+8
| | | | | | | | | | | | | | | Change-Id: I68a6636aae271924bcec31ce7ad76c01fc43080b Task-number: QTCREATORBUG-5075
| * | qmldump: Fix creation of objects from QDeclarativeTypes.Christian Kamm2011-07-141-14/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the import statement was not necessarily set up correctly for the type we wanted to instantiate. We simply use QDeclarativeType::create now and thus can skip finding the right import. Mirrors qtcreator/f326bd067d455e979b5d83195e19581a9e2fd494 Reviewed-by: Roberto Raggi
| * | Document state fast-forwarding.Michael Brasser2011-07-071-0/+22
| | | | | | | | | | | | | | | | | | Change-Id: Idea5adf70f2ed693e0eac9d58e2ae298704304a2 Task-number: QTBUG-16049 Reviewed-by: Bea Lam
| * | qmlplugindump: Update qmltypes file format documentation.Christian Kamm2011-07-051-2/+4
| | | | | | | | | | | | Reviewed-by: Fawzi Mohamed
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-114-48/+74
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: Avoid spurious detaching in QDir::to/fromNativeSeparators Use fromLocal8Bit for reversing toLocal8Bit Don't convert template's path separators again Changed if/if/else/if/eleven chain to switch Modulus of negative dividends is undefined or negative Fix warning when compiling with VS 2008 Re-introduce Q_GLOBAL_STATIC_INIT
| * | | Avoid spurious detaching in QDir::to/fromNativeSeparatorsJoão Abecasis2011-08-111-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new code avoids non-const detaching operations until needed and uses a pointer into the "raw" QChar data from then on, thus skipping unneeded checks on the reference count for further detaching. These functions are used all the time by the file system classes so this small optimization won't hurt. In particular, it will help users who already use '/' when passing paths into Qt. Reviewed-by: Peter Hartmann
| * | | Use fromLocal8Bit for reversing toLocal8BitJoão Abecasis2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | path is converted to 8-bit encoding using toLocal8Bit in QTemporaryFileEngine::open. The reverse operation should be used here.
| * | | Don't convert template's path separators againJoão Abecasis2011-08-111-1/+1
| | | |
| * | | Changed if/if/else/if/eleven chain to switchJoão Abecasis2011-08-111-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Inlined isdigit in switch statement. Removed unused #includes. Documented unreachable segment with code (Q_ASSERT). Reviewed-by: Denis Dzyubenko
| * | | Modulus of negative dividends is undefined or negativeJoão Abecasis2011-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... depending on who you ask. Since it is possible for applicationPid to return negative values this means we would introduce garbage ['()*+,-./] in the generated filenames. Reviewed-by: Denis Dzyubenko
| * | | Fix warning when compiling with VS 2008João Abecasis2011-08-111-2/+2
| | | | | | | | | | | | | | | | warning C4308: negative integral constant converted to unsigned type
| * | | Re-introduce Q_GLOBAL_STATIC_INITJoão Abecasis2011-08-111-18/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing this macro in abff4d5090c1706c44485bbe3689a0e339c26a9b breaks code that used it in providing their own class-scope safe Q_GLOBAL_STATIC variations, the feature introduced in that commit. There may be other use cases for the macro. Anyway, even if this isn't part of the public API, there isn't a strong reason to remove the macro, so it is back now. Task-number: QTBUG-20627 Reviewed-by: Samuel Rødal
* | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-111-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Don't leak MouseEvents
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-stagingAlan Alpert2011-08-111-20/+11
| |\ \
| * | | Don't leak MouseEventsAlan Alpert2011-08-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Based off merge request 1312 Reviewed-by: Michael Brasser
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging into ↵Qt Continuous Integration System2011-08-1113-241/+463
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml-staging: Fix race condition in processJobs() Don't endless loop Compile on symbian Don't release register prematurely Rework threading internals in XmlListModel to avoid global static Doc Doc Compile in namespace Fix alias warnings in QML compiled bindings Fix alias warnings in MetaCallArgument Fix alias warnings in QDeclarativeVME Fix alias warnings in QDeclarativeGuard
| * | | Fix race condition in processJobs()Bea Lam2011-08-111-20/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't modify list of running jobs when a job is aborted since the job may have just started. Wait till the next time processJobs() is invoked for a new job and discard the aborted job at that time. Regression from 422f4e8ec53b917fad09a3e671fd93048dde72ed Task-number: QTBUG-20841
| * | Don't endless loopAlan Alpert2011-08-091-1/+1
| | | | | | | | | | | | | | | Task-number: QTBUG-20699 Reviewed-by: Michael Brasser
| * | Compile on symbianAaron Kennedy2011-08-041-1/+1
| | |
| * | Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qtAaron Kennedy2011-08-0416645-1087952/+2267912
| |\ \ | | | | | | | | | | | | | | | | Conflicts: doc/src/declarative/qtbinding.qdoc
| * | | Don't release register prematurelyAaron Kennedy2011-08-043-3/+19
| | | | | | | | | | | | | | | | Task-number: QTBUG-20648
| * | | Rework threading internals in XmlListModel to avoid global staticBea Lam2011-08-011-91/+205
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QTBUG-20629 reports a crash on destruction of XmlListModel when cleaning up the global static for the QDeclarativeXmlQuery object. The fix restructures the internals to be like the threading structure used for QDeclarativePixmapReader which doesn't use a global static. Task-number: QTBUG-20629 Reviewed-by: Martin Jones
| * | | DocAaron Kennedy2011-07-291-1/+1
| | | |
| * | | DocAaron Kennedy2011-07-291-1/+5
| | | |
| * | | Compile in namespaceAaron Kennedy2011-07-291-2/+2
| | | |
| * | | Fix alias warnings in QML compiled bindingsAaron Kennedy2011-07-291-9/+17
| | | |
| * | | Fix alias warnings in MetaCallArgumentAaron Kennedy2011-07-291-49/+65
| | | |
| * | | Fix alias warnings in QDeclarativeVMEAaron Kennedy2011-07-292-32/+72
| | | |
| * | | Fix alias warnings in QDeclarativeGuardAaron Kennedy2011-07-294-55/+88
| | | |
* | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into ↵Qt Continuous Integration System2011-08-101-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging: HTTP backend: invoke methods directly for synchronous requests
generated by cgit v0.12 at 2025-03-10 01:22:42 (GMT)