summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Compile.Morten Johan Sørvig2011-03-161-0/+2
|
* Fix CoreServices framework addition for qpa.Morten Johan Sørvig2011-03-161-7/+6
| | | | | | Test against the coreservices QT_CONFIG on qpa, unconditionally add CoreFoundation for mac and darwin
* Update NaCl mkspecs.Morten Johan Sørvig2011-03-164-407/+79
| | | | | Less duplication, use the common unix and gcc conf files.
* Properly set the window event masks etc for screens and GL windows too.Samuel Rødal2011-03-152-3/+5
|
* Fix race condition in the non-GL casePaul Olav Tvete2011-03-143-5/+12
| | | | | | | Make sure to also flush output when waiting for an ack from the compositor, in case we haven't sent the frame request yet. Reviewed-by: Jørgen
* Do release build for devices and remove some warnings.con2011-03-116-33/+46
|
* XmlPatterns actually compiles and runs.con2011-03-101-2/+2
|
* Fix http in combination with QT_NO_NETWORKPROXY.con2011-03-103-3/+8
|
* Add proof-of-concept UIKit based lighthouse platform.con2011-03-1027-0/+2401
| | | | See the README in the uikit platform plugin for details.
* Build QProcess on platforms that don't have _NSGetEnvironcon2011-03-101-2/+2
| | | | Reviewed-by: Jørgen Lind
* Build JavaScriptCore also under unusual platform combination.con2011-03-101-0/+3
| | | | | Reviewed-by: Jedrzej Nowacki Reviewed-by: Simon Hausmann
* Objective-c prf may not override OBJECTIVE_CFLAGS settings.con2011-03-102-13/+11
| | | | Reviewed-by: Morten Johan Sørvig
* Lighthouse: Adding Native interface to getting the native eglcontextJørgen Lind2011-03-079-17/+85
| | | | | in xcbplugin. I also reoredered how eglInitialize was executed, (its not so lazy anymore)
* Fix 7ea1dd46966ae7cfa07fa18c001704e3c981b669 for Mac desktop builds.con2011-03-071-2/+3
| | | | | | | Cocoa.h can't be included after qscroller_p.h, but we need to have Q_WS_MAC defined before the ifdef. Reviewed-by: Morten Johan Sørvig
* Inconsistency between ini case sensitivity between OS_MAC and WS_QPA.con2011-03-041-1/+1
| | | | | | QPA sets CaseSensitive unconditionally, so if OS_MAC tries to use CaseInsensitive QSettings will assert. The patch leaves the non-QPA case unchanged.
* Do not explicitly process events before running event loop integration.con2011-03-041-1/+0
| | | | | | | | | Processing posted Qt events before the event loop integration is started may lead to the process being killed for taking too long time before the native event loop is running. Since event loop integrations are required to install a timer that does processEvents anyhow, the Qt events will be processed even without doing it explicitly in advance.
* don't print debug outputcon2011-03-041-1/+1
|
* Lighthouse: Fix a block for wayland with gl supportBenjamin Franzke2011-03-041-3/+6
| | | | | | | The initialial readable iteration, needs to be done before initializing egl, or it will be done inside egl. The readable iteration after initialzing egl would block forever otherwise.
* Lighthouse: Add xkbcommon to pkg-config configuration of waylandJørgen Lind2011-03-031-4/+4
|
* Lighthouse: Make xcb backen usable for anyone else againJørgen Lind2011-03-031-1/+4
|
* Merge remote-tracking branch 'origin/master' into lighthouse-masterJørgen Lind2011-03-0355-229/+625
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-03-021-1/+3
| |\ | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Add qscriptobject and context2d to "trusted" benchmarks
| | * Add qscriptobject and context2d to "trusted" benchmarksKent Hansen2011-03-021-1/+3
| | | | | | | | | | | | Reviewed-by: Joao
| * | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-03-028-25/+17
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: qdoc3: Fix compilation with -no-stl don't add extraneous empty command lines make the $$quote() function less prominent minor cleanup of the QMAKE_POST_LINK command line construction silence qmake warning about unbalanced parentheses
| | * | qdoc3: Fix compilation with -no-stlhjk2011-03-021-0/+2
| | | | | | | | | | | | | | | | Reviewed-by: David Boddie
| | * | don't add extraneous empty command linesOswald Buddenhagen2011-03-013-3/+3
| | | | | | | | | | | | | | | | Reviewed-by: mariusSO
| | * | make the $$quote() function less prominentOswald Buddenhagen2011-03-012-19/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | it does something else than people expect it to do, so just "hide" it (by not referring to it anywhere except in its own doc). Reviewed-by: mariusSO
| | * | minor cleanup of the QMAKE_POST_LINK command line constructionOswald Buddenhagen2011-03-011-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | don't over-$$quote(), consistently use a single string instead of a string list Reviewed-by: mariusSO
| | * | silence qmake warning about unbalanced parenthesesOswald Buddenhagen2011-03-011-1/+1
| | | | | | | | | | | | | | | | this is stupid, but i don't feel like fixing qmake now
| * | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging into ↵Qt Continuous Integration System2011-03-027-21/+80
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-air-staging: Don't allow non-Object values to be set as prototype Enable QtScript/JavaScriptCore ASSERTs in debug mode Don't assert in abortEvaluation() autotest Avoid asserting when computing line number for backtrace Make missing line number info an expected failure
| | * | Don't allow non-Object values to be set as prototypeKent Hansen2011-03-022-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It should only be possible to set an object or null as prototype. This is consistent with both JSC and V8. Additionally, it keeps JSC from asserting in debug mode. Task-number: QTBUG-15154 Reviewed-by: Jedrzej Nowacki
| | * | Enable QtScript/JavaScriptCore ASSERTs in debug modeKent Hansen2011-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fact that QtWebKit disables asserts in debug mode doesn't mean QtScript should do the same. The asserts can make us aware of problems in our calls to JSC, and violations of internal assumptions in JSC (e.g. memory alignment). Task-number: QTBUG-17741 Reviewed-by: Olivier Goffart
| | * | Don't assert in abortEvaluation() autotestKent Hansen2011-03-012-5/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When QtScript is built without NDEBUG defined, the tst_QScriptEngine::abortEvaluation() test would assert. This was due to commit 716e0284c8f569d71e42354fd6fc3b965233e019, which fixed the tst_QScriptEngine::throwErrorFromProcessEvents() autotest for a script containing an infinite while-loop with an empty body. The CHECK_FOR_EXCEPTION_AT_END() that we added should only be done if the timeout checker did not report a timeout; otherwise the JSC state becomes corrupted due to returnToThrowTrampoline() being called twice. This caused an assert later when calculating the line number of the exception. Also add test cases for scripts with try-catch statements. For abortEvaluation(), scripts should not be able to observe (i.e. catch) the interrupted exception, but if an error is thrown using QScriptContext::throwError(), the script should be able to catch it. Task-number: QTBUG-17854 Reviewed-by: Olivier Goffart
| | * | Avoid asserting when computing line number for backtraceKent Hansen2011-03-012-5/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With JSC asserts enabled (QtScript built without NDEBUG defined), JSC::CodeBlock::getBytecodeIndex() would assert because we sometimes called it with an address that was not inside the range of the block's JIT code. We never caught this bug because it just so happens that even though the assert fails, the function returns a result that causes our autotests to pass. Check that the returnPC is in range and report lineNumber -1 if not; this unifies the behavior of the interpreter and JIT, even though it's not the result we want. Task-number: QTBUG-17741 Reviewed-by: Olivier Goffart
| | * | Make missing line number info an expected failureKent Hansen2011-02-281-8/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fact that the line number is incorrect was hidden away in a comment in the test data. This commit makes it an explicit failure so that we're reminded of the issue. Reviewed-by: Olivier Goffart
| * | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-03-0136-182/+486
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: (26 commits) Fix FolderListModel test - set folder to one containing files. Fix Mac synthesized italic fonts clipping issue for QGLWidget Fix openvg compilation on win32. Drag over bounds errors when ListView has variable height content FolderListModel emitted incorrect rowsRemoved range causing crash. fix/improve docs for new QtQuick 1.1 attributes Fix test instability. Document BorderImage::asynchronous Make QtScript support COLLECT_ON_EVERY_ALLOCATION define QSortFilterProxyModel::reset() should invalidate. Add missing API shims to QScriptValue constructors Don't crash when marking arguments object of native context Update QtOpenGL def files Fix extern usage in qpixmapdata_gl.cpp Fix for loading QPixmaps from file in GL graphics system Fix code style in qgl_symbian.cpp QPixmap::to/fromSymbianCFbsBitmap() in OpenGL graphics system. Use the 'convertInPlace' versions of QImage in QGLPixmapData load. Recreate GL surface when native window is resized on Symbian spelling fixes in extending.qdoc ...
| | * \ \ Merge remote-tracking branch 'origin/4.7' into qt-master-from-4.7Olivier Goffart2011-03-0136-182/+486
| | |\ \ \ | | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/text/qfontengine_mac.mm src/opengl/qpixmapdata_gl.cpp src/opengl/qwindowsurface_gl.cpp src/s60installs/bwins/QtOpenGLu.def src/s60installs/eabi/QtOpenGLu.def tests/auto/qtextlayout/tst_qtextlayout.cpp
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-02-2823-150/+356
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Fix FolderListModel test - set folder to one containing files. Drag over bounds errors when ListView has variable height content FolderListModel emitted incorrect rowsRemoved range causing crash. fix/improve docs for new QtQuick 1.1 attributes Fix test instability. Document BorderImage::asynchronous Ensure layout is updated when section property changes. QDeclarativeDebug: Export needed symbols on Symbian Add a 'CursorPosition' parameter to TextInput.positionAt(). Fix qmlviewer compilation on old Symbian platforms
| | | | * | Fix FolderListModel test - set folder to one containing files.Martin Jones2011-02-281-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I95aabd35c3a33b603aa3b11130ddea5f5c101ce9 Task-number: QTBUG-17775
| | | | * | Drag over bounds errors when ListView has variable height contentMartin Jones2011-02-285-45/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two related problems: - when dragging variable height content up beyond bounds items are destroyed, causing the maximum extent to change, which in turn causes skipping. This is fixed by storing the extents on press so that later changes do not affect drag behavior. - when variable height content is dragged beyond the bounds and and released, items are created as the view returns to bounds. This changes the extents, however the bound target was not updated. If the viewport height changes during fixup the bounds animation is now updated. Change-Id: Ib37ec9e51f8ceb71af1e2e58f25fd8da18dcd632 Task-number: QTBUG-17769 Reviewed-by: Michael Brasser
| | | | * | FolderListModel emitted incorrect rowsRemoved range causing crash.Martin Jones2011-02-282-2/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | beginRemoveRows() takes the first and last index as parameters, but it was passing count rather than count-1 as the last index. Change-Id: I81a6fbf085acacf5f8c1ca847b0bdc826bcf405b Task-number: QTBUG-17775 Reviewed-by: Bea Lam
| | | | * | fix/improve docs for new QtQuick 1.1 attributesBea Lam2011-02-2812-52/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure attributes added in QtQuick 1.1 are marked with the '\since QtQuick 1.1' tag. Also add links to items listed in the QtQuick 1.1 section in whatsnew.qdoc. Task-number: QTBUG-17771 Change-Id: Ic8fb3c8d3c99a1469c1767779efaafd27ef460e1
| | | | * | Fix test instability.Martin Jones2011-02-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the asynchronous view changes to complete before testing section positions. Change-Id: I09c7592205b6e3c55807ec1c5aa4b09f9cd8b92c
| | | | * | Document BorderImage::asynchronousAlan Alpert2011-02-271-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's been there forever, but someone forgot the documentation. Task-number: QTBUG-16612
| | | | * | Ensure layout is updated when section property changes.Martin Jones2011-02-253-2/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the section property changed the sections were recalculated, but the items were not relayouted. Also avoid 'Unable to assign undefined value' warning by setting section item parent before component is completed. Change-Id: I7bd8eb369877a6faf72b32b80b45a68366c95772 Task-number: QTBUG-17759 Reviewed-by: Michael Brasser
| | | | * | QDeclarativeDebug: Export needed symbols on SymbianKai Koehne2011-02-243-47/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow applications to link against the QDeclarativeDebugService API. This is needed for on-device debugging of QML. (The removal of the symbols was a regression in 4.7.2). Task-number: QTBUG-17503 Reviewed-by: Tom Sutcliffe
| | | | * | Add a 'CursorPosition' parameter to TextInput.positionAt().Andrew den Exter2011-02-243-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specifies whether positionAt should resolve to the nearest position between characters or the position of the nearest character. Change-Id: I9eb2db2f8dd2accb2d9844ff204fba0337e71876 Task-number: QTBUG-16070 Reviewed-by: Martin Jones
| | | | * | Fix qmlviewer compilation on old Symbian platformsJoona Petrell2011-02-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-17472 Reviewed-by: Martin Jones
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-02-283-8/+24
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix Mac synthesized italic fonts clipping issue for QGLWidget Fix cursor position adjustment when removing strings Fix out of bounds handling in Mac shaper
| | | | * | | Fix Mac synthesized italic fonts clipping issue for QGLWidgetJiang Jiang2011-02-281-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backport 43d5a0757d857c2a6694ae81d6b70c04ef876aff from 4.8. Task-number: QTBUG-16954 Reviewed-by: Eskil
generated by cgit v0.12 at 2024-11-15 16:51:26 (GMT)