summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-232-21/+14
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: API fixes to QGLBuffer.
| | * | | | API fixes to QGLBuffer.Rhys Weatherley2010-03-222-21/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use GLuint for bufferId(), not uint. Replace the raw bind() function with a raw release(), because that's the only useful case for being able to do a raw glBindBuffer(). Reviewed-by: Daniel Pope
| * | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-225-63/+57
| |\ \ \ \ \ | | |/ / / / | | | / / / | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix a problem with the selection losing items when layout is changed refactor connections/disconnections in QItemSelectionModel small little change to the initialization of item views disable copy of QPainterPathStroker as its not copiable. Added warnings on non-created buffer in QGLBuffer
| | * | | Fix a problem with the selection losing items when layout is changedThierry Bastian2010-03-221-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-2804 Reviewed-by: ogoffart
| | * | | refactor connections/disconnections in QItemSelectionModelThierry Bastian2010-03-222-60/+26
| | | | | | | | | | | | | | | | | | | | Ther was duplicated code and useless disconnections in the destructor
| | * | | small little change to the initialization of item viewsThierry Bastian2010-03-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | we don't need to calldoDelayedItemLayout, setting the flag that the widget needs the item layout is enough
| | * | | disable copy of QPainterPathStroker as its not copiable.Gunnar Sletta2010-03-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The introduction of QScopedPointer already broke source compat for this one, not compiling is better than crashing at runtime. Reviewed-by: Trond
| | * | | Added warnings on non-created buffer in QGLBufferGunnar Sletta2010-03-221-0/+24
| |/ / / | | | | | | | | | | | | Reviewed-by: Rhys Weatherley
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2010-03-222-10/+23
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fixed performance issues when falling back to raster for sub-pixmaps. Dragging headers in item views done right
| | * | Fixed performance issues when falling back to raster for sub-pixmaps.Samuel Rødal2010-03-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy the sub-pixmap so that we don't need to convert the entire pixmap to a QImage each time. Reviewed-by: Gunnar Sletta
| | * | Dragging headers in item views done rightGabriel de Dietrich2010-03-221-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, the dropped position depended on the position of the middle of the dragged header w.r.t. the hovered header. Now, it only depends on the mouse cursor position and the middle of the hovered header, closer to what happens on Windows or Mac OS. Reviewed-by: Thierry Task-number: QTBUG-6968
| * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-2292-1512/+2957
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (36 commits) Fixed updating the VKB display when inputting into QGraphicsWebView. Switched out QT_SOURCE_TREE, which is not defined for user apps. QS60Style: All itemviews should indicate selection with tick mark QS60Style assert fails to detect an index failure QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension Change fromSymbianRSgImage() to use the newer version of RSgImage Removed extra space from the command line passed to QProcess in Symbian installTranslatorFunctions doesn't work for custom global object fix QTabBar scroll button arrow position in Windows mobile style Revert "Optimize getting bearings of a glyph on Windows for true type fonts" stabilize tst_QAccessibility::comboBoxTest Enable s60main.rsc infixing. Improved qt_x11_wait_for_window_manager Virtual Keyboard and double tap for Symbian support Whitespace Better handling for NOTIFY in QGraphicsWidget regarding geometry changes Add NOTIFY to size property so QML bindings are working fine. Implement Q_PRIVATE_PROPERTY that allows you to declare properties Don't assert in QScriptValue::call() ...
| | * \ \ Merge branch '4.6-s60' into 4.7-s60axis2010-03-2292-1511/+2956
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.exe mkspecs/common/symbian/symbian.conf src/gui/graphicsview/qgraphicswidget.h src/gui/kernel/qapplication.cpp src/gui/text/qtextlayout.cpp src/openvg/qpixmapdata_vg.cpp src/s60installs/s60installs.pro tools/runonphone/main.cpp tools/runonphone/serenum_unix.cpp qtextlayout.cpp fixed up together with Eskil. Kept the configure.exe from 4.7 without recompile.
| | | * | | Fixed updating the VKB display when inputting into QGraphicsWebView.axis2010-03-223-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Task: QT-2990 Task: https://bugs.webkit.org/show_bug.cgi?id=36292 RevBy: Simon Hausmann
| | | * | | QS60Style: All itemviews should indicate selection with tick markSami Merila2010-03-221-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In QS60Style, all itemviews should indicate selection/multiselection with tick mark. Unfortunately it now uses object casting to QListView currently to check the viability of widget to have tick mark. Thus, it fails for QTreeViews and QTableViews. Changing object casting to QAbstractItemView to support all item views. Task-number: QTBUG-9212 Reviewed-by: Alessandro Portale
| | | * | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵Qt Continuous Integration System2010-03-221-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: QS60Style assert fails to detect an index failure
| | | | * | | QS60Style assert fails to detect an index failureSami Merila2010-03-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QS60Style asserts that a given index is correct when setting theme colors. Unfortunately it uses less-and-equal-to operator ('<='), which is incorrect. It should use less-than ('<')operator, otherwise the assert fails when index is equal to number of items in the color table. Task-number: QT-3078 Reviewed-by: Alessandro Portale
| | | * | | | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-202-3/+119
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension
| | | | * \ \ \ Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-03-202-3/+119
| | | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QScriptClass-implemented constructors lead to application crash Improve test coverage of QScriptClass::Callable extension