summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QmlViewer: Translate UIKai Koehne2011-05-028-126/+143
| | | | | | | | | Install translators for the Qt & QmlViewer translations. also add QT_NO_CAST_FROM_ASCII, QT_NO_CAST_TO_ASCII to check for untranslated strings. Reviewed-by: Oswald Buddenhagen Task-number: QTBUG-14848
* Fix insert and scroll to bottom casemae2011-04-262-0/+23
| | | | | | | | | | | | | When using QtextCursor::insert() with a large text followed by setting the vertical scrollbar to its maximum value (scroll to bottom), QPlainTextEdit would not behave properly if a document size change was triggered by the insertion due to line wrapping. This was visible in Qt Creator. Auto test included. Reviewed-by: con
* Merge branch 'master' of ../qt-qml-stagingMichael Brasser2011-04-141809-96541/+116105
|\
| * Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-132-17/+12
| |\ | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Remove a race condition in SIGCHLD handler. Fix warnings about && inside ||
| | * Remove a race condition in SIGCHLD handler.Thiago Macieira2011-04-131-15/+10
| | | | | | | | | | | | | | | | | | | | | | | | If the SIGCHLD is delivered *just* as we're installing our handler, there's a race condition in the setting of the old handler. So instead rely on the OS to set it properly before it calls our handler. Reviewed-by: Olivier Goffart
| | * Fix warnings about && inside ||Thiago Macieira2011-04-131-2/+2
| | | | | | | | | | | | Reviewed-By: Trust Me
| * | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-1315-33/+160
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles Make sure removed QTextBlock is invalid Cocoa: Fixup wrong code in patch baaa5ae
| | * \ Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-1215-33/+160
| | |\ \
| | | * \ Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integrationQt Continuous Integration System2011-04-1210-31/+136
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: Allow enum values to be used as signal parameters ListModel::clear() should not clear roles
| | | | * | Allow enum values to be used as signal parametersBea Lam2011-04-128-28/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix does not work for enums declared outside of the class that emits the signal, since in this case it is not possible to access the metaobject of the class that declared the enum. However the fix makes a special case for the Qt namespace to allow enums in this namespace to be used. Task-number: QTBUG-15983 Change-Id: I6f72255b07010311a20fe068bd97c7db7b294d9b Reviewed-by: Aaron Kennedy
| | | | * | ListModel::clear() should not clear rolesBea Lam2011-04-122-3/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clearing a model and then appending a new object with a subset of the previous roles was causing a crash since ListModel cleared the roles and VisualDataModel did not, so VisualDataModel was requesting invalid roles. This could have been fixed by clearing the meta object and its property cache in in VisualDataModel but this is less efficient, and also the general use case is for model data to always have the same roles. Task-number: QTBUG-18587 Change-Id: Ib11d2292888ab7a41e772b1e11700cd665e94ae7 Reviewed-by: Michael Brasser
| | | * | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into ↵Qt Continuous Integration System2011-04-111-1/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging: Cocoa: Fixup wrong code in patch baaa5ae
| | | | * | | Cocoa: Fixup wrong code in patch baaa5aeRichard Moe Gustavsen2011-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sort of imbarassing, but baaa5ae went in before I checked that the old-behaviour-flag also worked. Which is didn't. This patch will make things good. Task-number: QTBUG-11481 Reviewed-by: jbache
| | | * | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵Qt Continuous Integration System2011-04-114-1/+23
| | | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Make sure removed QTextBlock is invalid
| | | | * | | | Make sure removed QTextBlock is invalidJiang Jiang2011-04-114-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the block is removed from document block map, we will mark the right node to the current head->freelist index, but it shouldn't be accessed directly, otherwise it can cause crash because of uninitialized node. Hence we need to check if a node index is equal to current freelist index. If so, it cannot be a valid block. Task-number: QTBUG-18500 Reviewed-by: Eskil
| * | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-123-54/+153
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Update XCreateWindow in qgl_X11egl.cpp Lancelot: support for custom keys added to protocol. API cleanup.
| | * \ \ \ \ \ \ Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-stagingaavit2011-04-121-1/+9
| | |\ \ \ \ \ \ \
| | | * | | | | | | Update XCreateWindow in qgl_X11egl.cppJuanZhao2011-04-121-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XCreateWindow should provide mask and colormap, or this may load XCreateWindow error in the server side. Merge-request: 1183 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
| | * | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-11769-2666/+49718
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (119 commits) Lancelot: support for custom keys added to protocol. API cleanup. Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name. [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. Add support for -unset <prop> option to qmake. make -markuntranslated work without -idbased fix conditional on shell type Cocoa: p1 bug fix: fix auto test regressions Ensure shared network session deleted from correct thread Revert "Remove SIGBUS emission from QNetworkSession destruction." Image w/ PreserveAspectFit has its width changed once more than needed. fix QLocalSocket::isValid() on Windows Cocoa: p1 bug fix: revert use of subWindowStacking Not possible to enter negative values to widgets with numeric fields QmlViewer: Enable remote qml debugging QDeclarativeDebug: Warn user for Qt configured with -no-declarative-debug Fix typos in QSharedPointer documentation. Improve Flickable dynamics and allow platform specific tweaking. ...
| | | * | | | | | | Lancelot: support for custom keys added to protocol. API cleanup.aavit2011-04-112-53/+144
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into ↵Qt Continuous Integration System2011-04-115-170/+180
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging: Updated QtOpenGL DEF file Updated QtOpenVG DEF file Updated QtGui DEF file for ARMV5 Updated DEF files
| | * \ \ \ \ \ \ \ \ Merge remote-tracking branch 'qt-releng-team/master'Eckhart Koppen2011-04-11902-11954/+53355
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Updated QtOpenGL DEF fileEckhart Koppen2011-04-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absented missig functions Reviewed-by: TrustMe
| | | * | | | | | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-08871-11658/+51823
| | | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtGuiu.def src/s60installs/bwins/QtOpenGLu.def src/s60installs/bwins/QtOpenVGu.def src/s60installs/eabi/QtOpenGLu.def src/s60installs/eabi/QtOpenVGu.def
| | | * | | | | | | | | | Updated QtOpenVG DEF fileEckhart Koppen2011-04-061-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new functions and absented missing functions Reviewed-by: TrustMe
| | | * | | | | | | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-0632-294/+1528
| | | |\ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-05820-77589/+55210
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (260 commits) Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Designer [Qt Creator integration]: Fix integrated property editor. Remove obsolete patch file Fix animation tests after merge Compilation fix for WinCE Handle the HTTP 418 reply properly in QNAM Fix compilation of libtiff with zlib 1.2.5 Make sure we don't use subpixel positions in full hinting mode Fixed underline offset after raster coordinate system change. QGLContext on EGL gets an additional QEglProperties static field applied to every window surface created. Remove duplicated test. Actually do use the properties parameter in ::createSurface for x11egl. Modified pvrqwswsegl.c to make PowerVR work for processors using flipbuffer chain Check that pixmap is not null before accessing it Add missing test file. Changing width of RTL positioner doesn't relayout Fix TextInput auto test failure on mac. PinchArea and Flickable don't work well enough together Do not set focus unnecessarily at window activation in Symbian ...
| | | * | | | | | | | | | | Merge remote-tracking branch 'qt-master/master'Eckhart Koppen2011-04-05820-77589/+55210
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/bwins/QtOpenVGu.def
| | * | \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-041-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: Updated QtGui DEF file for ARMV5
| | | * | | | | | | | | | | | Updated QtGui DEF file for ARMV5Eckhart Koppen2011-04-041-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added missing functions Reviewed-by: TrustMe
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-teamQt Continuous Integration System2011-04-01203-1099/+76879
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (124 commits) Updated DEF files opengl2: Make maximum cached glyph size configurable QWS: fix the software/hardware cursor switcher Fix horizontal centered text drawing without word wrap Remove Font Smoothing hack for OS X Revert "Fixed underline offset after raster coordinate system change." Fix the painting for widgets painting directly on screen. Unix configure: Add support for --sysroot Add a 'capabilities' flag to the marshaller and demarshaller Add a set of connection capabilities to QDBusConnection Move the main D-Bus session and system connections to the main thread Add a way to obtain the DBusConnection* pointer from a QDBusConnection Make the QIconvCodec on Unix not enforce the Latin1 codec. Fixed bad merges in GL windowsurface and get rid of redundant variable. Added WindowSurfaceFeature enum to QWindowSurface. Added preserved contents property to QWindowSurface. Fixed underline offset after raster coordinate system change. Designer: Fix tab order in action editor dialog. Fix crash and infinite recursion caused by previous commits tst_qlocale: improve failure message in tst_QLocale::macDefaultLocale ...
| | | * | | | | | | | | | | | Updated DEF filesEckhart Koppen2011-04-016-9/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Absented missing functions Reviewed-by: TrustMe
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging into ↵Qt Continuous Integration System2011-04-114-51/+38
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-symbian-staging: Remove workaround and fix properly Optimize loc.prf for localization Remove obsolete files from qt.iby
| | * | | | | | | | | | | | | Merge remote branch 'qt-master/master'Guoqing Zhang2011-04-11906-11772/+52069
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/s60installs/qt.iby
| * | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging into ↵Qt Continuous Integration System2011-04-105-9/+65
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-fire-staging: Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot] Fixes: The "test: too many arguments" error after every make
| | * | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-074-8/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: Lancelot: bail out if rendering consistently fails Minor optimization to lance/elot Make it possible to test the new font hinting in lance[elot]
| | | * | | | | | | | | | | | | Lancelot: bail out if rendering consistently failsaavit2011-04-071-1/+10
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Minor optimization to lance/elotaavit2011-04-071-1/+2
| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | Make it possible to test the new font hinting in lance[elot]aavit2011-04-073-6/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A rudimentary test script is also included, showing the use of the new parameter to the qps setFont command.
| | * | | | | | | | | | | | | | Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-teamQt Continuous Integration System2011-04-0770-857/+2276
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 'master' of git://scm.dev.nokia.troll.no/qt/qt-fire-team: (53 commits) Fixes: The "test: too many arguments" error after every make Fixed license headers for examples in master Fixed deployment problems with MSVC 2005 and 2008 SP1 QLocalSocket/Win: handle ERROR_ACCESS_DENIED Add branch prediction macros Add methods for traversing and combining QProcessEnvironment. Designer [Qt Creator integration]: Fix integrated property editor. Handle the HTTP 418 reply properly in QNAM absorb translations.pri into translations.pro let generated flag control SQL generation Add version attributes as per ODF specification Fixed QFtp autotests not to crash in network time out situations Make createpackage and patch_capabilties scripts use tmp dir Fix for QTBUG-16985. Revert "QComboBox fix for QTBUG-16985" Moving Symbian CPU core detection to qthread_symbian.cpp QComboBox fix for QTBUG-16985 Making Symbian helper threads exit cleanly at app exit Add ".make.cache" to the files to be cleaned for symbian-abld. Fix mismatched $$translations handling after merge ...
| | | * | | | | | | | | | | | | Merge remote branch 'qt-mainline/master'aavit2011-04-0769-856/+2275
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Fixes: The "test: too many arguments" error after every makeaavit2011-04-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the gdb version string was not matched, it would be passed in full to test. This new regexp matches the different kinds of gdb version string observed in the wild, as listed in qtcreator/tests/auto/debugger/tst_version.cpp Reviewed-by: aep <arvid.picciani@nokia.com>
| * | | | | | | | | | | | | | | | Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging into ↵Qt Continuous Integration System2011-04-092-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-tools-staging: Designer: Allow promoted QWidget's to be buddies. Designer: Specify 'notr' attribute for buttongroup name.
| | * | | | | | | | | | | | | | | | Designer: Allow promoted QWidget's to be buddies.Friedemann Kleint2011-04-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend check for focusPolicy by promoted check. Task-number: QTBUG-18631
| | * | | | | | | | | | | | | | | | Designer: Specify 'notr' attribute for buttongroup name.Friedemann Kleint2011-04-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such that the name does not show up in lupdate.
| * | | | | | | | | | | | | | | | | Merge branch 'qt-master-from-4.7' of ↵Qt Continuous Integration System2011-04-095-22/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource Let's not write to the source buffer when blending argb32 on rgb16. make -markuntranslated work without -idbased fix conditional on shell type
| | * | | | | | | | | | | | | | | | Merge branch 4.7 into qt-master-from-4.7Qt Continuous Integration System2011-04-095-22/+33
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2011-04-092-17/+30
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap) HTTP cacheing: do not store the date header with the resource
| | | | * | | | | | | | | | | | | | | [QTBUG-15278] QWidget::windowState gets out of sync (Aero Snap)Arnold Konrad2011-04-081-9/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Windows 7 sends WM_SIZE messages without preceding WM_SYSCOMMAND when a window is maximized or restored via Aero Snap. These messages are now handled correctly. Merge-request: 1105 Reviewed-by: Prasanth Ullattil <prasanth.ullattil@nokia.com>
| | | | * | | | | | | | | | | | | | | HTTP cacheing: do not store the date header with the resourcePeter Hartmann2011-04-081-8/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... to avoid re-writing the resource to disk when retrieving the resource from cache. We are currently using the "Expires", "max-age" and "s-maxage" headers to determine when a cached resource will expire. Autotests still pass and the demo browser reports the same amount of pages loaded from the cache. Reviewed-by: Markus Goetz