profile/ivi/qtbase.git
12 years agoFix off-by-one error in binary search
Jiang Jiang [Thu, 28 Jul 2011 12:51:54 +0000 (14:51 +0200)]
Fix off-by-one error in binary search

This one-line change makes the binary search in QTextEngine::findItem
behave consistently with the linear search that it replaced in commit
acf678e57ed088f3e56a551cac6c7c3322005750. The new behavior seems to
cause crashes in kword (and perhaps other applications) by triggering a
logClusters assert, although I have been unable to create a unit test
that reproduces this.

Task-number: QTBUG-17209
Done-by: Dr. Robert Marmorstein <robert@narnia.homeunix.com>
Change-Id: I68b79f024e9836e1cc8b0f3514889120541eb2ea
Reviewed-on: http://codereview.qt.nokia.com/2343
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
12 years agoFlag meta objects generated by QtDBus
Aaron Kennedy [Fri, 29 Jul 2011 03:03:52 +0000 (13:03 +1000)]
Flag meta objects generated by QtDBus

QtDBus requires a QVariant argument to be passed to property reads and
writes.  For performance reasons QtDeclarative does not do this.  By
flagging the meta object as requiring this, QtDeclarative can do so only
required.

Task-number: QTBUG-15052

Change-Id: I032c946f079523f5f10217ed56642fb315265d9f
Reviewed-on: http://codereview.qt.nokia.com/2365
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Martin Jones <martin.jones@nokia.com>
12 years agoAdd notify signals for QIntvalidator, QDoubleValidator, QRegExpValidator
Charles Yin [Tue, 26 Jul 2011 03:46:54 +0000 (13:46 +1000)]
Add notify signals for QIntvalidator, QDoubleValidator, QRegExpValidator

Task-number:QTBUG-19956
Change-Id: I5ab5e4494189ece5b0eb1f63e73e49cb2c4e9656
Reviewed-by:Michael Brasser
Reviewed-on: http://codereview.qt.nokia.com/2147
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
12 years agoMake it possible to update a related table after an external update
Andy Shaw [Fri, 3 Jun 2011 06:17:40 +0000 (08:17 +0200)]
Make it possible to update a related table after an external update

When a table that is related to in a QSqlRelationalTableModel gets
updated in some way (e.g. a new row, or the data is changed) then the
related model could not be updated without recreating the
QSqlRelationalTableModel.

Now, to get around this, select() can be called on the related model to
get it to be updated.

Task-number: QTBUG-7885
Reviewed-by: Charles Yin
Reviewed-by: Michael Goddard
Change-Id: Ic589e840234f3a809bcb112a807a87afe0bc25ca
(cherry picked from commit 2c60a4f67f9fb02f3b711fe749b2f293a07b4e02)
Reviewed-on: http://codereview.qt.nokia.com/2224
Reviewed-by: Charles Yin <charles.yin@nokia.com>
12 years agoAdded meta type info for Q[Explicitly]SharedDataPointer
Denis Dzyubenko [Mon, 25 Jul 2011 12:38:24 +0000 (14:38 +0200)]
Added meta type info for Q[Explicitly]SharedDataPointer

Change-Id: I1269630ae5154f7318e1c7ae9fa2014a15234bf4
Reviewed-on: http://codereview.qt.nokia.com/2110
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoGet rid of compiler warnings with MSVC
Olivier Goffart [Wed, 27 Jul 2011 17:01:15 +0000 (19:01 +0200)]
Get rid of compiler warnings with MSVC

Change-Id: Ibd027c502a5b8bcbfc6dae71c4f244f1080d4064
Reviewed-on: http://codereview.qt.nokia.com/2303
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoEmit selectionChanged signals when input method alters selection.
Andrew den Exter [Mon, 25 Jul 2011 06:58:46 +0000 (16:58 +1000)]
Emit selectionChanged signals when input method alters selection.

Mark the selection as dirty if an input method event contains a
selection and emit selectionChanged() if it's not emitted by
finishChange().

Task-number: QTBUG-19731

Change-Id: Ief6f06f40071f64dae4db0ba365676c059a39c7e
Reviewed-on: http://codereview.qt.nokia.com/2081
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoFix typo in padnavigator example docs
Jason McDonald [Tue, 26 Jul 2011 05:22:37 +0000 (15:22 +1000)]
Fix typo in padnavigator example docs

Change-Id: Ifde02273107441add4eb77d8fc092eac2cc2c798
Reviewed-on: http://codereview.qt.nokia.com/2150
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix obsolete contact email
Jason McDonald [Tue, 26 Jul 2011 06:11:03 +0000 (16:11 +1000)]
Fix obsolete contact email

Replace the old Trolltech contact email address with the current Qt
contact email address.

Task-number: QTBUG-20370
Change-Id: If5b9c3a044e1ee46264548eea456c704ced8e363
Reviewed-on: http://codereview.qt.nokia.com/2153
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoconfigure: fixed setting of CFG_MAC_ARCHS for mac qpa builds
Rohan McGovern [Thu, 28 Jul 2011 01:48:28 +0000 (11:48 +1000)]
configure: fixed setting of CFG_MAC_ARCHS for mac qpa builds

Previously, the mac arch was only put into qconfig.pri for carbon
and cocoa builds.  Make sure it is also available for qpa builds.
This is needed for projects which need to select architecture-specific
sources in their .pro file.

Change-Id: I5f72e3b699b11dafc4dae052620913f2b9b81d0a
Reviewed-on: http://codereview.qt.nokia.com/2313
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoMark tst_qsslcertificate::verify with QEXPECT_FAIL
Rohan McGovern [Wed, 27 Jul 2011 22:41:50 +0000 (08:41 +1000)]
Mark tst_qsslcertificate::verify with QEXPECT_FAIL

Test started to fail, complains about outdated SSL certificate.

Task-number: QTBUG-20582
Change-Id: I2622375d9bc7b446dbbc18f72403896c60a8dee1
Reviewed-on: http://codereview.qt.nokia.com/2307
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jonas Rabbe <jonas.rabbe@nokia.com>
12 years agoRevert "test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux"
Michael Goddard [Tue, 26 Jul 2011 10:10:01 +0000 (12:10 +0200)]
Revert "test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux"

This reverts commit 33cb4ff4d45ddf389a7c676b36ddaf45f20b2f37

Test still seems unstable :(

Change-Id: I20d9c393e1553abba2a335532bee4e3ba716d8ce
Reviewed-on: http://codereview.qt.nokia.com/2179
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoTry to make sure the config test script is installed.
Michael Goddard [Mon, 25 Jul 2011 12:07:54 +0000 (22:07 +1000)]
Try to make sure the config test script is installed.

And try to fail a bit more gracefully if it isn't.

Change-Id: I62e01c0536aa0a032940d6a9a5ccf5edcfeef221
Reviewed-on: http://codereview.qt.nokia.com/2109
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoTighten up the config test success checking.
Michael Goddard [Mon, 25 Jul 2011 00:10:54 +0000 (10:10 +1000)]
Tighten up the config test success checking.

Try a lot harder to remove the old $TARGET output, since make
clean isn't sufficient.  Also fix a bug in program invocation
that was hidden because of the stale files.

Change-Id: I0a365409d81efb74c5836eaf9f129fd9b2cca77e
Reviewed-on: http://codereview.qt.nokia.com/2052
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoUse QFreeList for timer id allocation
Bradley T. Hughes [Tue, 19 Jul 2011 14:27:42 +0000 (16:27 +0200)]
Use QFreeList for timer id allocation

The timer id allocator doesn't need a paylod (hence T=void), but we want
to tune the allocation 'strategy.' We allocate a maximum of 6 blocks
(like before), but the first block is twice as large as before and is
not static writable anymore. The initial value is 1 (0 is not a valid
timer id), but otherwise the constants are the same as the defaults.

Change-Id: Ied49ff4d7a6a8d69bc8c7bfa5475e4111446659f
Reviewed-on: http://codereview.qt.nokia.com/2161
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoAdd QFreeList as an internal class
Bradley T. Hughes [Tue, 19 Jul 2011 13:53:32 +0000 (15:53 +0200)]
Add QFreeList as an internal class

This is a generic implementation of the lock-free free list found in
qabstracteventdispatcher.cpp. Use next() to get the next free entry in
the list, and release(id) when done with the id.

This version is templated and allows having a payload which can be
accessed using the id returned by next(). The payload is allocated and
deallocated automatically by the free list, but *NOT* when calling
next()/release(). Initialization should be done by code needing it after
next() returns. Likewise, cleanup should happen before calling
release(). It is possible to have use 'void' as the payload type, in
which case the free list only contains indexes to the next free entry.

Autotest included.

Change-Id: Ifd12a961d47f3d76593c45061f72e55c9b80a43b
Reviewed-on: http://codereview.qt.nokia.com/2160
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
12 years agoMake QTabWidget::tabBar() public.
David Faure [Tue, 26 Jul 2011 09:40:18 +0000 (11:40 +0200)]
Make QTabWidget::tabBar() public.

This is very much useful to be able to write things like
myTabWidget->tabBar()->setSelectionBehaviorOnRemove( QTabBar::SelectPreviousTab );
without subclassing QTabWidget.

Change-Id: Ic7c42709ea1086631d37f90f184b058c4b6e9601
Merge-request: 3
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2172
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
12 years agoWindows: fixed qtmain.lib not going to `lib' directory
Rohan McGovern [Tue, 26 Jul 2011 00:06:45 +0000 (10:06 +1000)]
Windows: fixed qtmain.lib not going to `lib' directory

`load(qt_module_config)' clobbers DESTDIR.
Rearrange the order so that our setting of DESTDIR works as intended.

Change-Id: Id6f02e9fb55069fae9b2a75c9d0f51578b84f4d1
Reviewed-on: http://codereview.qt.nokia.com/2130
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
12 years agoImprove doc to avoid row vs col major confusion.
Sarah Smith [Mon, 25 Jul 2011 04:38:08 +0000 (14:38 +1000)]
Improve doc to avoid row vs col major confusion.

There has been a few reports of user confusion from the fact that the
constData and data functions return results in column-major format.
There is nothing in the doc anywhere that states this, and nothing
states that the class is especially for OpenGL which would give a clue
at least.

Change-Id: I3a9afde0fbeb8b9d2bcba6a387620b60a56774b9
Reviewed-on: http://codereview.qt.nokia.com/2066
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Julian de Bhal <julian.debhal@nokia.com>
12 years agoEmit selectionChanged signals when input method alters the selection.
Andrew den Exter [Mon, 25 Jul 2011 05:48:01 +0000 (15:48 +1000)]
Emit selectionChanged signals when input method alters the selection.

Check if the input method removes the selection and force emit
selectionChanged if it sets a new selection.

Task-number: QTBUG-19727
Reviewed-by: Martin Jones
Change-Id: Ic8ea1044d0917aac4e52368f431ac9e5c7db7c56
Reviewed-on: http://codereview.qt.nokia.com/2076
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agoUpdate cursor position when selection is reversed.
Andrew den Exter [Mon, 25 Jul 2011 06:28:07 +0000 (16:28 +1000)]
Update cursor position when selection is reversed.

A reversed selection will have the same resolved start and end
positions but a different cursor position so testing the end points
alone doesn't guarantee the selection is the same.

Task-number: QTBUG-19456
Reviewed-by: Martin Jones
Change-Id: I516e5a501ec878d673f21e54d688fd2d21b624ef
Reviewed-on: http://codereview.qt.nokia.com/2080
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
12 years agotest: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux
Sergio Ahumada [Mon, 25 Jul 2011 18:32:45 +0000 (20:32 +0200)]
test: unmark tst_QWidget::getSetCheck() as "insignificant" for Linux

Change-Id: I86570148f1fcbf2932c6314b0a6c666c02a3554f
Reviewed-on: http://codereview.qt.nokia.com/2127
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoAdd the missing function in bootstrap
Olivier Goffart [Mon, 25 Jul 2011 11:12:00 +0000 (13:12 +0200)]
Add the missing function in bootstrap

(required for the metatype changes)

Change-Id: I0e3c73e7828493b4f03ec6439ec80b1c8c2bf377
Reviewed-on: http://codereview.qt.nokia.com/2105
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agotestlib: fix include of `qttestversion.h' in testlib.pro
Sergio Ahumada [Sun, 24 Jul 2011 14:10:33 +0000 (16:10 +0200)]
testlib: fix include of `qttestversion.h' in testlib.pro

The actual file defined in `sync.profile' and generated
by 'syncqt' is `qttestversion.h' instead of `qttestlibversion.h'

Change-Id: I90ed2d5b7cd9f98855a878c97afceced01e7e8b0
Reviewed-on: http://codereview.qt.nokia.com/2050
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoAdd initial support for bitmap version 4/5 headers.
Ilya Konkov [Fri, 22 Jul 2011 11:25:46 +0000 (13:25 +0200)]
Add initial support for bitmap version 4/5 headers.

The headers are just skipped, information stored in them is ignored.

Merge-request: 824

Change-Id: I48f37757114ed83cd5c92cb3d5a43eeaca4b91b3
Reviewed-on: http://codereview.qt.nokia.com/2108
Reviewed-by: Kim M. Kalland <kim.kalland@nokia.com>
12 years agoChanged QLibrary::resolve() to return a function pointer.
Kim Motoyoshi Kalland [Thu, 21 Jul 2011 16:47:26 +0000 (18:47 +0200)]
Changed QLibrary::resolve() to return a function pointer.

According to the C++ standard, there is no guarantee that
you can cast between function pointers and void pointers
without data loss (section 5.2.10-6).

Change-Id: I27f4d835e4c8ca8ecca0d76cfea9ce34491956bd
Reviewed-on: http://codereview.qt.nokia.com/1995
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
12 years agoMaking cached glyphs drawing check clearer
Jiang Jiang [Mon, 25 Jul 2011 08:52:48 +0000 (10:52 +0200)]
Making cached glyphs drawing check clearer

Putting the logic inside supportsTransformation() is a bit confusing and
that name is misleading.

Also move the same check in GL2 paint engine to the same place.

Change-Id: I182500a0ff375122e6be966b7ce2495c84d113d0
Reviewed-on: http://codereview.qt.nokia.com/2096
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoDelay masking the last character in Password echo mode.
Andrew den Exter [Mon, 25 Jul 2011 03:25:15 +0000 (13:25 +1000)]
Delay masking the last character in Password echo mode.

If QT_GUI_PASSWORD_ECHO_DELAY is defined in qplatformdefs.h with an
integer value in milliseconds, QLineEdit and TextInput will display
the last character entered unmasked for that delay period and then
mask the character as normal.  If QT_GUI_PASSWORD_ECHO_DELAY is
not defined then the behaviour is unchanged.

Task-number: QTBUG-17003
Reviewed-by: Martin Jones
(cherry picked from commit f9e7aee2019d321edd655bfde7de43f20a106971)

Conflicts:

src/declarative/graphicsitems/qdeclarativetextinput.cpp
tests/auto/declarative/qdeclarativetextinput/tst_qdeclarativetextinput.cpp

Change-Id: I3683223189b7176e4ef5081ee315c95a0efb9cfe
Reviewed-on: http://codereview.qt.nokia.com/2060
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com>
13 years agoUse QUuid::toByteArray() instead of QUuid::toString().toAscii()
liangqi [Fri, 22 Jul 2011 12:19:44 +0000 (14:19 +0200)]
Use QUuid::toByteArray() instead of QUuid::toString().toAscii()

This is a cheaper way.

Change-Id: Ibfc67e0ac46a77e95b2ef32cd6f28c7409c42d63
Reviewed-on: http://codereview.qt.nokia.com/2037
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
13 years agoAdd rudimentary config.test support when configuring modules.
Michael Goddard [Thu, 30 Jun 2011 04:51:16 +0000 (14:51 +1000)]
Add rudimentary config.test support when configuring modules.

An extra script is added (qtmodule-configtests) which is currently
invoked from syncqt (with some derived parameters passed to it).

The module can optionally have an entry in the module's sync.profile
file in the form of a perl map of "test name" => parameters.  Tests
can print an advisory message if they fail (e.g. "Install this
SDK/dev package"), or abort the syncqt process (e.g. mandatory
prereq missing).  Also, if the test has a "requires(foo)" line
that results in it being skipped, this is also supported.

Change-Id: Ic3c820a488a0992c944994d4d7dc283da36742d6
Reviewed-on: http://codereview.qt.nokia.com/928
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sarah Jane Smith <sarah.j.smith@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoQAbstractConcatenable::convertFromAscii: make len the actual length
Olivier Goffart [Thu, 21 Jul 2011 14:39:55 +0000 (16:39 +0200)]
QAbstractConcatenable::convertFromAscii: make len the actual length

Before, it was the length + 1, to include the ending \0 (for historical
reasons)
Having it the actual length is more intuitive and less error prone

Also added QT_ASCII_CAST_WARN to QConcatenable<QByteArray>::appendTo
to show the warnig that convertion from ascii to qstring occurs.

Change-Id: Ie7c8552b6b4e7ccb393cb09f5f0ca9b00336c714
Reviewed-by: thiago
Reviewed-on: http://codereview.qt.nokia.com/1988
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoremove Qt3 leftovers
Ritt Konstantin [Thu, 21 Jul 2011 08:20:06 +0000 (10:20 +0200)]
remove Qt3 leftovers

Merge-request: 22
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Change-Id: I5d25fb05894d9baa645f97946e1f9aaa1622c876
Reviewed-on: http://codereview.qt.nokia.com/1925
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoOptimize QMetaObject::property().
Martin Jones [Fri, 22 Jul 2011 01:02:19 +0000 (11:02 +1000)]
Optimize QMetaObject::property().

Avoid using QByteArray.

Change-Id: I7216bc88efdd6e4e57d84b8c45e7c38119dc7092
Reviewed-on: http://codereview.qt.nokia.com/2000
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
13 years agoAdd unit tests to QStringLiteral and QByteArrayLiteral with operator %
Thiago Macieira [Thu, 21 Jul 2011 14:33:40 +0000 (16:33 +0200)]
Add unit tests to QStringLiteral and QByteArrayLiteral with operator %

This requires a fix for QByteArrayLiteral to work too.

Change-Id: I3c2a50ad431d5b0c014a341e675fa54e7b206e70
Merge-request: 27
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1967
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoSilence expected warnings from QObject::connect()/disconnect()
David Faure [Thu, 21 Jul 2011 14:56:56 +0000 (16:56 +0200)]
Silence expected warnings from QObject::connect()/disconnect()

Merge-request: 4
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Change-Id: Ibee937140d0d81377c6adf74fce7856c4655b924
Reviewed-on: http://codereview.qt.nokia.com/1990
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoFix the timeout calculation again.
Thiago Macieira [Thu, 21 Jul 2011 15:10:30 +0000 (17:10 +0200)]
Fix the timeout calculation again.

The commit 412ef92162f8874a1585221125c31ef5f8ccc9cb introduced a fix, but the
fix was incomplete. Fix it for good.

Change-Id: I3e7fbdb294f8e960fbbf2e830790750240ed813a
Merge-request: 30
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1991
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agotest: unmark tst_QNetworkAddressEntry::prefixAndNetmask as "insignificant"
Sergio Ahumada [Thu, 21 Jul 2011 19:04:32 +0000 (21:04 +0200)]
test: unmark tst_QNetworkAddressEntry::prefixAndNetmask as "insignificant"

It was fixed by cfbdb4cc8a3a1f9e0036ec387cbc00d2058ee6e7

Change-Id: I2cd1216235c77c6f2521a6d899e81e7e442758cd
Reviewed-on: http://codereview.qt.nokia.com/1997
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agoPrefix each output line with the library being processed
Marius Storm-Olsen [Thu, 7 Jul 2011 18:48:02 +0000 (18:48 +0000)]
Prefix each output line with the library being processed

Makes it easier to track which library output is coming from,
when building Qt with -j > 1.

Change-Id: I9acda04e84014dc441e409a0b24b2f78762dcc1c
Reviewed-on: http://codereview.qt.nokia.com/1765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoMake syncqt output more compact by default, and add verbosity level
Marius Storm-Olsen [Thu, 7 Jul 2011 18:05:49 +0000 (18:05 +0000)]
Make syncqt output more compact by default, and add verbosity level

By default, syncqt will now compress the console output of what it's
doing. Increasing the verbosity level will make syncqt output the same
as before

Change-Id: I542072504f022f87997b4036eda5747a5da88839
Reviewed-on: http://codereview.qt.nokia.com/1764
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoClose filehandle when done
Marius Storm-Olsen [Mon, 18 Jul 2011 12:08:12 +0000 (07:08 -0500)]
Close filehandle when done

Also add a fixme, since the version headers are currently
being created in the source directory.

Change-Id: If6e9eeba854a1f35561b69518eb8739dc28a58be
Reviewed-on: http://codereview.qt.nokia.com/1763
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
13 years agoMake sure we qtPrepareTool moc, uic and rcc too
Marius Storm-Olsen [Tue, 12 Jul 2011 18:01:03 +0000 (13:01 -0500)]
Make sure we qtPrepareTool moc, uic and rcc too

Their paths may vary depending on configuration and
build/install state going forward.

Change-Id: I60c8bcd1dc6c2fb729bf84d211875a3d910d5e4a
Reviewed-on: http://codereview.qt.nokia.com/1761
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFix non-installed library detection
Marius Storm-Olsen [Tue, 12 Jul 2011 18:19:01 +0000 (13:19 -0500)]
Fix non-installed library detection

Change-Id: I1eb8337bebb524b9f02aef63cd42efcb4a9211bc
Reviewed-on: http://codereview.qt.nokia.com/1759
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoMake sure we only run syncqt for the non-buildpass cases
Marius Storm-Olsen [Sat, 16 Jul 2011 12:13:16 +0000 (07:13 -0500)]
Make sure we only run syncqt for the non-buildpass cases

In debug_and_release builds, we have three passes, the glue
pass, and a pass for each build type. We only need to run
syncqt when we are in a glue pass, which is when
'build_pass' is not set. In non-debug_and_release builds,
build_pass is never set, so this condition works for all
build types, with multiple configurations or not.

Change-Id: I191da0df3ad422bb5fb8994391c2b2d2e23efc32
Reviewed-on: http://codereview.qt.nokia.com/1717
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoMake qmake load default_pre.prf for each project, like default_post.prf
Marius Storm-Olsen [Sat, 16 Jul 2011 12:04:47 +0000 (12:04 +0000)]
Make qmake load default_pre.prf for each project, like default_post.prf

If you ran qmake with 'qmake -r', default_pre.prf would only be run once
while default_post.prf would run for every sub-project.

This makes it more symmetrical and correct.

Change-Id: I1d096c38dffb16f1d256c511ed9e2912cfaefe66
Reviewed-on: http://codereview.qt.nokia.com/1716
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoRemove loading "default" as a fall-back for missing "default_pre"
Marius Storm-Olsen [Mon, 18 Jul 2011 10:50:20 +0000 (05:50 -0500)]
Remove loading "default" as a fall-back for missing "default_pre"

"default" was used a very long time ago, and it's time to let it go.

Change-Id: I230573ef778789f6e1a5a7df3543e660392da39b
Reviewed-on: http://codereview.qt.nokia.com/1746
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoAdd support for rawFonts loaded from data in FaceId
Pierre Rossi [Tue, 19 Jul 2011 16:36:05 +0000 (18:36 +0200)]
Add support for rawFonts loaded from data in FaceId

The problem was that with an empty filename and index of 0, all raw fonts
loaded from data had the same FaceId, and we wouldn't bother to load
another one after doing this once.
This commit introduces a uuid in FaceId to help distinguish them in
that case.

Change-Id: I93655ff07a7d8856af1f854024e207c519f8ed1a
Reviewed-on: http://codereview.qt.nokia.com/1882
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agotest: fix tst_QFile::rename() autotest
Sergio Ahumada [Wed, 20 Jul 2011 14:50:15 +0000 (16:50 +0200)]
test: fix tst_QFile::rename() autotest

This test was incorrectly assuming that a file named "Makefile" exists.

Also removing the `insignificant_test' mark for Linux.

Change-Id: I318b12f67e0476d6f08d1fc86194ca96f2bdb373
Reviewed-on: http://codereview.qt.nokia.com/1923
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agoMake the N parameter to the QXXXLiterals be the actual string length
Thiago Macieira [Thu, 21 Jul 2011 14:33:17 +0000 (16:33 +0200)]
Make the N parameter to the QXXXLiterals be the actual string length

Before, it was the length + 1, to include the ending NUL or
U+0000. This avoids mistakes of -1 in QStringBuilder and will allow us
simpler code in the User-Defined Literal (future improvement)

Change-Id: I75c47d6c44579124888f925e240817229347dc70
Merge-request: 31
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1966
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoSpeed up tst_qcoreapplication
David Faure [Thu, 21 Jul 2011 14:56:55 +0000 (16:56 +0200)]
Speed up tst_qcoreapplication

It was emitting signals from a thread for 15 seconds.
Doing this 10 times should be enough, and way faster.
Also a race made it sometimes wait 15 seconds while nothing was happening,
and then it would still succeed; the new code prevents this from happening.

Change-Id: Ib36785dd8090047c760ddcca44fc805efaef1bd8
Merge-request: 4
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1989
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agotst_QNetworkAddressEntry::prefixAndNetmask use QHostAddress::AnyIPv4
Martin Petersson [Wed, 20 Jul 2011 10:13:15 +0000 (12:13 +0200)]
tst_QNetworkAddressEntry::prefixAndNetmask use QHostAddress::AnyIPv4

Update the test after the introduction of QHostAddress::AnyIPv4
in 85136496bc8517951dcc3e670d1a46d340819f0d

Change-Id: I3b84e85b6dcefa69bf5953205e288a6f0affb341
Reviewed-on: http://codereview.qt.nokia.com/1873
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Markus Goetz
13 years agoFixed memory leak in the TIF handler.
Kim Motoyoshi Kalland [Tue, 19 Jul 2011 15:53:25 +0000 (17:53 +0200)]
Fixed memory leak in the TIF handler.

Change-Id: Iaa3093b172ddbac6597169ee4217a7f6c7867e60
Reviewed-on: http://codereview.qt.nokia.com/1952
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agounmark tst_moc as failing
Olivier Goffart [Wed, 20 Jul 2011 14:45:29 +0000 (16:45 +0200)]
unmark tst_moc as failing

It was fixed in 77ed8787ac9ef0f74c2ab6699af3fec434e433e5

Change-Id: Ic26bfd63c1e9025117fde048b2aa94c73ae7866d
Reviewed-on: http://codereview.qt.nokia.com/1897
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years agominor improvements to QChar documentation
Ritt Konstantin [Thu, 21 Jul 2011 08:20:07 +0000 (10:20 +0200)]
minor improvements to QChar documentation

Merge-request: 22
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Change-Id: Ib70922f98385888c084ccd3224a9bb12ca766ccf
Reviewed-on: http://codereview.qt.nokia.com/1926
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoFix more use of C style cast.
Olivier Goffart [Thu, 21 Jul 2011 08:27:25 +0000 (10:27 +0200)]
Fix more use of C style cast.

Commit 77ed8787ac9ef0f74c2ab6699af3fec434e433e5 was not enough

Fix the test tst_Moc::oldStyleCasts()

Change-Id: Ia2f98f4e02ba512c3f7fd7cd09b692a1aabd8de0
Reviewed-on: http://codereview.qt.nokia.com/1927
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoFixed clipping errors for non-extended paint engines.
Samuel Rødal [Mon, 30 May 2011 07:38:47 +0000 (09:38 +0200)]
Fixed clipping errors for non-extended paint engines.

Partially revert change a33ef62469fd71bec for the non-extended paint
engine path.

Task-number: QTBUG-19525
Reviewed-by: Andy Shaw
(cherry picked from commit f370dd07560c449ba17d13475721f7d3b46e6b24)

Change-Id: I19eaaa265a54b2df65a8ec73e36fbdf58b1a4334
Reviewed-on: http://codereview.qt.nokia.com/1211
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoDoc: Removed documentation for deleted code.
David Boddie [Tue, 19 Jul 2011 12:42:08 +0000 (14:42 +0200)]
Doc: Removed documentation for deleted code.

Change-Id: Icdbc05decac3dfe3fc18ce073c494e1fce4ea347
Reviewed-on: http://codereview.qt.nokia.com/1824
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
13 years agoDoc: Speculative attempt to fix build breakage.
David Boddie [Wed, 8 Jun 2011 16:09:34 +0000 (18:09 +0200)]
Doc: Speculative attempt to fix build breakage.

Case sensitivity problems strike again.
(cherry picked from commit 9aa5f949f092032589917a0bfe16e78828d0dabe)

Change-Id: I5c9472c385fb045db8ab8ea54ec69bebb934ec6c
Reviewed-on: http://codereview.qt.nokia.com/407
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
13 years agoDoc: Fixed file name of a header file to use lower case characters.
David Boddie [Wed, 8 Jun 2011 16:09:01 +0000 (18:09 +0200)]
Doc: Fixed file name of a header file to use lower case characters.
(cherry picked from commit c68d24b7bafa3058d44c0a30ade329972403b6c6)

Change-Id: If733804fbab8baf5c4a5331005834ddeecec3ff4
Reviewed-on: http://codereview.qt.nokia.com/406
Reviewed-by: David Boddie
13 years agoGet rid of the evilness of Q_GLOBAL_STATIC_WITH_INITIALIZER
Thiago Macieira [Wed, 20 Jul 2011 14:06:58 +0000 (16:06 +0200)]
Get rid of the evilness of Q_GLOBAL_STATIC_WITH_INITIALIZER

That macro is a nightmare. It leads to writing code that is
thread-unsafe or other problems. So rewrite the code that used this
macro to use special-purpose classes with constructors.

This commit does not introduce new errors. The FIXME in qicon.cpp
(qtIconCache()) was a condition already present. It does fix the race
conditions that were present in qbrush.cpp nullBrushInstance() and
qfontengine.cpp qt_grayPalette().

Specialising QGlobalStatic is also evil.

Change-Id: I039311f6a5ac9ea4ad7b310b870a2adf888da7e5
Merge-request: 10
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1895
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoForward port qt modifications for sqlite3.c
Charles Yin [Tue, 19 Jul 2011 01:29:45 +0000 (11:29 +1000)]
Forward port qt modifications for sqlite3.c

Forward port from:
 1. c42bc88a9f366899747945a4478492cf765c7166
 2. 0d61cf15358e1ff0b5125542ed4a9c4b7e96c141

Task-number: QTBUG-16607
Reviewed-by: Michael Goddard
(cherry picked from commit 2156f7057df5c748b51a7fd16a044f39c60b872c)

Change-Id: I21a4490c212e8e02ff3fc336b150d2e8bcf02c2b
Reviewed-on: http://codereview.qt.nokia.com/1808
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoForward port the vxworks changes
Charles Yin [Tue, 19 Jul 2011 01:22:59 +0000 (11:22 +1000)]
Forward port the vxworks changes

forward port from d7b688870aead912690188b324d370b920a7a600

Task-number: QTBUG-16607
Reviewed-by: Michael Goddard
(cherry picked from commit c89c7ebd2600f916eab937cb4853707ab066bc25)

Change-Id: I5130fcaaeb162b38c015f8649e83cbf820fb8a44
Reviewed-on: http://codereview.qt.nokia.com/1807
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoUpdate sqlite to 3.7.7.1
Charles Yin [Tue, 19 Jul 2011 00:53:34 +0000 (10:53 +1000)]
Update sqlite to 3.7.7.1

Updated sqlite3.h, sqlite3.c and shell.c from sqlite.org
SHA1 for sqlite3.c: d47594b8a02f6cf58e91fb673e96cb1b397aace0

Task-number: QTBUG-16607
Reviewed-by: Michael Goddard
(cherry picked from commit 0cb9b95beb9949ec31c5c67fd360c4b463472efe)

Change-Id: I56c5ce8db178ab850992812d6f8ff7e74eb9b7dc
Reviewed-on: http://codereview.qt.nokia.com/1806
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoSort all readdirs, so the output is reliable
Marius Storm-Olsen [Wed, 20 Jul 2011 15:42:26 +0000 (15:42 +0000)]
Sort all readdirs, so the output is reliable

We need the content of the generated module master headers to be
reliable, so rebuilding in the same environment doesn't produce
different results. This minimizes the diff from package building
systems.

Change-Id: Ic914f56e13b11f313f01f6b8666c2d28aa50a985
Reviewed-on: http://codereview.qt.nokia.com/1900
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Arvid Picciani <arvid.picciani@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoDoc: Added missing license headers for documentation and examples.
David Boddie [Wed, 8 Jun 2011 15:42:42 +0000 (17:42 +0200)]
Doc: Added missing license headers for documentation and examples.

Change-Id: I696f6ce2ee9b6055c549e615de952773d171f3e7
Reviewed-on: http://codereview.qt.nokia.com/408
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: David Boddie
13 years agoAdd a way to check if we have a matching family in the database.
Pierre Rossi [Fri, 15 Jul 2011 12:03:15 +0000 (14:03 +0200)]
Add a way to check if we have a matching family in the database.

This is needed in order to get proper font fallback, and incidentally
webfonts, working in QtWebKit.
See: https://bugs.webkit.org/show_bug.cgi?id=55036
Internal for now, maybe it could be made public for a future release.

Task-number: QTBUG-15575
Change-Id: I5c454689125cd9d5fda26ff2149208ed1beec24d
Reviewed-on: http://codereview.qt.nokia.com/1829
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agoFixed build of generic linuxinput plugin.
Samuel Rødal [Wed, 20 Jul 2011 09:34:46 +0000 (11:34 +0200)]
Fixed build of generic linuxinput plugin.

Change-Id: I2289e369c831bfee9646ffe5c587647443548804
Reviewed-on: http://codereview.qt.nokia.com/1870
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
13 years agoCleanup qRound and qRound64: provide overloads for double and float
Thiago Macieira [Tue, 12 Jul 2011 15:08:35 +0000 (17:08 +0200)]
Cleanup qRound and qRound64: provide overloads for double and float

Instead of having #ifdefs for the type of qreal, simply provide
overloads for both types.

Change-Id: I58582f57d5cd68fcad3fe9efb5fea5935f61b9e3
Merge-request: 17
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1542
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoDo not use qRound with integers
Olivier Goffart [Wed, 13 Jul 2011 08:40:36 +0000 (10:40 +0200)]
Do not use qRound with integers

Required for https://qt.gitorious.org/qt/qtbase/merge_requests/17

Change-Id: I5319ea99eb083c5931c55a246f7057fbc88c8fa4
Reviewed-by: Thiago
Reviewed-on: http://codereview.qt.nokia.com/1866
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoAdd docs for QSqlRelationalTableModel::JoinMode
Charles Yin [Tue, 19 Jul 2011 05:04:24 +0000 (15:04 +1000)]
Add docs for QSqlRelationalTableModel::JoinMode

Task-number:QTBUG-8217
Reviewed-by:Michael Goddard

(cherry picked from commit e2e62bc810d21fecc9ed1d1db486b529b760d292)

Change-Id: Ie2af750c3a64aa634e11617cf9b3f9e7bdcf3a5f
Reviewed-on: http://codereview.qt.nokia.com/1854
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoFixed behavior on NULL foreign keys
DaNiMoTh [Tue, 19 Jul 2011 04:57:07 +0000 (14:57 +1000)]
Fixed behavior on NULL foreign keys

Instead of using a simple INNER JOIN, like:

SELECT a,b,rel.c FROM table1, table2 WHERE (table1.smthing =
table2.smthing)

which doesn't show row where foreign keys are NULL, allow use of LEFT
JOIN like:

SELECT a,b,rel.c FROM table1 LEFT JOIN table2 ON table1.smthing =
table2.smthing

The trick works also for multi-relational tables.
Just remember to use the new API setJoinMode.

Signed-off-by: DaNiMoTh <jjdanimoth@gmail.com>
Task-number:QTBUG-8217
Reviewed-by:Michael Goddard
Reviewed-by:Charles Yin

Merge-request: 2576
Reviewed-by: Charles Yin <charles.yin@nokia.com>
(cherry picked from commit c4280dbd9bb37cca21d007f5f8b9217f80b44043)

Change-Id: I349f9418e4859923977942add59872b000cac2c5
Reviewed-on: http://codereview.qt.nokia.com/1853
Reviewed-by: Charles Yin <charles.yin@nokia.com>
13 years agoupdate change file
Charles Yin [Tue, 19 Jul 2011 03:45:44 +0000 (13:45 +1000)]
update change file

(cherry picked from commit 2b13b3d367cb6cda48ab9183d9ad5b2eee09e129)

Change-Id: I3c7cecf1f099e2868653c041d88a4208b77c5748
Reviewed-on: http://codereview.qt.nokia.com/1809
Reviewed-by: Charles Yin <charles.yin@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoUse truncate only for subpixel boundingBox x position
Jiang Jiang [Fri, 8 Jul 2011 11:39:36 +0000 (13:39 +0200)]
Use truncate only for subpixel boundingBox x position

Since Lion, Core Text starts to return fractional values for
x origin in the glyph bounding box. To get correct alignment
we need to make it integer, it seems that round will cut certain
pixels (x = 0.6 will be round to 1, then that glyph will be moved
too much to the left in image glyph cache). Reverting 4297b85a
appears to work fine on previous version of Mac OS X as well.

This change will not affect Windows (DirectWrite) and FreeType
font engines since they both return integer values for that.

Change-Id: I830f5b0bd27cad3a3a84b157da428134fb979703
Reviewed-by: Eskil
Reviewed-on: http://codereview.qt.nokia.com/1667
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agofix QFileInfo::isSymLink() for NTFS mount points
Joerg Bornemann [Tue, 19 Jul 2011 13:23:00 +0000 (15:23 +0200)]
fix QFileInfo::isSymLink() for NTFS mount points

Mount points are no symlinks. Period.
This was a regression to 4.7 which broke building Qt in a mount point.

Change-Id: Ib36688d7d394bbb7ab52629f8273c7fe4c0d7be8
Reviewed-by: Thomas Hartmann
Task-number: QTBUG-20431
Reviewed-on: http://codereview.qt.nokia.com/1830
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
13 years agoAdd a qHash for QUuid
Olivier Goffart [Mon, 18 Jul 2011 10:12:57 +0000 (12:12 +0200)]
Add a qHash for QUuid

Change-Id: Ib0d9a765b8db3b34aa20d510de501c72a54cacbe
Reviewed-on: http://codereview.qt.nokia.com/1743
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Xizhi Zhu <xizhi.zhu@nokia.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
13 years agoUpdate the documentation of QUuid::operator QString
Olivier Goffart [Mon, 18 Jul 2011 10:12:29 +0000 (12:12 +0200)]
Update the documentation of QUuid::operator QString

2c8e030a3f1c2fd75737c883edacab5773755ee5 forgot to make it obsolete

Change-Id: Ic4d1f04c8c9c6656c3e93c60e7483b14f4517f19
Reviewed-on: http://codereview.qt.nokia.com/1742
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoFix use of C style cast.
Olivier Goffart [Mon, 18 Jul 2011 13:48:40 +0000 (15:48 +0200)]
Fix use of C style cast.

Fix the test tst_Moc::oldStyleCasts()

(The test make sure moc do not generate old C cast, by compiling the
generated code and testing for gcc warning. But if it is present in the
public header, the warning will be shown)

Change-Id: I2fd3d01e7d78639d97bea021c200afbe2caae85f
Reviewed-on: http://codereview.qt.nokia.com/1772
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
13 years agoImplement todos in touchscreen generic plug-in.
Laszlo Agocs [Mon, 18 Jul 2011 10:44:47 +0000 (13:44 +0300)]
Implement todos in touchscreen generic plug-in.

The patch implements periodic clearing of the point states when no
activity occurs (i.e. no ev_syn is coming at all, meaning that most
probably all the fingers are already up) and also moves the entire
functionality into a separate thread even when used as a plug-in.

Change-Id: Ib1daa738085b61af9b07eb8a284416e5a3fcabe8
Reviewed-on: http://codereview.qt.nokia.com/1744
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
13 years agoQNetworkAccessFileBackend: Do not accept file url without scheme set.
Martin Petersson [Tue, 19 Jul 2011 11:57:13 +0000 (13:57 +0200)]
QNetworkAccessFileBackend: Do not accept file url without scheme set.

In Qt 4.8 this generated a warning. For Qt 5 we should no longer
accept file urls without a scheme set. So you should use file://
for local files.

Change-Id: I57789e2b56b712aa4f370aec9437c6febf0d0211
Reviewed-on: http://codereview.qt.nokia.com/1822
Reviewed-by: Markus Goetz
13 years agotests: do not run the testlib selftest helpers during `make check'
Rohan McGovern [Mon, 18 Jul 2011 23:24:27 +0000 (09:24 +1000)]
tests: do not run the testlib selftest helpers during `make check'

These projects are conceptually not autotests, but more like helper
programs for the tst_selftests autotest.  Some of them are expected to
fail, so they should not be run except via tst_selftests.

Change-Id: Iba8e4242e8dad9f92874ae690c9f4d9814758f4b
Reviewed-on: http://codereview.qt.nokia.com/1791
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agotests: do not run benchmarks by default in 'make check'
Rohan McGovern [Mon, 18 Jul 2011 23:45:08 +0000 (09:45 +1000)]
tests: do not run benchmarks by default in 'make check'

`make check' is intended primarily for running functional tests.
For the most part, it does not make sense to run benchmarks in the same
test environment as the functional tests.

Also, the runtime for some of these benchmarks is quite long, and some
of them share the same name as existing functional tests.  These are
problematic.

Change-Id: I2ca4cfa24c73280a0b73e51423007eaff92085b8
Reviewed-on: http://codereview.qt.nokia.com/1794
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
13 years agotests: Mark failing autotests as "insignificant" for now
Sergio Ahumada [Mon, 18 Jul 2011 11:54:52 +0000 (13:54 +0200)]
tests: Mark failing autotests as "insignificant" for now

This is meant to be a temporary solution to not hold any further
development. JIRA tasks might be filed for failing tests.

Change-Id: I08a5f5b0cb153e7fd7890b2936ec3bb6b3a0907c
Reviewed-on: http://codereview.qt.nokia.com/1753
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
13 years ago"Fix" the crash at startup on MSVC
Olivier Goffart [Fri, 15 Jul 2011 15:51:07 +0000 (17:51 +0200)]
"Fix" the crash at startup on MSVC

The problem is that for some reasons, QByteArray::shared_null (and
probably shared_empty, and the ones for QString) are not in the .rodata
anymore, and they are initialized by code.
programs like QMake, which has others global objects (like global
QFiles) that uses QByteArray crashes, because they reference and
dereference shared_null (and try to destroy shared_null)
That happens before shared_null's refcount is initialized to -1

The solution here is not to ref() the objects that have a refcount of 0
(that is what the refcount is before it is initialized to -1)

The real fix to this problem would be to understand why it is not in the
proper section, and make sure it is.

Change-Id: I5b7e966ed4c460b90dba70855f4dc50685dff97f
Reviewed-on: http://codereview.qt.nokia.com/1712
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
13 years agoMoved red-black tree from qtriangulator.cpp into its own file.
Kim Motoyoshi Kalland [Fri, 15 Jul 2011 11:56:26 +0000 (13:56 +0200)]
Moved red-black tree from qtriangulator.cpp into its own file.

Moved the red-black tree class so it can be used outside the
triangulator as well.

Change-Id: I1d63fc88502e8e6c390cac2820c0ce45721cda79
Reviewed-on: http://codereview.qt.nokia.com/1710
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
13 years agofix access to free()d memory
Oswald Buddenhagen [Fri, 15 Jul 2011 13:39:27 +0000 (15:39 +0200)]
fix access to free()d memory

the 'item' reference may become invalid inside the loop.

this approach was chosen (instead of making 'item' a non-reference) to
keep the code more in sync with creator (where the string type is more
complex).

Change-Id: I60a4b0654dc47c0e3466d43904c358eb7e3e64e2
Reviewed-By: Marius Storm-Olsen
Reviewed-on: http://codereview.qt.nokia.com/1702
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
13 years agoFix the timeout calculation for futexes in QMutex.
Thiago Macieira [Thu, 14 Jul 2011 12:43:44 +0000 (14:43 +0200)]
Fix the timeout calculation for futexes in QMutex.

Recalculate how much time is remaining.

This commit needs to be backported to 4.8.

Change-Id: Ib587335bb90306e65969bb26256fb388f8f6bd24
Merge-request: 20
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1666
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoDeprecated QUuid::toString
Olivier Goffart [Wed, 8 Jun 2011 09:55:40 +0000 (11:55 +0200)]
Deprecated QUuid::toString

Change-Id: I1186358df1c3f7615868725d93621608ed22ac99
Reviewed-on: http://codereview.qt.nokia.com/432
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
13 years agofixup for d17c76feee9eece4f7d9d1c5cec254842bb0a639
Ritt Konstantin [Fri, 15 Jul 2011 09:37:10 +0000 (11:37 +0200)]
fixup for d17c76feee9eece4f7d9d1c5cec254842bb0a639

removing the NoCategory enum value caused all category flags to change.
not an issue for qchar where they were used properly, but an issue for qregexp
where the hardcoded values were used instead.
the `all_cats` could be set to `FLAG(QChar::Symbol_Other + 1) - 1` which is shorter,
but I don't want hardcode the values in order to avoid similar issues in he future

Change-Id: Ie3ae2fca1b01d5911b834f439a0a6216766b8a20
Merge-request: 21
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/1696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoRevert "make QChar::Unicode_Unassigned a constantly big value"
Olivier Goffart [Thu, 14 Jul 2011 14:21:21 +0000 (16:21 +0200)]
Revert "make QChar::Unicode_Unassigned a constantly big value"

This reverts commit ebfd24a20b1acdced5fe032eedb2737efdc6eb92.

Breaks QChar and QString autotests

Change-Id: If1e915520ea491262c5f7753368be98c02ddac5e
Reviewed-by: Ritt Konstantin
Reviewed-on: http://codereview.qt.nokia.com/1672
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoRegenerate unicode tables
Olivier Goffart [Thu, 14 Jul 2011 14:31:20 +0000 (16:31 +0200)]
Regenerate unicode tables

Required after d17c76feee9eece4f7d9d1c5cec254842bb0a639

Change-Id: I6820b5cbb78636aa5348bdddf8824ea5c78ba934
Reviewed-on: http://codereview.qt.nokia.com/1673
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoDeprecate some QPixmap functions (marked as obsolete already).
Samuel Rødal [Tue, 12 Jul 2011 12:33:53 +0000 (14:33 +0200)]
Deprecate some QPixmap functions (marked as obsolete already).

Reviewed-by: Olivier Goffart
(cherry picked from commit fb4903c4eca6a085c4c39078c11de03f5791f08e)

Change-Id: I87208fe830b47412b40044070fbdad4ed3d0af8c
Reviewed-on: http://codereview.qt.nokia.com/1551
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoDeprecate some functions in QImage (that have been obsolete since 4.1).
Samuel Rødal [Tue, 12 Jul 2011 11:16:45 +0000 (13:16 +0200)]
Deprecate some functions in QImage (that have been obsolete since 4.1).

Reviewed-by: Olivier Goffart
(cherry picked from commit 5ee3e4964d60f4d9cd7026c6f8b6fb93ddd39588)

Change-Id: Ib536c2b5a2b51ca42ab26129142242f30f6c6759
Reviewed-on: http://codereview.qt.nokia.com/1550
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
13 years agoFix warning for uninitialized variable
Jiang Jiang [Tue, 12 Jul 2011 07:31:07 +0000 (09:31 +0200)]
Fix warning for uninitialized variable

Reviewed-by: Eskil
(cherry picked from commit 94913c337a388e3d5938ece3a460f1f6e9590cd5)

Change-Id: Ie3c0986a3f5c70a654d9f14c3fae42b528c06b9e
Reviewed-on: http://codereview.qt.nokia.com/1632
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoSSL internals: certificate verification: use mutex locker
Peter Hartmann [Thu, 14 Jul 2011 09:28:32 +0000 (11:28 +0200)]
SSL internals: certificate verification: use mutex locker

there are return statements between locking and unlocking, so to not
leave the mutex locked when returning, this commit introduces a
QMutexLocker.

Change-Id: I74e2f329bf116e92250189bf097deb47d460d9dc
Reviewed-on: http://codereview.qt.nokia.com/1656
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Markus Goetz
13 years agoFix editable combobox style on Mac
Jiang Jiang [Thu, 7 Jul 2011 12:53:09 +0000 (14:53 +0200)]
Fix editable combobox style on Mac

Reviewed-by: Jens Bache-Wiig
(cherry picked from commit 459dc4a3bf0dc0ac54fc558379fdf551949dd1c6)

Change-Id: I744722d46ced0c2b6139bc232a819d0d802eed0d
Reviewed-on: http://codereview.qt.nokia.com/1633
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoSkip boundry neutral characters in bidi itemization
Jiang Jiang [Wed, 22 Jun 2011 12:23:47 +0000 (14:23 +0200)]
Skip boundry neutral characters in bidi itemization

According to UAX #9, bidiItemize should act as if those characters
don't exist. If we don't, dir and status.eor here may become
QChar::DirBN, thus interfere the result of bidiItemize.

Task-number: QTBUG-19949
Reviewed-by: Lars Knoll
(cherry picked from commit a5c3064439a9f1483565e5d9dfbf0342cd9236f0)

Change-Id: I224cfdf5b38433a31d33b6d944d5770accf74546
Reviewed-on: http://codereview.qt.nokia.com/1631
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoFix crash when app font is added
Jiang Jiang [Fri, 8 Jul 2011 15:40:43 +0000 (17:40 +0200)]
Fix crash when app font is added

Loading app fonts will clear the application font cache, but
QFontPrivate::engineWithScript will try to load the font again,
in Mac the font engine used here must be the one used for shaping,
because subsequent sub font engines may be added to it during the
shaping process (QCoreTextFontEngineMulti::stringToCMap). That is
why we need to fetch the font engine directly from QTextEngine's
fontEngine cache instead of QFontCache.

Task-number: QTBUG-20250
Reviewed-by: Eskil
(cherry picked from commit 1f90ae36cff8acf581d1624bf011fe3a55c623c0)

Change-Id: Ibc0054cd7df65b65a67af4a7b15027731ba417fe
Reviewed-on: http://codereview.qt.nokia.com/1630
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoApply 57993ba7 properly to 4.8
Jiang Jiang [Thu, 14 Jul 2011 07:40:12 +0000 (09:40 +0200)]
Apply 57993ba7 properly to 4.8

Because we have moved alignLine from qtextlayout.cpp to QTextEngine,
this patch has to be applied manually.

Reviewed-by: TrustMe
(cherry picked from commit 705416cdc8ee91ac88d80298dbe2971a9384c196)

Change-Id: Ibd657a52da1c510c839623738d49602b5c4a0824
Reviewed-on: http://codereview.qt.nokia.com/1640
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
13 years agoAvoid buffer overrun in QMacPixmapData resizing
Jiang Jiang [Tue, 31 May 2011 10:15:55 +0000 (12:15 +0200)]
Avoid buffer overrun in QMacPixmapData resizing

Shouldn't use size bigger than the original (source) pixels buffer
or the new one (just allocated).

Task-number: QTBUG-18547
Reviewed-by: aavit
(cherry picked from commit 348894a550510e54e7709d18676b4b10c9e5e9e3)

Change-Id: I7cc373b7d0f1ffef2d2f0cdddb7018c856849d29
Reviewed-on: http://codereview.qt.nokia.com/1635
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
13 years agoFix potential crash when clicking in a text edit
Eskil Abrahamsen Blomfeldt [Wed, 13 Jul 2011 13:06:43 +0000 (15:06 +0200)]
Fix potential crash when clicking in a text edit

Since the attributes() call might resize the layout and therefore
delete the previous data, the logClusters pointer might be dangling
at this point. We need to reget it to make sure it's valid.

Task-number: QTBUG-20310
Reviewed-by: Jiang Jiang
(cherry picked from commit c0772f44fb1d53608ff629fc622103698c6d0ee5)

Change-Id: I20a29d0c529764eb5d41cb3383c22b6cad8de255
Reviewed-on: http://codereview.qt.nokia.com/1598
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
13 years agomake QChar::Unicode_Unassigned a constantly big value
Ritt Konstantin [Fri, 8 Jul 2011 14:28:09 +0000 (18:28 +0400)]
make QChar::Unicode_Unassigned a constantly big value

this makes the version based checks a bit simpler (and thus faster)

Change-Id: I975c6d043d238a5c16a4b13f8379e87fbade23cc
Reviewed-on: http://codereview.qt.nokia.com/1586
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>