summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make QTextControl-based classes and QLineEdit understand Ctrl+Shift+InsertThiago Macieira2010-03-105-9/+22
| | | | | | | | On X11, this key is reserved for pasting the text selection (a.k.a. the PRIMARY selection). KDE apps already honour this, not all GNOME ones do, but it was agreed with them on xdg@freedesktop.org. Reviewed-By: mae <qt-info@nokia.com>
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-10399-9668/+23501
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (26 commits) Compile QtScript: Improve performance of type resolution when calling slots Improve performance of QScriptValueIterator Add default argument values for QScriptValuePrivate property functions Move method implementation to private class Add benchmarks for QScriptValueIterator Fixed the QML browser built into the QML viewer Make configure.exe fail for declarative if no script support Add QWidget::update() test. Add license headers Import static contents tests from old manualtests Fix Build Failure for Maemo 5 Debug Build Add ability to read last mod.time for zip entry. Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries Add isValid() method to QZipReader::FileInfo. Add `QIODevice* device() const` public method to QZip classes. Rebuild configure.exe (again enable QtDeclarative module by default) Update src/3rdparty/javascriptcore and adapt src/script to the changes Use index-based approach for iterating over JS array properties QFSFileEngine reduce number of system calls ...
| * CompileKent Hansen2010-03-101-2/+0
| | | | | | | | Reviewed-by: Thierry Bastian
| * QtScript: Improve performance of type resolution when calling slotsKent Hansen2010-03-101-10/+13
| | | | | | | | | | | | | | Don't call QVector::append(). We know what the size of the vector will be, so size it initially and work on QVector::data() directly. Reviewed-by: Jedrzej Nowacki
| * Improve performance of QScriptValueIteratorKent Hansen2010-03-101-21/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The implementation was getting all the property names (identifiers) and storing their string representation. In e.g. value() and setValue(), the string representation then had to be converted back to an identifier. This was unnecessary work. Instead, store the identifiers directly, and use them via the QScriptValue private API whenever we can. This greatly improves the performance of scriptName(), value(), setValue(), flags() and remove(). (tests/benchmarks/script/qscriptvalueiterator is 4-5 times faster.) Reviewed-by: Jedrzej Nowacki
| * Add default argument values for QScriptValuePrivate property functionsKent Hansen2010-03-102-10/+11
| | | | | | | | | | | | | | | | Make them mirror the defaults of the public API, so that the QScriptValuePrivate property functions can be used internally in the same manner as the public API. Reviewed-by: Jedrzej Nowacki
| * Move method implementation to private classKent Hansen2010-03-102-5/+11
| | | | | | | | | | | | | | | | In preparation of being able to call toStringHandle() directly on a JSC::Identifier in QScriptValueIterator implementation. Reviewed-by: Jedrzej Nowacki
| * Add benchmarks for QScriptValueIteratorKent Hansen2010-03-102-0/+300
| | | | | | | | Reviewed-by: Benjamin Poulain
| * Fixed the QML browser built into the QML viewerThorbjørn Lindeijer2010-03-101-5/+5
| | | | | | | | Was still using 'matchProperties' instead of just 'properties'.
| * Make configure.exe fail for declarative if no script supportMarius Storm-Olsen2010-03-102-15/+27
| | | | | | | | | | | | | | If the user tells configure not to compile QtScript, then fail if the user wants QtDeclarative or QtScriptTools Reviewed-by: Jørgen Lind
| * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-10395-9603/+23103
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add QWidget::update() test. Add license headers Import static contents tests from old manualtests Fix Build Failure for Maemo 5 Debug Build Add ability to read last mod.time for zip entry. Avoid asserting when index passed to QZipReader::entryInfoAt is out of boundaries Add isValid() method to QZipReader::FileInfo. Add `QIODevice* device() const` public method to QZip classes. Rebuild configure.exe (again enable QtDeclarative module by default) Update src/3rdparty/javascriptcore and adapt src/script to the changes Use index-based approach for iterating over JS array properties QFSFileEngine reduce number of system calls remove unneeded "permissions normalization" code from QFileInfoGatherer remove unneeded code from QFileInfo QFSFileEngine: Don't use owner's permissions for current user; calculate them instead In QFSFileEngine::fileFlags call getPermissions() only if entry exists move permissions calculation code to separate method Assistant: Fix full text indexing.
| | * Add QWidget::update() test.Morten Johan Sørvig2010-03-101-1/+50
| | | | | | | | | | | | | | | Test that QWidget::update sends minimal updates, both for the rect and region version.
| | * Add license headersMorten Johan Sørvig2010-03-108-0/+329
| | |
| | * Import static contents tests from old manualtestsMorten Johan Sørvig2010-03-1015-0/+368
| | |
| | * Fix Build Failure for Maemo 5 Debug BuildDominik Holland2010-03-101-2/+2
| | |
| | * Add ability to read last mod.time for zip entry.Ritt Konstantin2010-03-103-0/+23
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Avoid asserting when index passed to QZipReader::entryInfoAt is out of ↵Ritt Konstantin2010-03-102-1/+6
| | | | | | | | | | | | | | | | | | boundaries Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Add isValid() method to QZipReader::FileInfo.Ritt Konstantin2010-03-103-1/+11
| | | | | | | | | | | | Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Add `QIODevice* device() const` public method to QZip classes.Ritt Konstantin2010-03-103-0/+20
| | | | | | | | | | | | | | | | | | allows to fetch some extra info from the used device (errorString() for ex.) Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | * Rebuild configure.exe (again enable QtDeclarative module by default)Kai Koehne2010-03-101-0/+0
| | | | | | | | | | | | Commit ad341d61 seems to have integrated a configure.exe from 4.6.
| | * Update src/3rdparty/javascriptcore and adapt src/script to the changesKent Hansen2010-03-10364-9437/+22203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Update qscriptvalueiterator test to expect length property when iterating arrays and strings. - Use EvalExecutable::create() instead of EvalExecutable constructor. The constructor is private. - Reimplement getOwnPropertyDescriptor() in all custom script objects. - Remove all reimplementations of getPropertyAttributes(). It doesn't exist in trunk anymore (getOwnPropertyDescriptor() is used instead). - Remove checkDontDelete argument from deleteProperty() reimplementations. The purpose of this argument was to support deleting properties with attribute Undeletable from C++. But it was quite an invasive patch to JavaScriptCore, and it doesn't seem worth it. If this feature is really crucial it should be re-done upstream. One of the tests needed to be updated so it's not sensitive to the C++ undeletability. - Adapt getOwnPropertyNames() reimplementations to signature change. - Add missing QScriptObject structure flags, otherwise we don't get all virtual calls. - Remove our patch for reporting column numbers in the debugger callbacks. It was just too intrusive. As with the checkDontDelete issue, this should be redone upstream if it's really important. In 4.7, QScriptEngineAgent will always report a column number of 1. Other compilation fixes: - InternalFunction::name() takes an ExecState* argument, not GlobalData* - ScopeChain::globalObject is no longer a function but a member variable - ScopeChainNode constructor takes a GlobalObject argument - Heap::collect() is called collectAllGarbage() - JSValue::strictEqual() takes an ExecState* argument - Debugger::exception() takes a bool hasHandler argument - Debugger no longer reports column number (we decided to drop that patch from JSC) - UString doesn't have operator+=(char*) - Update the autotests to reflect the columnNumber=1 change. - Add helper class to avoid crashing inside JSC. Ever since r52856 in WebKit trunk, this is needed. There are probably a lot of other public API functions that need this guard as well, but I'll add them as they are discovered. - Update mkdist-javascriptcore tag, exclude a few more files. - Set ENABLE_JSC_MULTIPLE_THREADS=0 define on Mac due to r52355 in trunk. Reviewed-by: Simon Hausmann
| | * Use index-based approach for iterating over JS array propertiesKent Hansen2010-03-101-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | Using QScriptValueIterator means that non-index properties of the array will be processed (such as "length" or "foo"), which is something we don't want. Reviewed-by: Aaron Kennedy
| | * Merge remote branch 'origin/4.7-cutoff' into 4.7Morten Johan Sørvig2010-03-1037-137/+1373
| | |\
| | * | QFSFileEngine reduce number of system callsRitt Konstantin2010-03-093-21/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for isolated calls to QFileInfo::isReadable, isExecutable and isWritable. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | remove unneeded "permissions normalization" code from QFileInfoGathererRitt Konstantin2010-03-092-38/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the file engine now properly calculates user permissions, there's no need to check the owner and group IDs here. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | remove unneeded code from QFileInfoRitt Konstantin2010-03-092-55/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since we made sure user perms are calculated in file engine this dirty trick goes away...woohoo Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | QFSFileEngine: Don't use owner's permissions for current user; calculate ↵Ritt Konstantin2010-03-092-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | them instead Having this code in the engine allows cleaning up the hack in QFileInfo. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | In QFSFileEngine::fileFlags call getPermissions() only if entry existsRitt Konstantin2010-03-091-24/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By calling doStat earlier and avoiding calling getPermissions if stat fails, we can assume doStat has been called inside getPermissions. We can also avoid the workaround for having all permissions set by default. Moved the check for FILE_ATTRIBUTE_DIRECTORY earlier in if condition, which should be cheaper. Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | move permissions calculation code to separate methodRitt Konstantin2010-03-092-28/+37
| | | | | | | | | | | | | | | | | | | | Merge-request: 428 Reviewed-by: João Abecasis <joao@trolltech.com>
| | * | Assistant: Fix full text indexing.ck2010-03-092-9/+3
| | | |
* | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-1018-113/+320
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGL Added clipping to the dashed stroke processor in the GL2 engine. Fixed assert failure when drawing dashes with raster engine. Update tst_QGL::getSetCheck to check for new (correct) behaviour Update QGLFormat from EGLConfig properly Make calls to QGLFormat::set*BufferSize also update flags Compile fix when Qt3Support is enabled for devices using EGL. Cocoa: Fix misaligned text between format changes Added configure check to diasable building QtDeclarative Fixes Q3ListViewItem grandchildren not sorted if item has one child Compile with Qt3Support in a ScratchBox environment.
| * | | | Re-enable tst_QGL::glWidgetRenderPixmap on X11/EGLTom Cooksey2010-03-101-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QGLWidget::renderPixmap now works under X11/EGL. Tested on both Fremantle and Harmattan. Reviewed-By: TrustMe
| * | | | Added clipping to the dashed stroke processor in the GL2 engine.Kim Motoyoshi Kalland2010-03-104-30/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without clipping, the stroker could consume a huge amount of memory when scaling up cosmetic, dashed strokes. I also made QDashStroker clip more aggressively. Task-number: QTBUG-7832 Reviewed-by: Samuel
| * | | | Fixed assert failure when drawing dashes with raster engine.Kim Motoyoshi Kalland2010-03-101-5/+6
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | Update tst_QGL::getSetCheck to check for new (correct) behaviourTom Cooksey2010-03-101-6/+7
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trond
| * | | | Update QGLFormat from EGLConfig properlyTom Cooksey2010-03-106-45/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, some members of QGLFormat (like alphaBufferSize) would be left to the initial -1 value. Reviewed-By: TrustMe
| * | | | Make calls to QGLFormat::set*BufferSize also update flagsTom Cooksey2010-03-101-1/+5
| | | | | | | | | | | | | | | | | | | | Reviewed-By: Trond
| * | | | Compile fix when Qt3Support is enabled for devices using EGL.Trond Kjernåsen2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Samuel
| * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7Eskil Abrahamsen Blomfeldt2010-03-10960-22372/+43328
| |\ \ \ \
| | * | | | Added configure check to diasable building QtDeclarativeJørgen Lind2010-03-101-19/+21
| | | | | | | | | | | | | | | | | | | | | | | | when Qt is not building the QtScript module
| | * | | | Fixes Q3ListViewItem grandchildren not sorted if item has one childAlexader Karaivanov2010-03-102-2/+133
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Q3ListViewItem::sortChildItems() used to exits early if there is only 1 child item and leaves grandchildren unsorted. Merge-request: 2260 Reviewed-by: Olivier Goffart <ogoffart@trolltech.com>
| | * | | | Compile with Qt3Support in a ScratchBox environment.Trond Kjernåsen2010-03-101-1/+1
| | |/ / / | | | | | | | | | | | | | | | Reviewed-by: Tom Cooksey
| * | | | Cocoa: Fix misaligned text between format changesEskil Abrahamsen Blomfeldt2010-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts part of commit e008504b5ec34975e34adf3b1a2b7170d0e4dd38. The original commit aimed to round up all fractional numbers for the font to "improve appearance". Rounding up the last advance of a set of advances in a glyph layout, however, breaks text layout completely, since the layout of text will be different depending on how many text lines is used to represent it (since the last glyph in each line will have a higher advance than the others.) This was e.g. visible in Qt Creator when turning on whitespace visualization, as all spaces then created a format change, thus a new text line in the text layout, and hence an increase of X pixels in the positioning of the text after the space, where 0.0 < X < 1.0. I see no negative results of removing the rounding, but if there are any problems, it has to be fixed in the usage of the advances not in the advances themselves. Task-number: QTCREATORBUG-381, QTBUG-8791 Reviewed-by: mae
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-102-0/+120
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Update def files for latest QtDeclarative API
| * | | | Update def files for latest QtDeclarative APIShane Kearns2010-03-102-0/+120
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The QDeclarativeBinding API is new since last week's freeze. Froze the def files again, so that applications that use this API will be able to link. Task-number: QTBUG-8909 Reviewed-by: Trust Me
* | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-109-50/+97
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is used Make sure 16-bit EGL configs are chosen over 32-bit configs Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATIC Handle EGLSurfaces better, including more error detection Make sure pixmap hooks get installed so EGL surfaces are cleaned up Don't show resize cursor for fixed-size windows
| * | | | MAke the SIMD fiunctions be used even when the QT_NO_DEBUG macro is usedThierry Bastian2010-03-101-3/+0
| | | | | | | | | | | | | | | | | | | | Reviewed-by: Benjamin Poulain
| * | | | Make sure 16-bit EGL configs are chosen over 32-bit configsTom Cooksey2010-03-102-32/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We want to make sure 16-bit configs are chosen over 32-bit configs as they will provide the best performance. The EGL config selection algorithm is a bit stange in this regard: The selection criteria for EGL_BUFFER_SIZE is "AtLeast", so we can't use it to discard 32-bit configs completely from the selection. So it then comes to the sorting algorithm. The red/green/blue sizes have a sort priority of 3, so they are sorted by first. The sort order is special and described as "by larger _total_ number of color bits.". So EGL will put 32-bit configs in the list before the 16-bit configs. However, the spec also goes on to say "If the requested number of bits in attrib_list for a particular component is 0, then the number of bits for that component is not considered". This part of the spec also seems to imply that setting the red/green/blue bits to zero means none of the components are considered and EGL disregards the entire sorting rule. It then looks to the next highest priority rule, which is EGL_BUFFER_SIZE. Despite the selection criteria being "AtLeast" for EGL_BUFFER_SIZE, it's sort order is "smaller" meaning 16-bit configs are put in the list before 32-bit configs. So, to make sure 16-bit is preffered over 32-bit, we must set the red/green/blue sizes to zero. This has an unfortunate consequence that if the application sets the red/green/blue size to 5/6/5 on the QGLFormat, they will probably get a 32-bit config, even when there's an RGB565 config avaliable. Oh well. Reviewed-By: TrustMe
| * | | | Make the EGL contexts in QX11GLPixmapData Q_GLOBAL_STATICTom Cooksey2010-03-101-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Still not ideal, but this should do for now. Reviewed-By: TrustMe
| * | | | Handle EGLSurfaces better, including more error detectionTom Cooksey2010-03-106-10/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note: This changes QX11PixmapData::gl_surface to a void* to enable build on 64-bit systems where EGLSurface is a pointer. Reviewed-By: TrustMe
generated by cgit v0.12 at 2024-11-15 03:54:19 (GMT)