summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Send the hoverLeave not properly sent on the widget inside QGPW.Alexis Menard2012-01-312-2/+64
| | | | | | | | We need to send the hover leave event on the proper receiver in case the widget we embed in a complex hierarchy not the widget itself. Task-number:QTBUG-6986 Reviewed-by:bnilsen
* Support exception handling in QtConcurrent::run()Morten Johan Sørvig2012-01-312-2/+62
| | | | | Use QFutureInterface::reportException() in the same way that we do in QtConcurrent::map().
* Make QtUiTools use the lib-infix passed to configure.Friedemann Kleint2012-01-312-4/+6
| | | | | | | Patch contributed by OpenEmbedded project. Reviewed-by: hjk Task-number: QTBUG-7169
* There is no predefined qmake x11 scope for x11 builds.Robert Griebl2012-01-312-0/+4
| | | | | | | | | | | | All the autotests that are using a x11{} scope to add QMAKE_LIBS_X11 to LIBS are actually not adding anything at all, but just happen to build correctly because the standard GNU ld resolves symbols in shared libraries recursively (and libQtGui depends on all those X libs already). Building those tests with GNU gold will lead to undefined X* symbols, since gold doesn't use implicitly dependant libs to resolve symbols. Reviewed-by: Harald Fernengel
* avoid infinite recursion in canonicalized() if cwd is a symlinkRitt Konstantin2012-01-312-3/+29
| | | | | | | | | | | | | if current directory is a symlink to another directory on the same drive (the simplest example; say, c:\current\dir is a symlink to c:\target) then the first valid prefix for "c:\target" in canonicalized() is "c:" (NOT "c:\") and would be treated like "c:\current\dir" again...and again... until stack overflow :) Merge-Request: 494 Task-number: QTBUG-7610 Reviewed-by: Zeno Albisser
* Fix memory leak in XSD component of XmlPatternsHonglei Zhang2012-01-3110-25/+25
| | | | | | | | | | | | There are couple of memory leaks in XmlPatterns when parsing XSD files. The reason is that the module over uses the shared data pointer and generates many cyclic reference loop. Some part of the code is refactored. Instead of using shared data pointer, normal C++ pointer is used to break the ownership loop. This is bug fix for QTBUG-8948. Task-number: QTBUG-8948 Reviewed-by: Sami Merila and Laszlo Agocs
* QNAM: Do not cache network connections per username.Robert Hogan2012-01-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | If user information is present in the Url, QNetworkAccessHttpBackend will cache the connection with a key in the format of user@hostname. This causes the following tests in QtWebKit to fail: LayoutTests/http/tests/xmlhttprequest/re-login.html LayoutTests/http/tests/xmlhttprequest/re-login-async.html The tests call the same url with user1 credentials, no credentials, user 2 credentials and no credentials. In the second and fourth calls Qt should use the most recently stored credentials. For the fourth call it currently uses user1's credentials instead of user2's. This is because it retrieves the cached connection from the third call and uses the user/pass in that connection's authenticator - which is user1's. In order to retrieve the connection with the most recently used credentials userinfo should be removed when caching the connection in QNetworkAccessCache. This will allow Qt to retrieve the connection used in the third call, in fact the same cached connection for all four calls. Merge-request: 623 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
* Fix painting of overlines in labels.Gunnar Sletta2012-01-311-1/+1
| | | | | | | | | | | If the size of the widget is an odd number, the layout rect will be positioned at a 0.5 offset. The clipping set further below will snap this to 1 and thus clip away the anything drawn on the first row of pixels. Fix this by aligning the rectangle we get by layout rect. Reviewed-by: Eskil Task: http://bugreports.qt.nokia.com/browse/QTBUG-9684
* Avoid repeatedly trying to load unloadable plugins, causing slownessaavit2012-01-311-2/+7
| | | | | | | | | | | | | | In certain uncommon situations, where different Qt versions are used on the same system, the plugin caching optimization may identify a dll as a valid plugin, even though it will later fail to load. This fix will avoid that Qt repeatdly tries to reopen such dlls, something which caused a significant performance hit in these cases. E.g. where Qt would unsuccessfully try to load a number of KDE image format plugins for every image loading operation. Task-number: QTBUG-10066 Reviewed-by: thiago Reviewed-by: janarve
* Fix to allow upper- and lowercase .dll suffix on windowsZeno Albisser2012-01-312-2/+10
| | | | | | | This fix is needed since windows uses case insensitive filesystems. Reviewed-by: Joao Task-number: QTBUG-10305
* Fix conversion between QVariant and QScriptValue.Jedrzej Nowacki2012-01-313-5/+51
| | | | | | | | | | Function converting from QVariant to QScriptValue is smart and tries to unwrap a value. So QVariant(1234) after conversion will be equal to QScriptValue(1234). It is ok, but QVariant(QVariant(...)) should be unpacked only once. Reviewed-by: Kent Hansen Task-number: QTBUG-10315
* QComboBox::modelColumn was not respected when selecting an itemGabriel de Dietrich2012-01-313-4/+30
| | | | | | | Auto-test included Reviewed-by: Olivier Task-number: QTBUG-10491
* Use WS_POPUP window style more often on windows.Prasanth Ullattil2012-01-311-11/+12
| | | | | | | | | | We dont use the WS_POPUP style when one of the following window flags are set (WindowSystemMenuHint, WindowTitleHint, WindowMinMaxButtonsHint WindowCloseButtonHint, WindowContextHelpButtonHint). None of these flags can conflict with this style, hence being removed. Task-number: QTBUG-10589 Reviewed-by: Denis
* Auto expand of QTreeWidget does not work correctly if animatedThierry Bastian2012-01-313-5/+7
| | | | | | | The problem was that the internal state of the tree was not correctly reset. Patch comes from the task. Task-number: QTBUG-10850
* Fix progressbar animation on VistaJens Bache-Wiig2012-01-311-5/+4
| | | | | | | | | | | This fixes two issues. - The indeterminate animation was sometimes incorrectly disabled when value was 0 - The progress animation was incorrectly stopped when progress bars were disabled Task-number: QTBUG-10957 Reviewed-by: richard
* Adjust handling of library .bundle on MacZeno Albisser2012-01-311-4/+8
| | | | | | | | | QLibrary::isLibrary() returns true for files with the sufix .bundle. But we did not use to determine the proper library within the bundle in that case. Reviewed-by: Fabien Freling Task-number: QTBUG-11217
* Fix the blank areas during resize with the raster engine on Mac OS X.Fabien Freling2012-01-313-18/+7
| | | | | | | | This is mainly done by reverting the commit 04e34fe3aecca482abeeabe2e31778e9102eeb08 Task-number: QTBUG-11518 Reviewed-by: Samuel
* Setting a timeSpec on QDateTimeEdit breaks the edit when only time is shownFrederik Gladhorn2012-01-312-0/+31
| | | | | | | | | | | Because of the time zone change we get an "overflow" in the min and max time. For example min 00:00:00 becomes 01:00:00 and max 23:59:59 becomes 00:59:59 which is an invalid time span and the displayed time gets fixed to the newly set min/max value. Autotest included. Task-number: QTBUG-12384 Reviewed-by: Gabriel
* Cocoa: QShortcut(Qt::Key_Enter) does not show in the menu barRichard Moe Gustavsen2012-01-312-71/+104
| | | | | | | | | | | | The reason is that cocoa expects the unicode control character for "enter", rather than the glyph showing an arrow. So rather than using the glyph-table from QKeySequence, we should use a table containing a mapping from Qt::Key to Cocoa control key. Luckily, such a table exists allready in qt_cocoa_helpers, but reversed ( cocoa key to Qt::Key). So this patch creates a function that binds all this together. Reviewed-by: cduclos
* ShortcutOverride has no effect on some shortcuts on Mac OS X (Cocoa).Prasanth Ullattil2012-01-312-8/+36
| | | | | | | | | | | | | | When generating the native key sequences for menu items, Qt prefers the non private unicode characters. But the characters in the NSEvent for keyboard events can contain characters form the unicode range reserved for Apple. For e.g. when user presses the "delete" key, the event contains NSDeleteFunctionKey, where in Qt is expecting NSDeleteCharacter. For now this is the only key identified for translation. If we find similar translations, those can be added to qt_mac_removePrivateUnicode(). Task-number: QTBUG-12495 Reviewed-by: Denis
* Disable selection of Libraries on Windows 7 in getExistingDirectory().Prasanth Ullattil2012-01-311-1/+1
| | | | | | | | | | | | The Libraries on Windows 7 are user-defined collection of folders, which is only a logical representation. There are no file system entries associated with it . This patch makes sure that user cannot choose a library when using the QFileDialog::getExistingDirectory(), in such cases it will show a standard windows warning message. Task-number: QTBUG-12655 Reviewed-by: Thierry Bastian
* QMetaType: add "signed char" as builtin.Olivier Goffart2012-01-313-0/+7
| | | | | | | | | | | | According to the c++ specificaiton, 3.9.1 [basic.fundamentals] Plain char, signed char, and unsigned char are three distinct types In QMetaType, I decide that 'signed char' alias with 'char' This allow qint8 to work nice (and which is already registered as an alias to char (QMetaType::Char) Reviewed-by: Joao Task-number: QTBUG-12920
* Mac Style: Compile FixMartin Petersson2012-01-311-1/+1
| | | | | Task-number: QTBUG-13055 Reviewed-by: Markus Goetz
* Fix corner of scroll area so it is stylable on Mac.Martin Petersson2012-01-311-1/+1
| | | | | Task-number: QTBUG-13055 Reviewed-by: Olivier Goffart
* Keep other text format with QTextOption::SuppressColors tag onJiang Jiang2012-01-311-2/+6
| | | | | | | | | | Setting the QTextOption::SuppressColors tag on a QTextDocument breaks all text format, not just colors. This patch fix this by selectively ignoring color properties in the format and keeping other properties. Task-number: QTBUG-13090 Reviewed-by: Eskil
* let generated flag control SQL generationMark Brand2012-01-318-42/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, if QSqlField's QVariant value had type "invalid", this caused the field to be omitted in data-changing SQL statements generated from QSqlRecord edit buffers. Complaints against this mechanism: - It precludes initializing value type to field type, which would otherwise seem sensible and useful, such as when using model.data() in contexts where the field type is not readily available. - QSqlField::clear() does initialize value type to match field type and so is incompatible with this mechanism. - Problems such as described in QTBUG-13211. - Unwanted distinction between "invalid" and "null" when mapping field values to SQL values. - QSqlField's generated flag already provides a mechanism for controlling SQL generation. These complaints are redressed here by replacing this mechanism with reliance on QSqlField's generated flag. The flag is initialized to false in new edit records and set to true when a value is set. Applications can still manipulate generated flags directly to control SQL generation. Generation of SELECT statements already used the generated flag and is unaffected by this change. Merge-request: 1114 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com> Reviewed-by: Michael Goddard
* QNAM HTTP: Do not set cache headers when already set by userRobert Hogan2012-01-311-4/+6
| | | | | | | | | | | | | | Qt clobbers the cache-control headers set by WebCore when CacheLoadControlAttribute == QNetworkRequest::AlwaysNetwork. This causes at least one QtWebKit layout test to fail: http/tests/misc/refresh-headers.php Qt needs to detect if the client has already made a cache-control decision in the headers before overwriting them. See https://bugs.webkit.org/show_bug.cgi?id=45598 Task-Number: QTBUG-13564 Merge-request: 2472 Reviewed-by: Markus Goetz <Markus.Goetz@nokia.com>
* Mac: Center the Window title on Cocoa.Martin Petersson2012-01-311-0/+2
| | | | | Task-number: QTBUG-13593 Reviewed-by: Richard Moe Gustavsen
* Fix several errors with shaping of Indic scriptspravin.d.s2012-01-311-9/+14
| | | | | | | | | | | | | | | | 1. The opentype init feature was applied to some characters even when the character appeared inside a word. 2. Using the ZWJ to separate Ra and Halant Ya should connect the two latter characters and form a Yaphala 3. Some Oriya chars were not correctly marked as below-base form. Task-number: QTBUG-13620, QTBUG-13616, QTBUG-13542 Merge-request: 2484 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
* Mac: add support for closing dialogs using Cmd-DRichard Moe Gustavsen2012-01-311-0/+8
| | | | | | | This is how dialogs work natively on Mac; you can choose the "Don't Save" button by using the shortcut "Cmd-D" Rev-By: jbache
* Move advances for control character in Indic syllable shapingJiang Jiang2012-01-312-0/+18
| | | | | | | | | | | When handling control characters (ZWJ, ZWNJ) in Indic syllables, we only moved glyphs and attributes of the item, advances should also be moved forward, otherwise we will use the advance of ZWJ/ ZWNJ for the part of syllable, which is normally zero, it results some positioning problems. Task-number: QTBUG-14204 Reviewed-by: Lars Knoll
* Make application font family names locale sensitive in X11Jiang Jiang2012-01-312-2/+24
| | | | | | | | | | | So that they will match the family names returned by QFontDatabase::families. Because the family names returned by FcFreeTypeQueryFace are not sorted with locale as the names returned by FcFontList, we have to find out the family name matching the system language in the former case. Task-number: QTBUG-14269 Reviewed-by: Eskil
* The completer in an itemview would not be activated right awayThierry Bastian2012-01-312-3/+43
| | | | | | | | | | If you have set the edit triggers to AnyKeyPressed and you press a key the completer would not kick in because the key event would come before the lineedit gets focus. The completer is only active when the lineedit has focus. Task-number: QTBUG14363 Reviewed-by: ogoffart
* Fix regression in ListViewJens Bache-Wiig2012-01-311-4/+4
| | | | | | | | This reverts commit d91a8f3a5dbcf3e4c4c0afb28463b25e192b00e4 and introduces a minimal fix for the original crash report. Task-number: QTBUG-21433 Reviewed-by: gabriel
* Fixed a possible crash when resizing QListViewThierry Bastian2012-01-311-3/+4
| | | | | | | | The problem is that the layout code was called recursively because the visibility of the scroll bars was constently changed. Task-Number: QTBUG-14412 Reviewed-By: ogoffart
* make the modifySemaphore() signal-safe on linuxRitt Konstantin2012-01-311-1/+6
| | | | | | | | | | as POSIX man says, if semop() is interrupted by a signal, it shall return -1 and set errno to EINTR. in qcore_unix_p.h, we have EINTR_LOOP helper macro exactly for such cases ;) Task-number: QTBUG-14434 Merge-request: 998 Reviewed-by: Olivier Goffart
* fix QEventLoop::X11ExcludeTimers with Glib event loop=l.lunak2012-01-311-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | When GSource prepare or check functions return TRUE, Glib does not necessary call the dispatch function immediatelly (probably depends on the ordering of processing events). This means that timerSourceDispatch() may get called from different call of QEventDispatcherGlib::processEvents() than its accompanying timerSourcePrepareHelper() or timerSourceCheckHelper(). This is a problem if a timer becomes pending during a normal processEvents() call but will only be executed during a call to processEvents() with QEventLoop::X11ExcludeTimers. The attached patch fixes this problem by rescheduling the timer for another pass. As for a testcase, this happens when making LibreOffice's KDE integration use Qt event loop, requires setting the useEventLoop property on the QClipboard object, so I'm afraid I don't have anything simple. But fact that Glib can keep an event pending for a little moment is rather obvious from its sources or can be triggered from any Qt application, and I hope the rest is an obvious consequence. Merge-request: 2492 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
* Bump Qt version to 4.7.5Marko Valtanen2012-01-3120-42/+42
|
* Windows: Activate the context menu on tray icons when shown.Martin Petersson2012-01-311-0/+1
| | | | | Task-number: QTBUG-14807 Reviewed-by: Markus Goetz
* Don't crash when null-pointer is passed to qScriptValueFromValue()Kent Hansen2012-01-312-4/+8
| | | | | | | | | | | | qScriptValueFromValue_helper() (or rather, QScriptEnginePrivate::create()) will fall back to wrapping the value using newVariant(), so there is no reason for the QVariant specialization to check the return value. (In particular, if the return value was invalid, that's _because_ the engine was null, so we should definitely not call a function on the engine.) Task-number: QTBUG-14842 Reviewed-by: Jedrzej Nowacki
* QLocalSocket: fix abort on Windows.Martin Petersson2012-01-311-0/+5
| | | | | | | | | The socket will not close as long as there are bytes left to write. So by deleting the pipeWriter bytesToTrite will be 0 and the socket will close directly. Task-number: QTBUG-14939 Reviewed-by: Joerg Bornemann
* QFileSystemWatcher: Do not require QApplication in the destructor.Olivier Goffart2012-01-314-8/+23
| | | | | | | | | | | | QThread::quit() is threadsafe, and can safely (and should) be called from the parent thread. Using invokeMethod requires an instance of QCoreApplication. There is no reason we should depend on that. Task-number: QTBUG-15255 Task-number: QT-3305 Reviewed-by: Denis Reviewed-by: Brad
* Fixed a double selection in QFileDialog when savingThierry Bastian2012-01-311-0/+1
| | | | | Task-number: QTBUG-15504 Reviewed-by: Trust-Me
* QAbstractSocket: Fix waitForReadyRead infinite loop.Martin Petersson2012-01-311-2/+2
| | | | | | | Make sure that waitForReadyRead times out if the read buffer is full. Task-number: QTBUG-16123 Reviewed-by: Peter Hartmann
* Fix transformIsSimple in QGraphicsSceneJørgen Lind2012-01-311-18/+1
| | | | | | The transformIsSimple was a bit to restrictive Reviewed-by: bnilsen
* Fix reversed condition introduced in 9a6cfc07e5João Abecasis2012-01-311-1/+1
| | | | Reviewed-by: Bradley T. Hughes
* Check elapsed time only onceJoão Abecasis2012-01-311-2/+3
| | | | | Task-number: QTBUG-16262 Reviewed-by: Bradley T. Hughes
* QPrintPreviewDialog displays the second page instead of the first one when ↵Marko Valtanen2012-01-311-1/+1
| | | | | | it is initially shown maximized. Task-number: QTBUG-14517
* Stop using XLFD as fontconfig matching fallbackJiang Jiang2012-01-311-11/+0
| | | | | | | | | | | Following our kill list of moving away from XLFD, and since the result of XLFD is unreliable and problematic (it requires maintainence of fonts.dir/fonts.alias which people no longer care about), remove the usage of XLFD as a fallback for fontconfig matching. Task-number: QTBUG-17455 Reviewed-by: Eskil
* Place cursor at the end of the selected rangeJiang Jiang2012-01-311-1/+1
| | | | | | | | | Selected range is the range of the text that has been edited with input method, but not yet committed, normally the cursor should be placed that the end of it (or hidden). Task-number: QTBUG-17923 Reviewed-by: Morten Sørvig