qt:qt.git
11 years agoFix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious
Jedrzej Nowacki [Mon, 17 Jan 2011 08:47:52 +0000 (10:47 +0200)]
Fix QScriptValueIterator::hasNext and QScriptValueIterator::hasPrevious

When a script engine is about to be deleted all bound iterators should
be invalidated. Previously behavior of the class was not tested for the
case, so new test for QScriptValueIterator was added.

Reviewed-by: Olivier Goffart
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 12 Jan 2011 17:18:45 +0000 (03:18 +1000)]
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:
  Use runtime path instead of compile time on Maemo

11 years agoUse runtime path instead of compile time on Maemo
Jiang Jiang [Wed, 12 Jan 2011 15:38:49 +0000 (16:38 +0100)]
Use runtime path instead of compile time on Maemo

Since maemo programs are cross-compiled, we need to use the runtime
application path to locate script files here.

Reviewed-by: aavit
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Wed, 12 Jan 2011 14:00:36 +0000 (00:00 +1000)]
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:
  Mac: pixmaps dont treat alpha exactly the same as other platforms

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Wed, 12 Jan 2011 10:32:02 +0000 (20:32 +1000)]
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
  Only test control character handling in X11
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoMac: pixmaps dont treat alpha exactly the same as other platforms
Richard Moe Gustavsen [Wed, 12 Jan 2011 09:47:29 +0000 (10:47 +0100)]
Mac: pixmaps dont treat alpha exactly the same as other platforms

From fixing qwidget autotest, it seems to be the case that filling
a pixmap with a solid color on mac changes the hasAlpha status. This
is different from X11 (and raster engine). That is, the following
code will produce different result:

QPixmap pixmap(100, 100);
pixmap.setAlphaChannel(QPixmap(100, 100));
qDebug() << "Has alpha after setting channel?" << pixmap.hasAlpha();
pixmap.fill(Qt::red);
qDebug() << "Has alpha after fill?" << pixmap.hasAlpha();

So, this patch remove the possibility of converting an already alpha
supporting pixmap to non-alpha upon fill. NB: somewhat related, the
following code works the same on both x11, raster and mac (prints
'false'), but still seems wrong:

QPixmap pixmap2(pixmap);
qDebug() << "pixmap2 has alpha initially?" << pixmap2.hasAlpha();

Rev-By: Fabien Freling
11 years agoDoc: Fixing typo
Sergio Ahumada [Wed, 12 Jan 2011 10:07:34 +0000 (11:07 +0100)]
Doc: Fixing typo

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 22:15:41 +0000 (08:15 +1000)]
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:
  Only test control character handling in X11
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 11 Jan 2011 18:40:35 +0000 (04:40 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  QProcessManager: minor optimization
  use qBinaryFind instead of bsearch
  use qBinaryFind instead of bsearch
  fix two more "comparison between signed and unsigned integer expressions" warnings
  fix 'QChar::QChar(char)' is deprecated
  fix another "comparison between signed and unsigned integer expressions"
  fix warning "comparison between signed and unsigned integer expressions"
  fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"
  fix warning "'SeedStorage* randTLS()' defined but not used"
  remove unused header include
  make the modifySemaphore() signal-safe on linux
  fix/stabilizate the year sign change test
  deal with utcOffset in a correct way

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 15:31:59 +0000 (01:31 +1000)]
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:
  Only test control character handling in X11
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoQProcessManager: minor optimization
Ritt Konstantin [Tue, 11 Jan 2011 13:31:05 +0000 (16:31 +0300)]
QProcessManager: minor optimization

QHash is slightly faster than QMap and should be preferred where
the key order has no meaning;
take() is faster than value() + remove()

Reviewed-by: Olivier Goffart
Merge-request: 1017

11 years agouse qBinaryFind instead of bsearch
Konstantin Ritt [Tue, 11 Jan 2011 13:12:02 +0000 (14:12 +0100)]
use qBinaryFind instead of bsearch

Merge-request: 906
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agouse qBinaryFind instead of bsearch
Konstantin Ritt [Tue, 11 Jan 2011 13:12:01 +0000 (14:12 +0100)]
use qBinaryFind instead of bsearch

depending on platform, qBinaryFind might be up to 3 times faster than bsearch
or a bit bit slower at the worst case; so why don't simply use qBinaryFind instead of bsearch and be an optimist? ;)

also we know that all color names are in the lower case already and thus
we can avoid lowercasing of them again and again, and again;
the name to find needs to be lowercased separately instead.

some color-by-name-lookup numbers:
before:
 0.000737 msecs per iteration (total: 3,684, iterations: 5000000)
after:
 0.000154 msecs per iteration (total: 771, iterations: 5000000)

Merge-request: 906
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix two more "comparison between signed and unsigned integer expressions" warnings
Konstantin Ritt [Tue, 11 Jan 2011 12:58:23 +0000 (13:58 +0100)]
fix two more "comparison between signed and unsigned integer expressions" warnings

SQLLEN is unnecessarily an unsigned int

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix 'QChar::QChar(char)' is deprecated
Konstantin Ritt [Tue, 11 Jan 2011 12:58:22 +0000 (13:58 +0100)]
fix 'QChar::QChar(char)' is deprecated

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix another "comparison between signed and unsigned integer expressions"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:21 +0000 (13:58 +0100)]
fix another "comparison between signed and unsigned integer expressions"

on win, when used in FD_SET, FD_ISSET, etc., socketDescriptor assumed to be
SOCKET which is unsigned int

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix warning "comparison between signed and unsigned integer expressions"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:20 +0000 (13:58 +0100)]
fix warning "comparison between signed and unsigned integer expressions"

sizeof produces signed int result; QT_SOCKOPTLEN_T is int

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix warning "missing braces around initializer for 'in_addr::<anonymous union>'"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:19 +0000 (13:58 +0100)]
fix warning "missing braces around initializer for 'in_addr::<anonymous union>'"

v.s_addr = 0; does the same

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agofix warning "'SeedStorage* randTLS()' defined but not used"
Konstantin Ritt [Tue, 11 Jan 2011 12:58:19 +0000 (13:58 +0100)]
fix warning "'SeedStorage* randTLS()' defined but not used"

by setting the proper macro-guards;
regroup macro-guards for better readability (superfluous change, I know);
fix typos in the comments

was not splited into two commits to make it more clear why and how
that warning is fixed now

Merge-request: 955
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agoremove unused header include
Ritt Konstantin [Tue, 11 Jan 2011 11:35:08 +0000 (14:35 +0300)]
remove unused header include

sysV shm isn't used in QSystemSemaphore

Merge-request: 998
Reviewed-by: Olivier Goffart
11 years agomake the modifySemaphore() signal-safe on linux
Ritt Konstantin [Tue, 11 Jan 2011 11:33:33 +0000 (14:33 +0300)]
make the modifySemaphore() signal-safe on linux

as POSIX man says, if semop() is interrupted by a signal,
it shall return -1 and set errno to EINTR.
in qcore_unix_p.h, we have EINTR_LOOP helper macro exactly for such cases ;)

Task-number: QTBUG-14434
Merge-request: 998
Reviewed-by: Olivier Goffart
11 years agofix/stabilizate the year sign change test
Ritt Konstantin [Tue, 11 Jan 2011 12:26:19 +0000 (13:26 +0100)]
fix/stabilizate the year sign change test

this test might fail for the Qt::LocalTime spec in some cases

Merge-request: 2536
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agodeal with utcOffset in a correct way
Ritt Konstantin [Tue, 11 Jan 2011 12:26:18 +0000 (13:26 +0100)]
deal with utcOffset in a correct way

like how we do that for ISO format

Reviewed-by: ddenis
Merge-request: 2536
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integ...
Qt Continuous Integration System [Tue, 11 Jan 2011 11:54:42 +0000 (21:54 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-earth-staging:
  handle O_NONBLOCK'ed pipes specific error on write()
  move POSIX-specific debug to qprocess_unix.cpp

11 years agohandle O_NONBLOCK'ed pipes specific error on write()
Ritt Konstantin [Tue, 11 Jan 2011 10:31:44 +0000 (11:31 +0100)]
handle O_NONBLOCK'ed pipes specific error on write()

according to the write(2) docs:

When write requests greater than {PIPE_BUF} bytes to a pipe that
has available space at least 1 byte, if O_NONBLOCK is set,
write transfers what it can and returns the number of bytes written.

When write requests of {PIPE_BUF} or less  bytes to a pipe that has no
enough space, or write requests for greater than {PIPE_BUF} bytes
to a pipe that has no space, if O_NONBLOCK  is  set,
write returns -1 and sets errno to EAGAIN.

Merge-request: 997
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agomove POSIX-specific debug to qprocess_unix.cpp
Ritt Konstantin [Tue, 11 Jan 2011 10:31:43 +0000 (11:31 +0100)]
move POSIX-specific debug to qprocess_unix.cpp

Merge-request: 997
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
11 years agoOnly test control character handling in X11
Jiang Jiang [Tue, 11 Jan 2011 08:45:03 +0000 (09:45 +0100)]
Only test control character handling in X11

It was a issue in HarfBuzz only.

Reviewed-by: Andy Shaw
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 08:41:33 +0000 (18:41 +1000)]
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:
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 05:10:09 +0000 (15:10 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Tue, 11 Jan 2011 01:44:27 +0000 (11:44 +1000)]
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:
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 22:28:10 +0000 (08:28 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-qa-staging:
  BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

11 years agoBM2: Little fix to make the `make check-trusted' to work on Linux and Windows.
Sergio Ahumada [Mon, 10 Jan 2011 21:52:36 +0000 (22:52 +0100)]
BM2: Little fix to make the `make check-trusted' to work on Linux and Windows.

Reviewed-by: Joao
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 19:04:34 +0000 (05:04 +1000)]
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: fix wrong case label in toString(subSystemOption)
  qt project files: create pkg-config files for mingw
  qmake: write and install pkg-config files for mingw
  qmake: don't limit pkg-config writing to unix generator
  qmake: fix double directory separator

11 years agoqmake: fix wrong case label in toString(subSystemOption)
Joerg Bornemann [Mon, 10 Jan 2011 16:01:06 +0000 (17:01 +0100)]
qmake: fix wrong case label in toString(subSystemOption)

Reviewed-by: TrustMe
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 15:43:51 +0000 (01:43 +1000)]
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:
  Compile when qreal != double
  Make application font family names locale sensitive in X11
  Rename QTextBlockFormat::AtLeastHeight -> MinimumHeight
  Add line spacing to QTextBlockFormat, get/set functions, CSS support
  Optimize texture glyph cache
  Disable certain GPOS features by default
  Move advances for control character in Indic syllable shaping

11 years agoqt project files: create pkg-config files for mingw
Mark Brand [Mon, 10 Jan 2011 15:41:57 +0000 (16:41 +0100)]
qt project files: create pkg-config files for mingw

This is mostly the same as for unix.

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoqmake: write and install pkg-config files for mingw
Mark Brand [Mon, 10 Jan 2011 15:41:56 +0000 (16:41 +0100)]
qmake: write and install pkg-config files for mingw

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoqmake: don't limit pkg-config writing to unix generator
Mark Brand [Mon, 10 Jan 2011 15:41:55 +0000 (16:41 +0100)]
qmake: don't limit pkg-config writing to unix generator

Move pkg-config related methods from unix generator to base class
so they can be used by other generators too.

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoqmake: fix double directory separator
Mark Brand [Mon, 10 Jan 2011 15:41:54 +0000 (16:41 +0100)]
qmake: fix double directory separator

Merge-request: 2543
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2
Eskil Abrahamsen Blomfeldt [Mon, 10 Jan 2011 14:11:52 +0000 (15:11 +0100)]
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2

11 years agoMerge branch 'qt-graphics-team-text-master'
Eskil Abrahamsen Blomfeldt [Mon, 10 Jan 2011 13:11:30 +0000 (14:11 +0100)]
Merge branch 'qt-graphics-team-text-master'

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Mon, 10 Jan 2011 12:09:39 +0000 (22:09 +1000)]
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 reversed condition introduced in 9a6cfc07e5
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once

11 years agoFix reversed condition introduced in 9a6cfc07e5
João Abecasis [Mon, 10 Jan 2011 11:39:16 +0000 (12:39 +0100)]
Fix reversed condition introduced in 9a6cfc07e5

Reviewed-by: Bradley T. Hughes
11 years agoCompile when qreal != double
Eskil Abrahamsen Blomfeldt [Mon, 10 Jan 2011 09:25:42 +0000 (10:25 +0100)]
Compile when qreal != double

Compile fix for devices where qreals are floats.

Reviewed-by: Fabien Freling
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Sat, 8 Jan 2011 05:50:11 +0000 (15:50 +1000)]
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:
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Sat, 8 Jan 2011 02:23:15 +0000 (12:23 +1000)]
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:
  QmlViewer: Remove unused class variables
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 23:03:14 +0000 (09:03 +1000)]
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:
  Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
  Fix compilation error on Solaris
  Check elapsed time only once

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 19:37:57 +0000 (05:37 +1000)]
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:
  Added api for efficient data driven baseline testing
  Need not keep client waiting until server has saved

11 years agoAdd /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher
miniak [Fri, 7 Jan 2011 18:16:33 +0000 (19:16 +0100)]
Add /DYNAMICBASE /NXCOMPAT to linker options in Visual Studio 2005 and higher

Native Win32 C++ projects created in Visual Studio have this enabled in the default configuration in order to increase security.

Merge-request: 2539
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 7 Jan 2011 16:30:00 +0000 (02:30 +1000)]
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:
  QmlViewer: Remove unused class variables
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Fri, 7 Jan 2011 16:06:12 +0000 (02:06 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoFix compilation error on Solaris
João Abecasis [Thu, 6 Jan 2011 16:16:20 +0000 (17:16 +0100)]
Fix compilation error on Solaris

d_type in dirent is a non-standard extension to POSIX available on some
platforms (namely BSDs, Mac, Linux, Symbian).

Taking the conservative approach and using this information only on
platforms known to support it.

Reviewed-by: Shane Kearns
11 years agoCheck elapsed time only once
João Abecasis [Wed, 5 Jan 2011 14:24:50 +0000 (15:24 +0100)]
Check elapsed time only once

Task-number: QTBUG-16262
Reviewed-by: Bradley T. Hughes
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2
aavit [Fri, 7 Jan 2011 15:50:33 +0000 (16:50 +0100)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

11 years agoMerge branch 'lancelot'
aavit [Fri, 7 Jan 2011 15:48:48 +0000 (16:48 +0100)]
Merge branch 'lancelot'

11 years agoAdded api for efficient data driven baseline testing
aavit [Fri, 7 Jan 2011 15:47:04 +0000 (16:47 +0100)]
Added api for efficient data driven baseline testing

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 13:17:06 +0000 (23:17 +1000)]
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:
  Assistant: Fix warnings.
  Assistant: Don't tabify "Open Pages" dock widget by default.

11 years agoAssistant: Fix warnings.
Christian Kandeler [Fri, 7 Jan 2011 13:03:52 +0000 (14:03 +0100)]
Assistant: Fix warnings.

11 years agoAssistant: Don't tabify "Open Pages" dock widget by default.
Christian Kandeler [Fri, 7 Jan 2011 10:56:33 +0000 (11:56 +0100)]
Assistant: Don't tabify "Open Pages" dock widget by default.

The user is likely to always want to see it plus one of the others.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 11:04:43 +0000 (21:04 +1000)]
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:
  QmlViewer: Remove unused class variables

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Fri, 7 Jan 2011 07:51:45 +0000 (17:51 +1000)]
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:
  Fixed bug and performance problem in windowsstyle.
  Restored old flushing behavior in -graphicssystem opengl on desktop.

11 years agoQmlViewer: Remove unused class variables
Kai Koehne [Fri, 7 Jan 2011 07:47:51 +0000 (08:47 +0100)]
QmlViewer: Remove unused class variables

11 years agoFixed bug and performance problem in windowsstyle.
Samuel Rødal [Thu, 6 Jan 2011 12:09:14 +0000 (13:09 +0100)]
Fixed bug and performance problem in windowsstyle.

QImage::fill(Qt::transparent) pre-4.8 is a bug, also using Format_ARGB32
is very unoptimal compared to Format_ARGB32_Premultiplied.

Task-number: QTBUG-16439
Reviewed-by: Eskil Abrahamsen Blomfeldt
11 years agoRestored old flushing behavior in -graphicssystem opengl on desktop.
Samuel Rødal [Wed, 5 Jan 2011 07:25:56 +0000 (08:25 +0100)]
Restored old flushing behavior in -graphicssystem opengl on desktop.

Change 284211ccbd2cbd recently introduced a fix for EGL, to prevent
flushing when nothing has been rendered into the back buffer. However,
the skip should only be done when there's no partial update support in
the window surface. If there is partial update support we can still
flush as usual.

Reviewed-by: Gunnar Sletta
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Fri, 7 Jan 2011 06:02:28 +0000 (16:02 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
  Updated QTOpenGL DEF files for WINSCW and ARMV5
  Updated DEF files for QtOpenGL for WINSCW and ARMV5

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Fri, 7 Jan 2011 02:40:07 +0000 (12:40 +1000)]
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:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Thu, 6 Jan 2011 23:19:34 +0000 (09:19 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
  Updated QTOpenGL DEF files for WINSCW and ARMV5
  Updated DEF files for QtOpenGL for WINSCW and ARMV5

11 years agoMerge commit 'qt-releng-review/master'
Eckhart Koppen [Thu, 6 Jan 2011 20:57:47 +0000 (22:57 +0200)]
Merge commit 'qt-releng-review/master'

11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Thu, 6 Jan 2011 20:05:55 +0000 (06:05 +1000)]
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:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 19:11:35 +0000 (05:11 +1000)]
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:
  Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 16:22:23 +0000 (02:22 +1000)]
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:
  QHostInfoCache: Use QElapsedTime instead of QTime

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Thu, 6 Jan 2011 16:04:26 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 15:46:03 +0000 (01:46 +1000)]
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:
  Designer: Block QEvent::WinIdChange.
  QUrl::setUrl should call detach
  qkeymapper_x11.cpp: fix compilation with LSB and without XKB

11 years agoFix KERN-EXEC 0 panic on exit when bearer is searching for WLANs
Shane Kearns [Thu, 6 Jan 2011 15:16:03 +0000 (15:16 +0000)]
Fix KERN-EXEC 0 panic on exit when bearer is searching for WLANs

The access point scanner cancels itself in the destructor.
This requires the handle to be valid, but it was closed in the symbian
engine destructor immediately before deleting the AP scanner.
Because of the way symbian active objects work, the crashing function
is only called if there was an asynchronous request in progress.
So it could be missed in cases where the scan completes faster than the
test case.

Task-number: QTBUG-16484
Reviewed-by: Markus Goetz
11 years agoDesigner: Block QEvent::WinIdChange.
Friedemann Kleint [Thu, 6 Jan 2011 14:34:48 +0000 (15:34 +0100)]
Designer: Block QEvent::WinIdChange.

As it causes an obscure deletion crash related to
the formeditor rubberband on Mac.

Reviewed-by: con
11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Thu, 6 Jan 2011 14:15:17 +0000 (00:15 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file

11 years agoQUrl::setUrl should call detach
Olivier Goffart [Thu, 6 Jan 2011 13:51:04 +0000 (14:51 +0100)]
QUrl::setUrl should call detach

Task-number: QTBUG-16425
Reviewed-by: Gabriel
Reviewed-by: Markus Goetz
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 13:22:53 +0000 (23:22 +1000)]
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:
  tst_qscriptclass: backport test from the v8 branch

11 years agoqkeymapper_x11.cpp: fix compilation with LSB and without XKB
Olivier Goffart [Thu, 6 Jan 2011 13:01:53 +0000 (14:01 +0100)]
qkeymapper_x11.cpp: fix compilation with LSB and without XKB

Task-number: QTBUG-16312
Reviewed-by: Marius Storm-Olsen
11 years agoMake application font family names locale sensitive in X11
Jiang Jiang [Wed, 5 Jan 2011 18:39:00 +0000 (19:39 +0100)]
Make application font family names locale sensitive in X11

So that they will match the family names returned by
QFontDatabase::families. Because the family names returned
by FcFreeTypeQueryFace are not sorted with locale as the
names returned by FcFontList, we have to find out the
family name matching the system language in the former case.

Task-number: QTBUG-14269
Reviewed-by: Eskil
11 years agotst_qscriptclass: backport test from the v8 branch
Olivier Goffart [Thu, 6 Jan 2011 12:16:37 +0000 (13:16 +0100)]
tst_qscriptclass: backport test from the v8 branch

From commit 4e39278225
Add test coverage to match 4.7 behaviour regarding original properties

11 years agoQHostInfoCache: Use QElapsedTime instead of QTime
Niklas Kurkisuo [Thu, 6 Jan 2011 08:39:14 +0000 (10:39 +0200)]
QHostInfoCache: Use QElapsedTime instead of QTime

Use QElapsedTime instead of QTime for performance gain. See QT-2965 for
more info.

Task-number: QTBUG-16468
Reviewed-by: Markus Goetz
11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-water-staging into master-integ...
Qt Continuous Integration System [Thu, 6 Jan 2011 09:44:58 +0000 (19:44 +1000)]
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:
  Cocoa: add support for QEventLoop::ExcludeUserInputEvents

11 years agoRemove unnecessarily frozen functions from QtOpenGL WINSCW DEF file
Eckhart Koppen [Thu, 6 Jan 2011 09:44:36 +0000 (11:44 +0200)]
Remove unnecessarily frozen functions from QtOpenGL WINSCW DEF file

Reviewed-by: TrustMe
11 years agoCocoa: add support for QEventLoop::ExcludeUserInputEvents
Richard Moe Gustavsen [Thu, 6 Jan 2011 08:44:22 +0000 (09:44 +0100)]
Cocoa: add support for QEventLoop::ExcludeUserInputEvents

Seems like this was just missing when used together with the
DialogExec/EventLoopExec flags. This patch avoid using cocoas
own run methods for dispatching events when we want to
exclude user input events, and instead do it ourselves.

This patch will only fix this issue when no modal windows are
showing. For modal windows, a bit more research is needed.

11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 09:28:55 +0000 (19:28 +1000)]
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:
  PathView crashed when the path is provided with undefined values.
  PathView: update modelCount before attempting to regenerate delegates.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Thu, 6 Jan 2011 09:14:48 +0000 (19:14 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team:
  Updated QTOpenGL DEF files for WINSCW and ARMV5

11 years agoUpdated QTOpenGL DEF files for WINSCW and ARMV5
Eckhart Koppen [Thu, 6 Jan 2011 09:10:41 +0000 (11:10 +0200)]
Updated QTOpenGL DEF files for WINSCW and ARMV5

Marked more functions absent

Reviewed-by: TrustMe
11 years agoPathView crashed when the path is provided with undefined values.
Martin Jones [Thu, 6 Jan 2011 06:57:06 +0000 (16:57 +1000)]
PathView crashed when the path is provided with undefined values.

Task-number: QTBUG-16356
Reviewed-by: Bea Lam
11 years agoPathView: update modelCount before attempting to regenerate delegates.
Martin Jones [Thu, 6 Jan 2011 05:48:52 +0000 (15:48 +1000)]
PathView: update modelCount before attempting to regenerate delegates.

If the model is a VisualDataModel, the count will initally be zero
and modelCount is not updated due to itemsInserted() before the
component is completed.

Task-number: QTBUG-16357
Reviewed-by: Bea Lam
11 years agoMerge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration
Qt Continuous Integration System [Thu, 6 Jan 2011 05:33:51 +0000 (15:33 +1000)]
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:
  Update docs - calling overloaded functions from QML is now supported
  Doc fixes for introduction page and Item docs

11 years agoUpdate docs - calling overloaded functions from QML is now supported
Bea Lam [Thu, 6 Jan 2011 04:10:35 +0000 (14:10 +1000)]
Update docs - calling overloaded functions from QML is now supported

11 years agoDoc fixes for introduction page and Item docs
Bea Lam [Thu, 6 Jan 2011 01:16:49 +0000 (11:16 +1000)]
Doc fixes for introduction page and Item docs

Moved 'Identity' and 'Property Change Signals' sections from Item
docs to the intro page, which previously had a section on ids but
this has been moved out of the 'Properties' section since an id isn't
an ordinary property.

11 years agoMerge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team
Qt Continuous Integration System [Thu, 6 Jan 2011 00:12:59 +0000 (10:12 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team

* 'master' of git://scm.dev.nokia.troll.no/qt/qt-releng-team: (118 commits)
  Updated DEF files for QtOpenGL for WINSCW and ARMV5
  Fix link error on MacOS
  Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)
  Set no brush when the brush is a solid patern transparent color.
  Fixed networkselftest failing to resolve hostname
  tst_qmessagebox: fix `about' test on mac
  tst_qmessagebox: make the failure message better for detailsButtonText
  tst_qmessagebox: simulate key events more robustly
  Clear WSERV content when a native child receives an "expose"
  Fixed a bug in elf2e32_qtwrapper regarding spaces in def files.
  Fixed several compile and deployment issues in the mmf phonon plugin.
  Fix fullscreen/Maximized dialog misplacement in Symbian
  Whitespace change
  Fix for coding conventions.
  Fix resource leak in QCLuceneStandardAnalyzer::QCLuceneStandardAnalyzer.
  Fix resource leak in QCLuceneStopAnalyzer::QCLuceneStopAnalyzer.
  Add Postgresql 8.x and 9 supports
  WorkerScript could starve image loading of CPU.
  More docs for FolderListModel
  Improve docs on attached properties on view delegates.
  ...

11 years agoUpdated DEF files for QtOpenGL for WINSCW and ARMV5
Eckhart Koppen [Wed, 5 Jan 2011 19:59:25 +0000 (21:59 +0200)]
Updated DEF files for QtOpenGL for WINSCW and ARMV5

Marked QGLContextResource::value absent

Reviewed-by: TrustMe
11 years agoMerge branch 'qt-master-from-4.7' of scm.dev.nokia.troll.no:qt/qt-integration into...
Qt Continuous Integration System [Wed, 5 Jan 2011 18:20:10 +0000 (04:20 +1000)]
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:
  Fix outdated tests
  Fix def file names for libinfixed testlib
  Generate freeze targets in Symbian
  QMeeGoGraphicsSystemHelper::setSwapBehavior implementation.
  Support for swap modes in QGLWindowSurface.
  Pre-create the GL share widget before window surface creation.
  QMeeGoSwitchEvent exported and static.
  Fixed first element being a LineToElement in QPainterPath::connectPath()
  Update visual tests
  Ignore static_and_shared in Symbian builds.

11 years agoMerge branch 4.7 into qt-master-from-4.7
Qt Continuous Integration System [Wed, 5 Jan 2011 16:04:57 +0000 (02:04 +1000)]
Merge branch 4.7 into qt-master-from-4.7

11 years agoMerge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master...
Qt Continuous Integration System [Wed, 5 Jan 2011 15:05:27 +0000 (01:05 +1000)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/qt-releng-staging:
  Added patch for temporary support for --listgen option in qmake
  Fixed broken configuration step for Symbian builds

11 years agoMerge commit 'qt-releng-review/master'
Eckhart Koppen [Wed, 5 Jan 2011 14:15:24 +0000 (16:15 +0200)]
Merge commit 'qt-releng-review/master'

11 years agoMerge commit 'qt-master/master'
Eckhart Koppen [Wed, 5 Jan 2011 13:54:38 +0000 (15:54 +0200)]
Merge commit 'qt-master/master'