summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-23206-13238/+10588
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (114 commits) Fix the test of QDirIterator with NoDot and NoDotDot Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDot QFSFileEngine: don't look through NTFS junctions After showing modal windows, WM_LBUTTONUP for double click is ignored. Possible fix for missing QML properties in the qt.qhp file. Use standard theme icons in Linguist where possible Use more standard icons from the theme in Assistant Use more standard icons for standard actions in Designer Drag & drop operations wont end while using Remote Desktop sessions _close(fd) closes the associated handle and not the other way around Fixed locale mapping on Symbian. Revert change 7bf4512659 on Cocoa. Extended the high_attributes array, since we have more than 127 widget attributes now. Added instructions for MinGW users wanting to build the MySQL driver. Designer: Fix broken resource view. Add missing ,. get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning ...
| * Fix the test of QDirIterator with NoDot and NoDotDotBenjamin Poulain2010-03-231-3/+3
| | | | | | | | | | The test introduce by c6ef7c0cbd2ad7ac486cd6bcabaac4d090df0c03 would not work because no file would match the filter.
| * Split QDir::NoDotAndDotDot into QDir::NoDot and QDir::NoDotDotBernhard Rosenkraenzer2010-03-234-3/+61
| | | | | | | | | | | | | | | | This creates QDir::NoDot and QDir::NoDotDot filters -- in many cases, one may want the .. entry (e.g. to navigate to the parent directory) but not the . entry (useless for navigation). Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| * QFSFileEngine: don't look through NTFS junctionsRitt Konstantin2010-03-231-8/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting in 1216161584b730576c24fb128131838be1826b37, we started processing NTFS junctions as symbolic link. This reverts isSymlink() behavior back to former behavior and processes only symbolic junctions. The code path there worked just fine for directory symbolic links but lead to multiple issues for volume mount point junctions due to incompleteness. Task-number: QTBUG-7036, QTBUG-7384 Merge-request: 493 Reviewed-by: João Abecasis <joao@trolltech.com>
| * After showing modal windows, WM_LBUTTONUP for double click is ignored.Prasanth Ullattil2010-03-231-0/+4
| | | | | | | | | | | | | | | | We should not ignore WM_xBUTTONUP messages after WM_xBUTTONDBLCLK. Treat these messages like WM_xBUTTONDOWN messages. Task-number: QTBUG-7172 Reviewed-by: Thierry
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-2313-35/+137
| |\
| | * Use standard theme icons in Linguist where possibleThorbjørn Lindeijer2010-03-231-11/+33
| | | | | | | | | | | | Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| | * Use more standard icons from the theme in AssistantThorbjørn Lindeijer2010-03-232-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added standard theme icons for New Tab, Close, Page Setup, Print Preview, Quit, New Bookmark and About actions. Also adjusted the File menu to look a bit more standard (moved New Tab action to the top). Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| | * Use more standard icons for standard actions in DesignerThorbjørn Lindeijer2010-03-232-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added standard theme icons for Save As, Print, Close, Quit, Recent Files and Clear Recent Files. Also slighly optimize non-X11 platforms by not calling QIcon::fromTheme at all. Reviewed-by: Jens Bache-Wiig <jbache@trolltech.com>
| | * Drag & drop operations wont end while using Remote Desktop sessionsPrasanth Ullattil2010-03-231-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The button state passed in the OleDropSource::QueryContinueDrag() contains wrong information. We need to query the state of individual buttons like we do in Windows CE. Task-number: QTBUG-6604 Reviewed-by: Denis
| | * _close(fd) closes the associated handle and not the other way aroundJoão Abecasis2010-03-234-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... according to the online MSDN documentation. Hid the cachedFd member in private data under WinCE, since it's never used there. Task-number: QTBUG-9085 Reviewed-by: Zeno Albisser
| | * Fixed locale mapping on Symbian.Denis Dzyubenko2010-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | Changed mapping to map Serbian locale on Symbian to sr_RS locale. Author: dka Reviewed-by: dka
| | * Revert change 7bf4512659 on Cocoa.Morten Johan Sørvig2010-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds a workarond where we call show() on the popup in QCompleter::setPopup. Unfortunately this causes unnecessary startup delays and popup flicker in Creator. The original bug reports (254456 and 254460) are not reproducible on Cocoa.
| | * Extended the high_attributes array, since we have more than 127 widget ↵Robert Griebl2010-03-231-1/+1
| | | | | | | | | | | | | | | | | | attributes now. Reviewed-by: TrustMe
| * | Possible fix for missing QML properties in the qt.qhp file.Martin Smith2010-03-234-23/+126
| |/ | | | | | | | | | | Also adds more QML stuff to qt.index. Task: QTBUG-7724
| * Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7Martin Smith2010-03-23142-12954/+8653
| |\
| | * Designer: Fix broken resource view.Friedemann Kleint2010-03-231-1/+2
| | | | | | | | | | | | | | | | | | Resource handling broken as a side effect of 62c72ed2fd4aa6f5e62a190abf2dde2ba0f5ff0b . Task-number: QTBUG-9262
| | * Add missing ,.Aaron McCarthy2010-03-231-1/+1
| | |
| | * Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-23183-13167/+10188
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (98 commits) get rid of build warning messages Quiet unnecessary configure/qmake warnings when EPOCROOT is not set. Add configure test for Maemo Internet Connection Daemon. fix warning Rename getter function used in test also. Revert "Avoid a data relocation by not trying to store a pointer in the .data section of plugins." Make QStackTextEngine cheaper to construct Add a function to get the transitions available from a state Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2). Code cleaning for the QStringList's joinEmptiness() test case Fix behavior change QStringList::join() for null Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets. Cocoa: fix eventdispatcher crash, found by macgui autotest Make QWidget::activateWindow() NET window manager aware. Upgraded QLocale data to Unicode CLDR 1.8.0 Improved CLDR parser. Fixed reading draft data from CLDR. Improved the cldr parser for QLocale. Do not use FSEvents-based filesystemwatcher backend on Mac. add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817 ...
| | | * Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-235-63/+57
| | | |\ | | | | | | | | | | | | | | | | | | | | Conflicts: src/gui/itemviews/qabstractitemview.cpp
| | | * | get rid of build warning messagesLorn Potter2010-03-231-6/+2
| | | | |
| | | * | Quiet unnecessary configure/qmake warnings when EPOCROOT is not set.Aaron McCarthy2010-03-232-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Warnings are unnecessary when not building for Symbian. Task-number: QTBUG-9156
| | | * | Add configure test for Maemo Internet Connection Daemon.Aaron McCarthy2010-03-235-5/+111
| | | | | | | | | | | | | | | | | | | | Task: QTBUG-9156
| | | * | fix warningLorn Potter2010-03-231-1/+1
| | | | |
| | | * | Rename getter function used in test also.Aaron McCarthy2010-03-231-5/+5
| | | | |
| | | * | Revert "Avoid a data relocation by not trying to store a pointer in the ↵Rohan McGovern2010-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | .data section of plugins." This commit is causing almost any autotest which loads a plugin to crash, if Qt is configured with -qtnamespace and -qtlibinfix. This reverts commit 69e873e2bfae3fc028c21d93112a75008c3bb58b.
| | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-22177-13132/+10047
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (92 commits) Make QStackTextEngine cheaper to construct Add a function to get the transitions available from a state Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2). Code cleaning for the QStringList's joinEmptiness() test case Fix behavior change QStringList::join() for null Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets. Cocoa: fix eventdispatcher crash, found by macgui autotest Make QWidget::activateWindow() NET window manager aware. Upgraded QLocale data to Unicode CLDR 1.8.0 Improved CLDR parser. Fixed reading draft data from CLDR. Improved the cldr parser for QLocale. Do not use FSEvents-based filesystemwatcher backend on Mac. add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817 Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. ...
| | | | * | Make QStackTextEngine cheaper to constructAndreas Kling2010-03-221-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default-constructing the QFont member of QTextEngine meant getting the QApplication::font() which is a waste of time. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | Add a function to get the transitions available from a stateKent Hansen2010-03-223-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For introspection purposes. It's nicer than having to qobject_cast the state's children(). Task-number: QTBUG-7741 Reviewed-by: Eskil Abrahamsen Blomfeldt
| | | | * | Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets (part 2).Robert Griebl2010-03-222-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot the documentation and ignoring WM_TAKE_FOCUS messages for modal windows in part 1 (9da453e5579ebb6fb0361e4df4cfa7107e560b23) Reviewed-by: bhughes
| | | | * | Code cleaning for the QStringList's joinEmptiness() test caseBenjamin Poulain2010-03-221-4/+4
| | | | | |
| | | | * | Fix behavior change QStringList::join() for nullKenji Sugita2010-03-222-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before 4.6.2 both str.isNull() and str.isEmpty() return true for the following code. QStringList list; QString str = list.join(QString()); This commit revert the behavior change introduced by 7461ed5227e3002c4a6f74d458aa0255b7c1217d. Joining null QString was giving a empty string instead of a null string. Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| | | | * | Add a new WA_X11DoNotAcceptFocus attribute for top-level widgets.Robert Griebl2010-03-224-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should prevent window managers from ever sending a WM_TAKE_FOCUS message to those windows (useful for IM windows like virtual keyboards, notification banners, etc.) Reviewed-by: bhughes
| | | | * | Cocoa: fix eventdispatcher crash, found by macgui autotestRichard Moe Gustavsen2010-03-222-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some cases, we end up deleting a widget before we get to end the modal session that might be attached to it. And that will cause a crash. This patch retains/releases the underlying NSWindow, so we always have a valid reference as long as the modal session is alive. Reviewed-by: msorvig
| | | | * | Make QWidget::activateWindow() NET window manager aware.Robert Griebl2010-03-223-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the _NET_ACTIVE_WINDOW atom if the current window manager supports it - otherwise fall back to XSetInputFocus() Reviewed-by: bhughes
| | | | * | Upgraded QLocale data to Unicode CLDR 1.8.0Denis Dzyubenko2010-03-227-11124/+4403
| | | | | | | | | | | | | | | | | | | | | | | | Reviewed-by: Frans Englich
| | | | * | Improved CLDR parser.Denis Dzyubenko2010-03-222-17/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for "defaultNumberingSystem" element to get the right numeric information (decimal point, group separator, zero digit etc). Also fixed xpaths to the AM/PM text for CLDR 1.8.0 Reviewed-by: trustme
| | | | * | Fixed reading draft data from CLDR.Denis Dzyubenko2010-03-222-20/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When draft resolution is specified we should accept it and all values "above" it. For example if we are searching for a group separator with a "contributed" resolution, we should also accept data that is "approved". In theory we should only accept data with "contributed" or "approved" resolutions and should not trust other resolutions. However in order not to introduce data regressions to QLocale we will only handle drafts for new data. Reviewed-by: Frans Englich
| | | | * | Improved the cldr parser for QLocale.Denis Dzyubenko2010-03-222-169/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I believe now we parse the CLDR properly. If a data is not present in a file, we remove the last part of the filename and try again. And we should do the same if a file is an alias to some other file. For example az_AZ.xml is an alias to az_Latn_AZ.xml which itself falls back to az_Latn.xml and then to az.xml Reviewed-by: Frans Englich
| | | | * | Do not use FSEvents-based filesystemwatcher backend on Mac.Denis Dzyubenko2010-03-222-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removing the usage of FSEvents-based backend for now as it has a few bugs that cannot be fixed right away. We will rewise it later and fallback to kqueue-based backend for the moment. Also added a test case that triggers a bug in the FSEvents file system watcher. Reviewed-by: trustme
| | | | * | add file missing in commit 74f5e34979b8a08a91aa3c2fa6d252e68eca7817Lars Knoll2010-03-221-0/+442
| | | | | |
| | | | * | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-22154-1810/+4762
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (78 commits) Moc: Add support for rvalue references in signals and slots. Add support for polyphonic greek Fix build failure on WinCE. Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors ...
| | | | | * | Moc: Add support for rvalue references in signals and slots.Thiago Macieira2010-03-222-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reviewed-By: Simon Hausmann
| | | | | * | Add support for polyphonic greekLars Knoll2010-03-226-24/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge patch c0006e05f32ecd6f16825b799d2bce345c166433 from harfbuzz and add autotests to QTextScriptEngine. Support for polyphonic greek is implemented by mapping decomposed greek character sequences to their composed characters in the greek extended unicode range (U+1f00 - U+1fff). Task-number: QTBUG-391 Reviewed-By: Simon Hausmann
| * | | | | | Added instructions for MinGW users wanting to build the MySQL driver.Martin Smith2010-03-231-0/+67
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Task: QTBUG-9250
| * | | | | Merge remote branch 'origin/4.7' into oslo-staging-1Aaron McCarthy2010-03-2225-260/+661
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qgl_threads/qgl_threads.pro
| * | | | | | Fix build failure on WinCE.Aaron McCarthy2010-03-221-0/+4
| | | | | | |
| * | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-21145-1811/+4575
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (75 commits) Autotests: if you use X11 libs, you must link to X11 libs explicitly. Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile any time soon with C++0x Compile Phonon in C++0x mode. Compile Qt in C++0x mode. Avoid a data relocation by not trying to store a pointer in the .data section of plugins. Fix cast-from-ascii warning Fix compilation on Linux Fix compilation with WINSCW: #include doesn't find files in the same dir Rename m_volume to m_vol Add 2 signals, introduce side widget, make it possible to reset startId Do not create native window handle just because a parent has one. Tab color fix for document mode on Snow Leopard. Revert "Don't emit open signal on session close/error." Rename networkAccess property to networkAccessible. Don't emit open signal on session close/error. Rename private signal. Autotest: fix instability by accepting rounding errors Dont force height for filter widget - Fix importdir option on unix/linux configure Remove incorrect semi-colons after Q_PROPERTY ...
| | * | | | | | Autotests: if you use X11 libs, you must link to X11 libs explicitly.Thiago Macieira2010-03-214-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solaris linker complains if you don't. Plus it's the right thing to do
| | * | | | | | Disable C++0x mode for QtWebKit and QtScript since WebKit will not compile ↵Thiago Macieira2010-03-202-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | any time soon with C++0x