summaryrefslogtreecommitdiffstats
path: root/src/corelib
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote branch 'origin/4.7-cutoff' into 4.7Morten Johan Sørvig2010-03-106-14/+727
|\
| * Merge branch '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-1014-2080/+2203
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7-cutoff' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (83 commits) Don't wait forever when scanning for wifi networks on win32 fails. Revert 12b6987031be9faee3886d7623888feb4e1762af Changed TEST_COMPILER from CC to CXX in configure script. doc: Fixed several qdoc errors. Carbon: Native filedialog does not apply filters on app-bundles Cocoa: Native filedialog does not apply filters on app-bundles Improve performance of QTimer::singleShot Add a benchmark comparing single shot timer with invokeMethod use Qt's private mac functions, reduce code redundancy Assistant: Fix compile warning for empty header. Doc: mark QEasingCurve support functions as new in 4.7. Modify the XML test suite not to use non-characters. Autotest: Fix failing QTextCodec tests Doc: mark methods as internal (as they were in previous releases) Doc: add image for Qt Quick to "What's New" page. qdoc: Clear a static multimap after each qdocconf file. qdoc: Added some debug output to track down a crash Fixed mouse wheel handling in scrollareas. Added two missing keys for X11 Carbon: usage of menu bars can cause exceptions to be thrown ...
| * | Don't write byte-order-mark after seek()Paul Olav Tvete2010-03-091-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ideally, we should write a BOM after seek(0) if setGenerateByteOrderMark has been called, but we don't store that information. This commit is an improvement for the default case when generateByteOrderMark is false, and also when seeking to any other position than 0. Task-number: QTBUG-6295 Reviewed-by: Olivier
| * | TextCodec on Symbian: use the native symbian backend for text codecs.Olivier Goffart2010-03-095-13/+725
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On symbian, we would use the native textcodec for anything but UTF and Latin1. Some codec that are not present by default in symbian are still present inside Qt, but if there is symbian codecs that exists for those, Symbian codecs have priority. Most of code has been contributed by the Obrit i18n team. Task-number: QT-2471 (Symbian part) Task-number: QT-2627 Reviewed-by: axis
* | | 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 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>
* | Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-091-1/+13
|\ \
| * | Improve performance of QTimer::singleShotMarkus Goetz2010-03-091-1/+13
| | | | | | | | | | | | | | | | | | Avoid allocation of QObject and OS timer. Reviewed-by: Olivier Goffart
* | | doc: Fixed several qdoc errors.Martin Smith2010-03-094-15/+15
|/ /
* | Doc: mark QEasingCurve support functions as new in 4.7.Volker Hilsheimer2010-03-081-0/+2
| |
* | Autotest: Fix failing QTextCodec testsThiago Macieira2010-03-081-1/+1
| |
* | Added two missing keys for X11Denis Dzyubenko2010-03-082-0/+5
| | | | | | | | | | | | | | On X11 XF86XK_LaunchD is mapped to Qt::Key_LaunchF, however x11 keys LaunchE and LaunchF were not mapped to anything. Reviewed-by: Marius Storm-Olsen
* | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-078-2071/+2175
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (57 commits) fix corewlan detection error when building for 10.5 when 10.6 is also fixed treatment of zlib on Mac when crossbuilding Partial overloading support for qdbus cli tool. Allow empty authority in QUrl::setAuthority as per docs. Added test for QTBUG-6962: Empty authority ignored by QUrl::setAuthority. fixed case of GL include directory check in MAC_APPLICATION_MENU translations Re-generate the Unicode tables after updates to the program that generates them Fix the code after merge: DerivedNormalizationProps has two or more columns add some usefull definitions to qunicodetables_p.h qchar.cpp: fix identation finish last commit prefer DerivedNormalizationProps.txt over CompositionExclusions.txt improve error reporting a bit more improve error reporting fix incorect condition check if string to int conversions were done w/o errors improve error reporting for unassigned grapheme/word/sentence break classes avoid using of qunicodetables_p.h in generator use QHash for line break map ...
| * Allow empty authority in QUrl::setAuthority as per docs.Kimmo Kotajärvi2010-03-051-1/+5
| | | | | | | | | | Merge-request: 482 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Re-generate the Unicode tables after updates to the program that generates themThiago Macieira2010-03-052-1842/+1907
| |
| * add some usefull definitions to qunicodetables_p.hRitt Konstantin2010-03-052-17/+15
| | | | | | | | | | | | | | | | | | | | * CURRENT_VERSION macro in qunicodetables.cpp was renamed to UNICODE_DATA_VERSION and it's definition was moved to qunicodetables_p.h * LAST_UNICODE_CHAR macro in qchar.cpp was renamed to UNICODE_LAST_CODEPOINT and it's definition was moved to qunicodetables_p.h Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * qchar.cpp: fix identationRitt Konstantin2010-03-051-120/+123
| | | | | | | | | | | | | | no actual changes Merge-request: 480 Reviewed-by: Thiago Macieira <thiago.macieira@nokia.com>
| * Make the UTF-8 encoder/decoder not accept Unicode non-charactersThiago Macieira2010-03-051-3/+25
| | | | | | | | Reviewed-By: Denis Dzyubenko
| * Finish reverting the UTF-8 hack added in 80ea01c6 (P4 106704, Qt 3.2).Thiago Macieira2010-03-051-9/+2
| | | | | | | | | | | | | | This code was removed from QString in 539cd1e5 (P4 259474, Qt 4.3), but apparently lingered on the UTF-8 codec code. Reviewed-by: Denis Dzyubenko
| * Make QString::toUtf8() also use QUtf8.Thiago Macieira2010-03-051-39/+5
| | | | | | | | Reviewed-By: Denis Dzyubenko
| * Doc: add some notes about QString lossy/lossless conversionsThiago Macieira2010-03-051-5/+38
| |
| * Doc: fix a mistake saying that const char* was converted to QLatin1StringThiago Macieira2010-03-051-5/+5
| |
| * Doc: Update QString docs about real ASCII and to/fromAscii and NULs.Thiago Macieira2010-03-051-31/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Despite the names, the QString::toAscii and QString::fromAscii functions are not about ASCII. One can set an ASCII-incompatible codec using QTextCodec::setCodecForCStrings, which may lead to loss of information. Also update the docs about how the functions that take QByteArray take embedded NULs in the QByteArray into account. The result is: stop conversion at NUL: operator=, operator==, operator!= include NUL in conversion: operator<, operator<=, operator>, operator>= Reviewed-by: ossi
| * QMetaType::type(): return immediately if the typename is emptyKent Hansen2010-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No need to look up / lock data structures if we know that the comparisons will all fail. This was encountered because QMetaMethod::typeName() returns an empty string if the return type is void (even though there is a QMetaType::Void (value 0) with name "void"). This was causing the QtScript meta-object binding to spend a lot of its time looking up the type for an empty string when invoking slots that return void. Rather than having these checks in QtScript and who knows where else, it's better that QMetaType::type() does it itself. No regressions in the qmetatype benchmark. Reviewed-by: Olivier Goffart Reviewed-by: Harald Fernengel
| * Prevent a freeze of QFileSystemWatcher on Mac.Denis Dzyubenko2010-03-051-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | On Mac when the FSEvents backend is used and a file is added or removed from a file system watcher, we need to wait until the thread is finished, otherwise it is possible that the thread already exited from the run() function but hasn't fully terminated, meaning when we restart the thread by calling start() it won't start because QThread thinks it's already running. A better fix might be to avoid stopping and starting threads - to just stop the FSEvents loop and notify the thread that a file set has changed. Task-number: QTBUG-8524 Reviewed-by: Morten
* | Merge remote branch 'origin/4.6' into qt-4.7-from-4.6Rohan McGovern2010-03-0614-70/+110
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe examples/multimedia/audioinput/audioinput.cpp src/corelib/io/qfsfileengine.cpp src/gui/egl/qegl_wince.cpp src/gui/egl/qeglproperties.cpp src/gui/egl/qeglproperties_p.h src/gui/embedded/directfb.pri src/gui/kernel/qapplication_win.cpp src/gui/painting/qdrawutil.cpp src/opengl/qgl_p.h src/sql/drivers/odbc/qsql_odbc.cpp src/sql/drivers/odbc/qsql_odbc.h tests/auto/auto.pro tests/auto/qgl/tst_qgl.cpp translations/assistant_adp_ru.ts
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-052-29/+46
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix build with Mesa 7.8's EGL implementatioon Reset the byte order in the iconv codec after using it. fix "using namespace" recursion crash Fixed key mappings on X11 QDom: prevent infinite loop when cloning a DTD QPrintPreviewDialog number of pages is partially blocked from view in OSX Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( f3110d2f94c825477afac054ed448e45d47f5670 )
| | * Reset the byte order in the iconv codec after using it.Thiago Macieira2010-03-051-12/+29
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise, if you try run QString(QChar(0xfffe)).toLocal8Bit() iconv will be left in byte-swapping mode. Reviewed-by: Denis Dzyubenko
| | * Fixed key mappings on X11Denis Dzyubenko2010-03-051-17/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge request #1742 (6c8c1c5322a26d789165783d7df3e29c672690cb) changed the behavior of one of the keys on X11, this fixes it back and documents that on X11 the key binding is a bit weird - XF86XK_MyComputer is mapped to Qt::Key_Launch0, XF86XK_Launch0 is mapped to Qt::Key_Launch3 and so on. Task-number: QTBUG-7063 Reviewed-by: Marius Storm-Olsen
| * | Fixed crash at application exit when QProcess was used in SymbianMiikka Heikkinen2010-03-051-0/+2
| |/ | | | | | | | | | | | | | | | | QProcessManagerMediator and QProcessActive were not properly canceled in their destructors, causing crash when global static QProcessManager was deleted. Task-number: QTBUG-7735 Reviewed-by: Janne Anttila
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-041-0/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: tst_qhostinfo: Compile fix Document some stuff in QHostInfo and QAbstractSocket tst_qhostinfo: Mixed up descriptions for test case data qhostinfo benchmark: Use local _data instead of _global DNS Cache: Also check inside the DNS threads qhostinfo benchmark: Benchmark the with-cache and without-cache tst_qftp: Do not use 1.2.3.4 as IP Dont use gestures if there is no touch screen. showFullscreen() broken if UnifiedTitleAndToolBarOnMac is enabled Fix atk warning on startup in Qt apps wit QGtkStyle Do not use realpath() with uclibc
| | * Do not use realpath() with uclibcMarkus Goetz2010-03-041-0/+3
| | | | | | | | | | | | | | | Task-number: QTBUG-8365 Reviewed-by: denis
| * | Fix tst_QVariant::operator_eq_eq(UserType)Olivier Goffart2010-03-041-0/+3
| | | | | | | | | | | | | | | | | | It was comparing uninitialized memory. Reviewed-by: Thierry
| * | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-031-1/+2
| |\ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QVariant: Fix crash when comparing two variant with the same undefined type. Fix compositing when QWS background is completely transparent. Fixes wrong composition mode for cached backgrounds in Graphics View. Support keypad input with vnc driver
| | * QVariant: Fix crash when comparing two variant with the same undefined type.Olivier Goffart2010-03-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the type is the same, but not registered, the returned string could be null (or empty if a empty string was registered) In that case, QVariant compare() function would access invalid memory. Protect against that case. qstrcmp returns 0 if 0 is given as a parametter. Task-number: QTBUG-8700 Reviewed-by: Markus Goetz
| * | Follow-up to c1b067e: fix aliasing in QReadWriteLock too.Thiago Macieira2010-03-031-18/+12
| |/ | | | | | | | | | | | | The same pattern used in QMutexLocker was used in QReadLocker and QWriteLocker. Reviewed-by: Trust Me
| * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-031-9/+6
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | * Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-021-9/+6
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: update russian translations and phrasebook Allow platform specific values for the double click radius. Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension. QNAM HTTP: Fix invoking a method when being destructed right now QAbstractSocket: Use new faster DNS function Add DNS caching to QHostInfo Make the icon visible when set on an action in a QSystemTrayIcon on Mac Carbon : Setting palette brush to a pixmap does not work.
| | | * Fix strict-aliasing breakage with SunCC: the union trick is a GCC extension.Thiago Macieira2010-03-021-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's probably also an MSVC extension, because the MSVC compiler has never complained about this fact, nor generated unintended code. Anyway, the only way is to reinterpret_cast the quintptr. It's not an aliasing violation to do it because we never access the integer as anything other than quintptr. Reviewed-By: Bradley T. Hughes
| * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-022-2/+2
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QString::section: Fix crash with SectionIncludeLeadingSep flag Expand indicator would not be displayed after removal of a collapsed item's child Compile with GCC 3.3 Fixed rendering bugs when scrolling graphics items with drop shadows. 2nd part of revert of commit 435bbd4be73768f617e4a Revert "ItemViews: make it possible for chekcable items to get partiallyChecked" Prevented assert on 1 pixel wide / high images in qt_blurImage. skip tst_QDialog::throwInExec on WinCE, ARM platform Fix licenseCheck autotest Fixes: ODBC Driver expects 16bit when system is 32bit Make composition modes work better for DirectFB Don't disable alpha when filling with opaque color Add support for composition mode DSPD_DST in DFB Uncomment #DIRECTFB_DRAWINGOPERATIONS in pri-file Fix build breakage in windowflags example
| | * | QString::section: Fix crash with SectionIncludeLeadingSep flagOlivier Goffart2010-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | And start is out of bounds. Reviewed-by: Thiago Reviewed-by: Joao Task-number: QTBUG-4306
| | * | Compile with GCC 3.3Olivier Goffart2010-03-021-1/+1
| | |/ | | | | | | | | | | | | Task-number: QTBUG-8554 Reviewed-by: Gabriel
| * | Symbian event dispatcher needs to run all active objects.Jani Hautakangas2010-03-021-1/+1
| |/ | | | | | | | | | | | | | | | | Symbian event dispatcher runs only active objects that have priority CActive::EPriorityIdle or above. CActive defines standard priorities but priority can be anything from KMinTInt to KMaxTInt Task-number: QTBUG-8654 Reviewed-by: axis
| * Doc: QRegExp::WillcardUnix: the documentation did not show the slashOlivier Goffart2010-03-011-2/+2
| | | | | | | | Reviewed-by: David Boddie
| * QObject: fix crash when deleteing the receiver object withing a ↵Olivier Goffart2010-03-011-7/+10
| | | | | | | | | | | | | | | | | | DirectConncetion involving two threads. We did not set the sender(), but we tried to reset it anyway. Task-number: QTBUG-7935 Reviewed-by: Brad
| * Added fullscreen support to softkeys in Symbian.Janne Anttila2010-03-012-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit enables the following two features: 1. Developer can make softkeys visible in fullscreen widget by setting the Qt::WindowSoftkeysVisibleHint window flag. This flag implememts intermediate mode for maximized and fullscreen modes. In maximized mode both statuspane and softkeys are visible, in fullscreen mode with WindowSoftkeysVisibleHint flag, only the softkeys are visible and in normal fullscreen mode both statuspane and softkeys are invisible. This feature was requested by QTBUG-5171. 2. Developer can make softkeys to respond to the key events even the softkeys are invisible. This means that when widget with Qt::WindowSoftkeysRespondHint window flag is shown in fullsreen, the softkey HW key events are routed to invisible softkeys and softkeys trigger the action associated to pressed softkey button. If the flag is not set, the key event will be passed to application/focused widget normally and softkey actions are not triggered. This feature was requested in QTBUG-4564. Both new flags are by default off. In addition, the softkey example is updated to demonstrate the new window flags. The commit also contains some code style fixes applied by my editor automatically to changed files. Task-number: QTBUG-5171 Task-number: QTBUG-4564 Reviewed-by: Jason Barron
| * Symbian file system use optimisation for stat and symlinksmread2010-02-261-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | Symbian implementation of fileFlags calls both doStat and isSymlink resulting in calls to both stat and lstat. However most of the time, ie when accessing a normal file rather than a symlink, lstat gives all the information we require. So this change uses lstat where possible, and caches its result for both doStat and isSymlink. During start of DesktopServices app, this cuts calls to stat/lstat by 45%. Reviewed-by: Shane Kearns
generated by cgit v0.12 at 2024-09-24 10:16:04 (GMT)