qt:ritts_qt.git
7 years agomicro-optimization for QTextEngine::elidedText() improvements/qtextengine/support_high_unicodes
Ritt Konstantin [Wed, 22 Sep 2010 23:23:36 +0000 (03:23 +0400)]
micro-optimization for QTextEngine::elidedText()

by inlining helper functions

7 years agooptimize script assignment
Ritt Konstantin [Wed, 22 Sep 2010 23:22:37 +0000 (03:22 +0400)]
optimize script assignment

skip call to QUnicodeTables::script() for the codepoints
which are handled explicitly

7 years agodeal with high unicodes in the QTextEngine's itemizer
Ritt Konstantin [Wed, 22 Sep 2010 23:21:24 +0000 (03:21 +0400)]
deal with high unicodes in the QTextEngine's itemizer

7 years agofix upper/lower casing for high unicodes
Konstantin Ritt [Mon, 29 Nov 2010 15:30:06 +0000 (18:30 +0300)]
fix upper/lower casing for high unicodes

previously, surrogate pairs were ignored and the lower/upper casing
for the high or low part doesn't change the resulting codepoint

QChar::requiresSurrogates(ucs4) guarantee to equal to
QChar::requiresSurrogates(QChar::toLower(ucs4)), so extra-checks might be avoided

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sun, 28 Nov 2010 14:57:13 +0000 (15:57 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Rename File > Quit to Exit on Windows.

7 years agoRename File > Quit to Exit on Windows.
Thiago Macieira [Sun, 28 Nov 2010 14:43:53 +0000 (15:43 +0100)]
Rename File > Quit to Exit on Windows.

Task: QTBUG-15676

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Fri, 26 Nov 2010 16:46:53 +0000 (17:46 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Corrected case on Symbian library.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 26 Nov 2010 13:35:58 +0000 (14:35 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  gdb_dwarf_index: change version constraint from 72 to 73
  Revert "Remove gdb_dwarf_index from maemo mkspec"
  Line ending fix.
  Added mipmap property to QGLFramebufferObjectFormat.
  Remove gdb_dwarf_index from maemo mkspec

7 years agogdb_dwarf_index: change version constraint from 72 to 73
Arvid Ephraim Picciani [Fri, 26 Nov 2010 12:44:43 +0000 (13:44 +0100)]
gdb_dwarf_index: change version constraint from 72 to 73

We previously made the false assumption that gdb 7.2 matches
sourceware master (which claims to be 7.2, but really is 7.3)

7 years agoRevert "Remove gdb_dwarf_index from maemo mkspec"
Arvid Ephraim Picciani [Fri, 26 Nov 2010 12:43:40 +0000 (13:43 +0100)]
Revert "Remove gdb_dwarf_index from maemo mkspec"

This reverts commit 7643d1016a6b4776cf671bbc595ec83002d2cc4e.

7 years agoLine ending fix.
Kim Motoyoshi Kalland [Fri, 26 Nov 2010 11:10:54 +0000 (12:10 +0100)]
Line ending fix.

7 years agoAdded mipmap property to QGLFramebufferObjectFormat.
Kim Motoyoshi Kalland [Fri, 26 Nov 2010 08:56:47 +0000 (09:56 +0100)]
Added mipmap property to QGLFramebufferObjectFormat.

If the mipmap property is set, QGLFramebufferObject will
allocate memory for mipmap levels.

Reviewed-by: Gunnar
7 years agoRemove gdb_dwarf_index from maemo mkspec
Arvid Ephraim Picciani [Fri, 26 Nov 2010 09:49:33 +0000 (10:49 +0100)]
Remove gdb_dwarf_index from maemo mkspec

maemo6 has gdb7.2 but not gdb-index

7 years agoCorrected case on Symbian library.
axis [Fri, 26 Nov 2010 09:44:00 +0000 (10:44 +0100)]
Corrected case on Symbian library.

RevBy:    Trust me

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 26 Nov 2010 09:33:39 +0000 (10:33 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  QFileSystemWatcher: don't try to stop non-running thread
  Fix QSettings auto test to use QTRY_VERIFY
  tst_QFileSystemWatcher: Don't exit the event loop on first signal.
  QPollingFileSystemWatcherEngine: Fix double report of directory change.
  QKqueueFileSystemWatcherEngine: Use higher file descriptors.
  QKqueueFileSystemWatcherEngine: Unlock mutex between two events.
  QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).
  QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.
  QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().
  QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.

7 years agoQFileSystemWatcher: don't try to stop non-running thread
João Abecasis [Fri, 26 Nov 2010 09:11:15 +0000 (10:11 +0100)]
QFileSystemWatcher: don't try to stop non-running thread

Task-Number: QTBUG-14435
Reviewed-by: Bradley T. Hughes
7 years agoFix QSettings auto test to use QTRY_VERIFY
João Abecasis [Fri, 26 Nov 2010 09:11:14 +0000 (10:11 +0100)]
Fix QSettings auto test to use QTRY_VERIFY

... instead of relying on qApp->processEvents.

Reviewed-by: Olivier Goffart
7 years agotst_QFileSystemWatcher: Don't exit the event loop on first signal.
Tijl Coosemans [Fri, 26 Nov 2010 09:11:13 +0000 (10:11 +0100)]
tst_QFileSystemWatcher: Don't exit the event loop on first signal.

Sometimes tests can produce more than one signal and other times more
than one signal would be an error. In order to test this the event loop
should run long enough and not quit on the first signal. This is
especially important on multicore systems where the application and
worker threads run on different CPUs. Signals emitted by the worker
thread are then almost immediately processed by the application thread.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQPollingFileSystemWatcherEngine: Fix double report of directory change.
Tijl Coosemans [Fri, 26 Nov 2010 09:11:12 +0000 (10:11 +0100)]
QPollingFileSystemWatcherEngine: Fix double report of directory change.

The polling engine first retrieves a QFileInfo for a given path, then
tests whether it's different from before and if so, stores the new file
info and emits a signal. In case path is a directory the test also
checks if the list of directory entries has changed. This creates a
window between retrieving the file info and the test in which a file can
be added/removed from the directory or the directory itself can be
removed. In that case the test returns true, because the list of entries
has changed, but outdated file info is stored which means that on the
next timeout the same change will be reported a second time.

Therefore, refresh the file info after the test for changes.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQKqueueFileSystemWatcherEngine: Use higher file descriptors.
Tijl Coosemans [Fri, 26 Nov 2010 09:11:11 +0000 (10:11 +0100)]
QKqueueFileSystemWatcherEngine: Use higher file descriptors.

A file descriptor is used for every path to be monitored, but descriptors
below FD_SETSIZE (typically 1024) are precious, for use with select(2). To
allow the application (and other parts of Qt) to use select(2), try to
duplicate the descriptor returned by open(2) above FD_SETSIZE and close(2)
the original. However, only do so when the descriptor table is already
fairly large (FD_SETSIZE / 2). This keeps the descriptor table small for
applications that use only a few descriptors.

While here, also set the close-on-exec flag on the (new) descriptor.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQKqueueFileSystemWatcherEngine: Unlock mutex between two events.
Tijl Coosemans [Fri, 26 Nov 2010 09:11:10 +0000 (10:11 +0100)]
QKqueueFileSystemWatcherEngine: Unlock mutex between two events.

In the worker thread unlock the mutex between processing two events.
Otherwise it's possible for the worker thread to block the application
thread when many events occur. Also, there's no need to lock the mutex
when processing a pipe event. Generally the worker thread should hamper
the application thread as little as possible, so only lock the mutex
where needed.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).
Tijl Coosemans [Fri, 26 Nov 2010 09:11:09 +0000 (10:11 +0100)]
QKqueueFileSystemWatcherEngine: Unlock mutex before calling write(2).

Calls to write(2) potentially block, so make sure the application thread
unlocks the mutex before it writes to the pipe between itself and the
worker thread, so the latter can continue to process events and eventually
unblock the write call (if needed) by emptying the pipe.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.
Tijl Coosemans [Fri, 26 Nov 2010 09:11:08 +0000 (10:11 +0100)]
QKqueueFileSystemWatcherEngine: Handle kevent(2) returning EINTR.

The worker thread exits whenever the kevent call returns an error, but
in the case of EINTR (interrupted by signal) it should just call kevent
again. Otherwise for instance, attaching a debugger to the process
causes the worker thread to exit because of the SIGSTOP it receives.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().
Tijl Coosemans [Fri, 26 Nov 2010 09:11:07 +0000 (10:11 +0100)]
QKqueueFileSystemWatcherEngine: Deleting kevent is handled by close().

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoQKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.
Tijl Coosemans [Fri, 26 Nov 2010 09:11:06 +0000 (10:11 +0100)]
QKqueueFileSystemWatcherEngine: Use EV_CLEAR instead of EV_ONESHOT.

Using EV_ONESHOT and re-enabling the kevent after emitting the signal
allows for a window in which file system changes can go undetected. By
using EV_CLEAR instead the kevent can stay enabled.

Merge-request: 2425
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Fri, 26 Nov 2010 03:09:22 +0000 (04:09 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public:
  Fix a build break when namespace is defined

7 years agoMerge remote branch 'qt/master'
Jason McDonald [Fri, 26 Nov 2010 02:57:58 +0000 (12:57 +1000)]
Merge remote branch 'qt/master'

Conflicts:
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 25 Nov 2010 23:25:15 +0000 (00:25 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Fix some memory leaks.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 25 Nov 2010 20:53:52 +0000 (21:53 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  fix performance penalty in Win32MakefileGenerator::findHighestVersion
  Allow QDial to wrap value when wrapping property is set.
  QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)

7 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Thu, 25 Nov 2010 18:19:02 +0000 (19:19 +0100)]
Merge branch 'qt-master-from-4.7' of 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: (102 commits)
  fix inf loop bug
  Enable the no-undefined flag on the linker for icc
  Fixed tst_qwidget::winIdChangeEvent
  Prevent compilers optimizing eval timebomb code out of existence.
  Fix incorrect example for Qt.rgba()
  Flickable and MouseArea were too eager to take/keep mouse grab.
  Allow javascript date and regexp objects in WorkerScript messages
  Fix compliation of ALSA audio backend when checking for surround support.
  Avoid lockup in ListView when animating delegates.
  Fix asynchronous reload call in test, broken by previous submit
  Use parent class function to generate Makefile headers in Symbian
  Fix spaces
  Fix QPixmap::fromImage() in the OpenVG pixmap backend.
  Update QtGui emulator def file for bug QT-3971
  Native color dialog on symbian
  Fix non-stroked filled paths in OpenVG paint engine.
  Ignore .pc/
  Ensure WebView press delay timer is cancelled when grab is taken.
  Prevent crash when calling reload() from within a .qml
  Doc: Fixing typo
  ...

7 years agoFix some memory leaks.
Fabien Freling [Thu, 25 Nov 2010 16:21:12 +0000 (17:21 +0100)]
Fix some memory leaks.

Update the retain/release mechanism for
CGContexts. Some leaks were due to unnecessary
retain calls.

Task-number: QTBUG-15373
Reviewed-by: Samuel Rødal
7 years agofix performance penalty in Win32MakefileGenerator::findHighestVersion
Joerg Bornemann [Thu, 25 Nov 2010 10:42:57 +0000 (11:42 +0100)]
fix performance penalty in Win32MakefileGenerator::findHighestVersion

Don't scan Qt's lib dir over and over again.

Task-number: QTBUG-15595
Reviewed-by: ossi
7 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Thu, 25 Nov 2010 16:05:39 +0000 (17:05 +0100)]
Merge branch 4.7 into qt-master-from-4.7

7 years agoAllow QDial to wrap value when wrapping property is set.
Andy Nichols [Thu, 25 Nov 2010 15:46:46 +0000 (16:46 +0100)]
Allow QDial to wrap value when wrapping property is set.

QDial's wrapping property allows for 360 degree revolutions when using
the mouse.  However whenever using the keyboard Up/Down/PageUp/PageDown
keys the QDial's value will stop at the minimum and maximum values.
This has been fixed to allow the bounds checker to account for the
wrapping property.

Merge-request: 2437
Reviewed-by: Pierre Rossi <pierre.rossi@nokia.com>
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 25 Nov 2010 15:25:06 +0000 (16:25 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Stream raw image data instead of PNG: more info, and faster.
  Generate thumbnails for faster loading of the web reports
  Separate reports from adhoc and pulse runs
  Add cmd to simulate testfail. Misc server improvements.
  Added command to clear all baselines

7 years agoQtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by...
Thomas Senyk [Thu, 25 Nov 2010 12:16:42 +0000 (13:16 +0100)]
QtScript variant conversion: Convert numbers to (u)int if applicable (reviewed by khansen)

7 years agoMerge remote branch 'origin/4.7' into qt-master-from-4.7
Olivier Goffart [Thu, 25 Nov 2010 13:32:37 +0000 (14:32 +0100)]
Merge remote branch 'origin/4.7' into qt-master-from-4.7

Conflicts:
qmake/generators/symbian/symmake.cpp
src/corelib/global/qglobal.h
src/gui/kernel/qwidget_p.h
src/gui/painting/qtextureglyphcache.cpp
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h
src/plugins/qpluginbase.pri
src/qbase.pri
tests/auto/qgraphicsgridlayout/tst_qgraphicsgridlayout.cpp
tests/auto/qthread/tst_qthread.cpp
tests/auto/selftests/expected_cmptest.txt
tests/auto/selftests/expected_crashes_3.txt
tests/auto/selftests/expected_longstring.txt
tests/auto/selftests/expected_maxwarnings.txt
tests/auto/selftests/expected_skip.txt
tools/assistant/tools/assistant/doc/assistant.qdocconf
tools/qdoc3/test/assistant.qdocconf
tools/qdoc3/test/designer.qdocconf
tools/qdoc3/test/linguist.qdocconf
tools/qdoc3/test/qdeclarative.qdocconf
tools/qdoc3/test/qmake.qdocconf
tools/qdoc3/test/qt-build-docs.qdocconf
tools/qdoc3/test/qt-build-docs_ja_JP.qdocconf
tools/qdoc3/test/qt-build-docs_zh_CN.qdocconf
tools/qdoc3/test/qt.qdocconf
tools/qdoc3/test/qt_ja_JP.qdocconf
tools/qdoc3/test/qt_zh_CN.qdocconf

7 years agoMerge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
Qt Continuous Integration System [Thu, 25 Nov 2010 11:37:06 +0000 (12:37 +0100)]
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix compliation of ALSA audio backend when checking for surround support.

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
aavit [Thu, 25 Nov 2010 10:53:15 +0000 (11:53 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 25 Nov 2010 10:39:21 +0000 (11:39 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  qmake/MinGW: do not copy .pdb files on "make install"
  Allow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf scripts.

7 years agoqmake/MinGW: do not copy .pdb files on "make install"
Sean Harmer [Thu, 25 Nov 2010 10:20:12 +0000 (11:20 +0100)]
qmake/MinGW: do not copy .pdb files on "make install"

Simply refactoring pdb part into the nmake generator at this stage.

Some work is being repeated from the base class implementation. Will get
it working first then see if I can refactor to remove the redundancy.

Task-number: QTBUG-14236
Merge-request: 2506
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
7 years agoAllow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf scripts.
Sam Magnuson [Thu, 25 Nov 2010 10:06:57 +0000 (11:06 +0100)]
Allow setting LD, RANLIB, OBJDUMP, and STRIP as one can do with autoconf scripts.

Merge-request: 937
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Thu, 25 Nov 2010 08:08:20 +0000 (09:08 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  fix inf loop bug

7 years agoFix a build break when namespace is defined
Miikka Heikkinen [Mon, 22 Nov 2010 10:55:43 +0000 (12:55 +0200)]
Fix a build break when namespace is defined

Reviewed-by: Jani Hautakangas
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Thu, 25 Nov 2010 05:57:54 +0000 (06:57 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
  Fixed handling of QInputMethodEvents with nonzero replacementLength.
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  Documented usage of dialogs on Symbian
  Native file dialog on Symbian^3
  Add Location as self signable capability in patch_capabilities.pl
  Localize .loc and .pkg content based on TRANSLATIONS
  Bump Qt version to 4.7.2.
  SSL: Fix for systemCaCertificates being called first on symbian
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 25 Nov 2010 02:31:56 +0000 (03:31 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  QThread: fix a race condition when destroying or restarting thread from finished()
  QThreadStorage: fix crash if thread local destructor reset himself
  Add WA_MacNoShadow widget attribute
  Doc: Fixing typo
  Fix compilation on symbian
  Fix a namespace error and some warnings found by clang
  optimize ligatureHelper by using qBinaryFind instead of the for loop
  QFileSystemWatcher:  Do not require QApplication in the destructor.
  Do not define METHOD if QT_NO_KEYWORD is defined.
  QThreadPrivate::finish should not keep mutex locked when calling signals
  Make QThreadStorage supports value type and not only pointers.
  QThreadStorage: fix memory leak if thread storage are added while destroying
  Compile fix.
  Fix some warnings on Mac

7 years agofix inf loop bug
hawcroft [Thu, 25 Nov 2010 00:10:27 +0000 (10:10 +1000)]
fix inf loop bug

Task-number: QTBUG-15409
Reviewed-by: Andrew Den-Exter
7 years agoMerge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4...
Qt Continuous Integration System [Thu, 25 Nov 2010 00:08:18 +0000 (01:08 +0100)]
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration

* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration:
  Fix compliation of ALSA audio backend when checking for surround support.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 21:24:30 +0000 (22:24 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (28 commits)
  Fixed tst_qwidget::winIdChangeEvent
  Use parent class function to generate Makefile headers in Symbian
  Fix spaces
  Fix QPixmap::fromImage() in the OpenVG pixmap backend.
  Native color dialog on symbian
  Fix non-stroked filled paths in OpenVG paint engine.
  Fix symbian-mmp.conf include path
  Fix a build break when namespace is defined
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  ...

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 18:55:24 +0000 (19:55 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Enable the no-undefined flag on the linker for icc

7 years agoMerge branch 4.6 into qt-4.7-from-4.6
Qt Continuous Integration System [Wed, 24 Nov 2010 16:03:13 +0000 (17:03 +0100)]
Merge branch 4.6 into qt-4.7-from-4.6

7 years agoEnable the no-undefined flag on the linker for icc
Olivier Goffart [Tue, 23 Nov 2010 16:11:42 +0000 (17:11 +0100)]
Enable the no-undefined flag on the linker for icc

Reviewed-by: Thiago
7 years agoQThread: fix a race condition when destroying or restarting thread from finished()
Olivier Goffart [Wed, 24 Nov 2010 14:32:23 +0000 (15:32 +0100)]
QThread: fix a race condition when destroying or restarting thread from finished()

Since we do not keep the mutex locked in QThreadPrivate::finish,
We could have races if the thread is destroyed or restarted from
another thread while we are still in that function

This solve tst_QCoreApplication::deliverInDefinedOrder on mac

Regression since a43583e0221311b7fe666726a

Reviewed-by: Brad
7 years agoQThreadStorage: fix crash if thread local destructor reset himself
Olivier Goffart [Wed, 24 Nov 2010 09:28:50 +0000 (10:28 +0100)]
QThreadStorage: fix crash if thread local destructor reset himself

Regression in ed8f3b6c98f1b305f0d183bc70c5f810a9c45ef2 (QTBUG-14579)

WebKit ThreadSpecific implementation does that.
See the comment in ThreadSpecific<T>::destroy(void*)

Reveiwed-by: Brad
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integr...
Qt Continuous Integration System [Wed, 24 Nov 2010 14:15:16 +0000 (15:15 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Prevent compilers optimizing eval timebomb code out of existence.

7 years agoStream raw image data instead of PNG: more info, and faster.
aavit [Wed, 24 Nov 2010 14:01:42 +0000 (15:01 +0100)]
Stream raw image data instead of PNG: more info, and faster.

7 years agoAdd WA_MacNoShadow widget attribute
Arvid Ephraim Picciani [Wed, 24 Nov 2010 10:39:33 +0000 (11:39 +0100)]
Add WA_MacNoShadow widget attribute

Task-number: QTBUG-6831
Reviewed-by: Fabien Freling <fabien.freling@nokia.com>
7 years agoFixed tst_qwidget::winIdChangeEvent
Gareth Stockwell [Wed, 24 Nov 2010 08:36:15 +0000 (08:36 +0000)]
Fixed tst_qwidget::winIdChangeEvent

During reparenting of a native widget, the winId is now first set
to zero before being set to the new value.

Reviewed-by: Jason Barron
7 years agoMerge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integr...
Qt Continuous Integration System [Wed, 24 Nov 2010 09:12:00 +0000 (10:12 +0100)]
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
  Fix compliation of ALSA audio backend when checking for surround support.

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 08:50:12 +0000 (09:50 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml:
  Fix incorrect example for Qt.rgba()
  Flickable and MouseArea were too eager to take/keep mouse grab.
  Allow javascript date and regexp objects in WorkerScript messages
  Avoid lockup in ListView when animating delegates.
  Fix asynchronous reload call in test, broken by previous submit
  Update QtGui emulator def file for bug QT-3971
  Ignore .pc/
  Ensure WebView press delay timer is cancelled when grab is taken.
  Prevent crash when calling reload() from within a .qml

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 08:33:49 +0000 (09:33 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc: Fixing typo
  Fix compilation on symbian
  Fix a namespace error and some warnings found by clang
  optimize ligatureHelper by using qBinaryFind instead of the for loop
  QFileSystemWatcher:  Do not require QApplication in the destructor.
  Do not define METHOD if QT_NO_KEYWORD is defined.
  QThreadPrivate::finish should not keep mutex locked when calling signals
  Make QThreadStorage supports value type and not only pointers.
  QThreadStorage: fix memory leak if thread storage are added while destroying
  Compile fix.
  Fix some warnings on Mac

7 years agoPrevent compilers optimizing eval timebomb code out of existence.
Jason McDonald [Wed, 24 Nov 2010 07:00:20 +0000 (17:00 +1000)]
Prevent compilers optimizing eval timebomb code out of existence.

The variable that holds the eval license key is a placeholder that is
patched during package installation.  Unfortunately, for a non-final
package build, the placeholder is filled with nulls at compile-time and
a clever compiler will optimize away most of the eval timebomb code due
to a check in the eval code for the first character of the license key
being null.

This commit makes the variable that holds the license key volatile, to
convince compilers that they cannot make assumptions about the contents
of the variable when optimizing.

Task-number: QT-3848
Acked-by: Thiago Macieira
7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 06:09:03 +0000 (07:09 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
  Fixed handling of QInputMethodEvents with nonzero replacementLength.
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  Documented usage of dialogs on Symbian
  Native file dialog on Symbian^3
  Add Location as self signable capability in patch_capabilities.pl
  Localize .loc and .pkg content based on TRANSLATIONS
  Bump Qt version to 4.7.2.
  SSL: Fix for systemCaCertificates being called first on symbian
  ...

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 06:02:35 +0000 (07:02 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (27 commits)
  Use parent class function to generate Makefile headers in Symbian
  Fix spaces
  Fix QPixmap::fromImage() in the OpenVG pixmap backend.
  Native color dialog on symbian
  Fix non-stroked filled paths in OpenVG paint engine.
  Fix symbian-mmp.conf include path
  Fix a build break when namespace is defined
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  ...

7 years agoFix incorrect example for Qt.rgba()
Bea Lam [Wed, 24 Nov 2010 05:42:35 +0000 (15:42 +1000)]
Fix incorrect example for Qt.rgba()

7 years agoFlickable and MouseArea were too eager to take/keep mouse grab.
Martin Jones [Wed, 24 Nov 2010 04:28:18 +0000 (14:28 +1000)]
Flickable and MouseArea were too eager to take/keep mouse grab.

This meant that they would sometimes act upon a drag immediately,
rather than waiting for a nested area to take the grab.  This resulted
in a short jump before future events were handled by the nested item.

Task-number: QTBUG-15568
Reviewed-by: Bea Lam
7 years agoAllow javascript date and regexp objects in WorkerScript messages
Bea Lam [Wed, 24 Nov 2010 03:50:27 +0000 (13:50 +1000)]
Allow javascript date and regexp objects in WorkerScript messages

Task-number: QTBUG-14666
Reviewed-by: Aaron Kennedy
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 03:32:18 +0000 (04:32 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  tst_qthread: fix compilation
  Round origin of text in OpenVG engine
  QThread::exec():  Fix possibility to enter several time the event loop
  QMessageBox: change the documentation to reflect that it is application modal
  Compile on OpenBSD
  Doc: Q_PROPERTY, implements the setter/getter in the example
  Dynamically register the event number.
  Fix wrong error assumption when converting "0.0" to double

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Wed, 24 Nov 2010 02:59:35 +0000 (03:59 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Doc: Fixing typo
  Fixed a shadow warning when including QtSql.
  Fixed a shadow warning when including QTest

7 years agoFix compliation of ALSA audio backend when checking for surround support.
Justin McPherson [Wed, 24 Nov 2010 00:45:53 +0000 (10:45 +1000)]
Fix compliation of ALSA audio backend when checking for surround support.

Surround support requires ALSA lib >= 1.0.14

Task-number: QTBUG-15205
Reviewed-by: Andrew den Exter
7 years agoAvoid lockup in ListView when animating delegates.
Martin Jones [Wed, 24 Nov 2010 01:25:07 +0000 (11:25 +1000)]
Avoid lockup in ListView when animating delegates.

Animating delegates results in the content height changing, which
may result in fixup being called if at the ends of the view, which
may in turn cause refill to be called, which will change the content
height, which repeats.  Prevent this recusion from happening.

Task-number: QTBUG-14821
Reviewed-by: Bea Lam
7 years agoFix asynchronous reload call in test, broken by previous submit
Damian Jansen [Wed, 24 Nov 2010 00:51:29 +0000 (10:51 +1000)]
Fix asynchronous reload call in test, broken by previous submit

Task-number: QTBUG-15493

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration
Qt Continuous Integration System [Wed, 24 Nov 2010 00:09:31 +0000 (01:09 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-water-staging:
  Doc: Fixing typo
  QS60Style: Null pointer crash when using itemviews in some cases (pt2)
  Fix code style
  QS60Style: Null pointer crash when using itemviews in some cases
  Fix the tests that got affected by the behaviour added in 604c51f1fc5c79
  Improve performance of hfw in qgridlayoutengine by adding more caching.
  Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
  Tactile Feedback plugin is not compiled in latest Sym^3 RnD envs
  QToolbar should fill available width on Symbian
  Adhere to code style
  Some improvements to the docs that was added in merge request 894
  Change the QGraphics*Layout documentation to match the code - that the default alignment is top-left.
  Fix item alignment in layouts bigger than the items thay they contain
  Add autotest to test a issue with stretches and preferred width.
  Code style cleanup for merge request 847
  Add back the tests that were removed by commit fcda1b785bd7d86011f49bfe96cb22b04202933f
  Fix a behaviour change of sizeHint() introduced by 6d4d265e7e67dde58

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Tue, 23 Nov 2010 23:09:54 +0000 (00:09 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
  Fixed handling of QInputMethodEvents with nonzero replacementLength.
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  Documented usage of dialogs on Symbian
  Native file dialog on Symbian^3
  Add Location as self signable capability in patch_capabilities.pl
  Localize .loc and .pkg content based on TRANSLATIONS
  Bump Qt version to 4.7.2.
  SSL: Fix for systemCaCertificates being called first on symbian
  ...

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 23 Nov 2010 20:31:35 +0000 (21:31 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Doc: Fixing typo
  Fix compilation on symbian
  Fix a namespace error and some warnings found by clang
  optimize ligatureHelper by using qBinaryFind instead of the for loop
  QFileSystemWatcher:  Do not require QApplication in the destructor.
  Do not define METHOD if QT_NO_KEYWORD is defined.
  QThreadPrivate::finish should not keep mutex locked when calling signals
  Make QThreadStorage supports value type and not only pointers.
  QThreadStorage: fix memory leak if thread storage are added while destroying
  Compile fix.
  Fix some warnings on Mac

7 years agoDoc: Fixing typo
Sergio Ahumada [Tue, 23 Nov 2010 18:58:47 +0000 (19:58 +0100)]
Doc: Fixing typo

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Tue, 23 Nov 2010 17:10:25 +0000 (18:10 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly
  QHash is a bit faster than QMap and thus preferable if sorting by the key is unneeded

7 years agoqt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly
miniak [Tue, 23 Nov 2010 16:47:28 +0000 (17:47 +0100)]
qt_reg_winclass(): use RegisterClassEx() to load the small IDI_ICON1 icon correctly

Merge-request: 769
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
7 years agoQHash is a bit faster than QMap and thus preferable if sorting by the key is unneeded
Konstantin Ritt [Tue, 23 Nov 2010 14:43:06 +0000 (15:43 +0100)]
QHash is a bit faster than QMap and thus preferable if sorting by the key is unneeded

Merge-request: 2501
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
7 years agoFix compilation on symbian
Olivier Goffart [Tue, 23 Nov 2010 12:48:45 +0000 (13:48 +0100)]
Fix compilation on symbian

Introduced with 360f596183969a4c69
armcc cannot find the static operator in qBinaryFind

Reviewed-by: axis
7 years agoUse parent class function to generate Makefile headers in Symbian
Miikka Heikkinen [Tue, 23 Nov 2010 12:29:10 +0000 (14:29 +0200)]
Use parent class function to generate Makefile headers in Symbian

Qt Creator depends on some of the information generated into the
makefile header by MakefileGenerator::writeHeader() function, so
changed symmake*.cpp to use it instead of each having separate
code for header generation.

Task-number: QTBUG-15539
Reviewed-by: Janne Koskinen
7 years agoFix a namespace error and some warnings found by clang
Jiang Jiang [Mon, 22 Nov 2010 16:05:42 +0000 (17:05 +0100)]
Fix a namespace error and some warnings found by clang

Reviewed-by: Fabien Freling
7 years agoGenerate thumbnails for faster loading of the web reports
aavit [Tue, 23 Nov 2010 10:52:09 +0000 (11:52 +0100)]
Generate thumbnails for faster loading of the web reports

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Janne Koskinen [Tue, 23 Nov 2010 10:34:04 +0000 (12:34 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoFix spaces
Janne Koskinen [Tue, 23 Nov 2010 10:30:02 +0000 (12:30 +0200)]
Fix spaces

Remove extra spaces

Reviewed-by: Miikka Heikkinen
7 years agoFix QPixmap::fromImage() in the OpenVG pixmap backend.
Jason Barron [Tue, 23 Nov 2010 10:13:41 +0000 (11:13 +0100)]
Fix QPixmap::fromImage() in the OpenVG pixmap backend.

If QPixmap::fromImage() was called with a QImage that has an alpha
channel and with the 'Qt::NoOpaqueDetection' image conversion flag set,
then we would always create an opaque (RGB32) pixmap. This is
incorrect.

The fix is to check if the source QImage has an alpha channel and if
so, use sourceFormat(), otherwise use RGB32.

Task-number: QT-4278
Reviewed-by: Jani Hautakangas
7 years agoUpdate QtGui emulator def file for bug QT-3971
Joona Petrell [Tue, 23 Nov 2010 10:13:09 +0000 (20:13 +1000)]
Update QtGui emulator def file for bug QT-3971

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7
Janne Koskinen [Tue, 23 Nov 2010 09:00:29 +0000 (11:00 +0200)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60
axis [Tue, 23 Nov 2010 08:58:08 +0000 (09:58 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-s60

7 years agoMerge branch '4.7-s60' into 4.7-s60
axis [Tue, 23 Nov 2010 08:54:18 +0000 (09:54 +0100)]
Merge branch '4.7-s60' into 4.7-s60

Corrected a mismerge by choosing ours.

7 years agoNative color dialog on symbian
Milla Pohjanheimo [Fri, 19 Nov 2010 11:10:57 +0000 (13:10 +0200)]
Native color dialog on symbian

Native color dialog implementation for Symbian.

During merge extra libraries removed.

Task-number: QT-3917
Reviewed-by: Sami Merila
Merge-Request: 932
Reviewed-by: Janne Koskinen
7 years agoMerge branch '4.7' into 4.7-s60
axis [Tue, 23 Nov 2010 08:51:55 +0000 (09:51 +0100)]
Merge branch '4.7' into 4.7-s60

Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

7 years agoFix non-stroked filled paths in OpenVG paint engine.
Jason Barron [Mon, 22 Nov 2010 13:56:14 +0000 (14:56 +0100)]
Fix non-stroked filled paths in OpenVG paint engine.

The QPainter::fillRect() functions are optimizations to avoid state
changes in the paint engines. Since these functions should be
completely independant of state, ideally they should only call
functions that are also stateless.

QVGPaintEngine::fillRect() has two different code paths for this.
The vgClearRect() path of this function is stateless however in the
case of non-opaque or complex fills, this code path cannot be used and
instead we use the normal path fill function which is not entirely
stateless because ensureTransform() will apply the aliased coordinate
transform if the current state includes a stroked pen.

To avoid this happening for a pure fill (no stroke) we temporary set
the pen state to be Qt::NoPen such that the state used by
ensureTransform() is correct.

Task-number: QTBUG-14717
Reviewed-by: Jani Hautakangas
7 years agoIgnore .pc/
Petri Latvala [Wed, 13 Oct 2010 07:25:14 +0000 (10:25 +0300)]
Ignore .pc/

Reviewed-By: Rohan McGovern
(cherry picked from commit 561a72c2568768f9adf34aa1077717f9311ce56d)

7 years agoMerge remote branch 'qt/4.7' into 4.7
Jason McDonald [Tue, 23 Nov 2010 04:05:23 +0000 (14:05 +1000)]
Merge remote branch 'qt/4.7' into 4.7

Conflicts:
src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
src/3rdparty/webkit/WebKit/qt/tests/qwebpage/tst_qwebpage.cpp

7 years agoEnsure WebView press delay timer is cancelled when grab is taken.
Martin Jones [Tue, 23 Nov 2010 03:44:39 +0000 (13:44 +1000)]
Ensure WebView press delay timer is cancelled when grab is taken.

Flickable steals the grab, but the timer was not stopped and the
keepGrab flag is set and the mouse grabbed. This means that the WebView
now has the grab and subsequent clicks on another element are ignored.

Task-number: QTBUG-15529
Reviewed-by: Joona Petrell
7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Damian Jansen [Tue, 23 Nov 2010 02:07:33 +0000 (12:07 +1000)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7

7 years agoPrevent crash when calling reload() from within a .qml
Damian Jansen [Tue, 23 Nov 2010 02:04:23 +0000 (12:04 +1000)]
Prevent crash when calling reload() from within a .qml

Task-number: QTBUG-15493

7 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 23:32:20 +0000 (00:32 +0100)]
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  tst_qthread: fix compilation
  Round origin of text in OpenVG engine
  QThread::exec():  Fix possibility to enter several time the event loop
  QMessageBox: change the documentation to reflect that it is application modal
  Compile on OpenBSD
  Doc: Q_PROPERTY, implements the setter/getter in the example
  Dynamically register the event number.
  Fix wrong error assumption when converting "0.0" to double

7 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration
Qt Continuous Integration System [Mon, 22 Nov 2010 22:57:34 +0000 (23:57 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (21 commits)
  Fixed handling of QInputMethodEvents with nonzero replacementLength.
  Fixed namespace issues related to epocroot.cpp
  Corrected ASCII comparison and removed extra braces
  Add symbian scope for qfiledialog_symbian.cpp
  Resolve EPOCROOT in qt.conf using same logic as in .pro
  Make epocroot resolving compatible with more build environments
  Fix for QtOpenGL RVCT4 compilation error
  Removed extra cpp and done changes based on comments
  Correct flags for Symbian file dialogs
  Fix for WServ 64 crash on Symbian.
  Use include(original mkspec) instead of copying of mkspec to default
  Fixed code style of d92cbfc5, reported by git push.
  Switched qdesktopservices to use SchemeHandler for Symbian^3 and later.
  Removed unnecessary Q_OS_SYMBIAN flags from qdesktopservices_s60.cpp.
  Documented usage of dialogs on Symbian
  Native file dialog on Symbian^3
  Add Location as self signable capability in patch_capabilities.pl
  Localize .loc and .pkg content based on TRANSLATIONS
  Bump Qt version to 4.7.2.
  SSL: Fix for systemCaCertificates being called first on symbian
  ...