Eckhart Koppen [Fri, 13 May 2011 15:36:12 +0000 (18:36 +0300)]
Removed duplicate setting of QT dependencies
Reviewed-by: TrustMe
Eckhart Koppen [Fri, 13 May 2011 14:28:20 +0000 (17:28 +0300)]
Temporarily changed autotest behaviour to ignore Qt version
Version past 5.0.0 was checked, but the test failed to compile in that
configuration.
Eckhart Koppen [Fri, 13 May 2011 12:52:30 +0000 (15:52 +0300)]
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging
Eckhart Koppen [Fri, 13 May 2011 12:38:50 +0000 (15:38 +0300)]
Updated version references in autotests
Tests now refer to version 5.0.0
Eckhart Koppen [Fri, 13 May 2011 12:38:00 +0000 (15:38 +0300)]
Updated default Qt version to 5.0.0
Changed default version in qbase.pri and qpluginbase.pri in case no
version is given at all.
Eckhart Koppen [Fri, 13 May 2011 10:47:56 +0000 (13:47 +0300)]
Removed deprecated functions in QList
Removed detach, detach2, detach3 and append which were marked
as required only up to 4.5.x
Eckhart Koppen [Fri, 13 May 2011 10:22:30 +0000 (13:22 +0300)]
Updated Qt and QtBase module version number to 5.0.0
Updated version in qglobal.h as well as the module version itself
Eckhart Koppen [Fri, 13 May 2011 10:15:04 +0000 (13:15 +0300)]
Updated data stream version for Qt 4.9 and 5.0
For now, using the same version as 4.8. This needs to be corrected
when the actual data stream version is known.
Olivier Goffart [Fri, 13 May 2011 09:11:55 +0000 (11:11 +0200)]
tst_moc: remove QtSvg dependency
The test for no keyword of every header should be done by the
tst_CompilerWarnings test
Qt Continuous Integration System [Fri, 13 May 2011 07:31:10 +0000 (17:31 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix deadlocks in wayland clipboard that can occur in special scenarios.
Laszlo Agocs [Thu, 12 May 2011 14:20:03 +0000 (16:20 +0200)]
Fix deadlocks in wayland clipboard that can occur in special scenarios.
setMimeData() emits the changed signal always so to prevent duplicated
signals keyboardFocus() must only emit when the change came from
another wayland client. However direct connection may cause issues
when invoking the slot from a wayland callback, so use a metacall
to make sure we return from the callback. Unnecessary data transfer
and potential deadlock is now also avoided when a client is requesting
the mime data from itself.
Reviewed-by: Jørgen Lind
Qt Continuous Integration System [Fri, 13 May 2011 01:48:59 +0000 (11:48 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Make error checking in QSignalSpy consistent
Jason McDonald [Fri, 13 May 2011 00:42:41 +0000 (10:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
Jason McDonald [Thu, 12 May 2011 07:23:14 +0000 (17:23 +1000)]
Make error checking in QSignalSpy consistent
QSignalSpy's constructor failed gracefully for some problems with the
parameters, but not for null parameters, for which there was only a
Q_ASSERT. This commit makes the handling of null parameters consistent
with the handling of other errors -- output a meaningful error message
with qWarning() and return, so that isValid() will subsequently return
false.
Change-Id: I7f5677a4c10185e30403ce3e12a022de8c13bc1c
Task-number: QTBUG-14283
Reviewed-by: Rohan McGovern
Qt Continuous Integration System [Thu, 12 May 2011 23:47:50 +0000 (09:47 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
tests: add bug numbers to a few FIXMEs
Rohan McGovern [Thu, 12 May 2011 23:14:09 +0000 (09:14 +1000)]
tests: add bug numbers to a few FIXMEs
Change-Id: Idd01ce127859516dbab10644b97b281cb5218720
Qt Continuous Integration System [Thu, 12 May 2011 23:05:00 +0000 (09:05 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Rohan McGovern [Thu, 12 May 2011 07:45:55 +0000 (17:45 +1000)]
Ensure that recursive QMAKE_EXTRA_TARGETS use the correct makefile
Recursive QMAKE_EXTRA_TARGETS were omitting the `-f' option to make.
This would break in the case where the correct makefile was not named
`Makefile'. The included autotest demonstrates the problem.
Note that this was fixed for normal targets back in 2005
by
faac7bd178654fd67a6f3f9cf4f6f2605071448d (p4 202370), but was not
fixed for extra targets.
Reviewed-by: ossi
(cherry picked from commit
96a3bf7a8bbc1e5361e16cbeeceb4be674b88c30)
Qt Continuous Integration System [Thu, 12 May 2011 20:58:29 +0000 (06:58 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
fix compilation with namespaces
Lars Knoll [Thu, 12 May 2011 17:00:15 +0000 (19:00 +0200)]
fix compilation with namespaces
Reviewed-by: Bjørn Erik Nilsen
(cherry picked from commit
7a1c29f101b95c9cc2cb53f8b80d231b5a994a9a)
Qt Continuous Integration System [Thu, 12 May 2011 15:11:57 +0000 (01:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix compilation with namespaces enabled
Lars Knoll [Thu, 12 May 2011 14:21:03 +0000 (16:21 +0200)]
Fix compilation with namespaces enabled
Reviewed-by: Samuel Rødal
(cherry picked from commit
bff68fc7094a50af57f7da23ecf9b25cab00f188)
Qt Continuous Integration System [Thu, 12 May 2011 14:03:52 +0000 (00:03 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Make QLineControl send accessibility updates.
Revert "Fix double painting when adding an item into a linear layout"
Fix licence headers again for MR 900
Improve invalidate() testcase.
Avoid flicker when invalidate is propagated in a widget/layout hierarchy
Fix licence headers again for MR 900
Frederik Gladhorn [Tue, 26 Apr 2011 16:41:15 +0000 (18:41 +0200)]
Make QLineControl send accessibility updates.
To make it emit the signals for the right object, it needs its parent to
be the QGraphicsItem/SGItem/QLineEdit.
According to IA2 it should emit TextUpdated and CursorMoved signals.
TextChanged is deprecated.
More fine grained signals would be desireable but this makes changes work at all.
Reviewed-by: Morten Sorvig
Jan-Arve Sæther [Thu, 28 Apr 2011 11:58:12 +0000 (13:58 +0200)]
Revert "Fix double painting when adding an item into a linear layout"
(It did not really fix the issue.)
This reverts commit
33f525e636ef8fa64a15d3e66c56adaea0075bda.
Conflicts:
src/gui/graphicsview/qgraphicslinearlayout.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
(cherry picked from commit
fee052e3e37b3335fe563cb8a1881bf59f9e25d0)
Sergio Ahumada [Thu, 14 Apr 2011 13:30:34 +0000 (15:30 +0200)]
Fix licence headers again for MR 900
See commit
b00089261eafbdf5f92ed94d7fb20b402bfcaeb2
Reviewed-by: Gabriel de Dietrich
(cherry picked from commit
bc16ebdb7aeff70fe8149297183636ea7fd14ed1)
Jan-Arve Sæther [Fri, 18 Mar 2011 09:52:03 +0000 (10:52 +0100)]
Improve invalidate() testcase.
Test number of:
* events
* setGeometry() calls
* invalidate() calls
(cherry picked from commit
b8b4e6fe141d99c4639d492a546226cdc3fc06c5)
Jan-Arve Sæther [Wed, 9 Feb 2011 14:07:24 +0000 (15:07 +0100)]
Avoid flicker when invalidate is propagated in a widget/layout hierarchy
* Do not call invalidate from activateRecursive().
This resulted in that a layout was invalidated as many times as there
were items in the layout.
* Several improvements. Do not call resize(size()) too often.
Calling resize() from the widgetEvent() is not very nice though...
* Remove commented out code
* make sure layout is activated even if the widget does not change size
* activate the layout if the resize is same as size()
* In order to not break existing apps, make this an opt-in feature
with QGraphicsLayout::setInstantInvalidatePropagation(true);
Reviewed-by: Frederik Gladhorn
Reviewed-by: John Tapsell
Gabriel de Dietrich [Thu, 14 Apr 2011 11:58:25 +0000 (13:58 +0200)]
Fix licence headers again for MR 900
See commit
b00089261eafbdf5f92ed94d7fb20b402bfcaeb2
Reviewed-by: Trust me
(cherry picked from commit
7b6a7f475119878681c9d0c06b29896ec3fe72c3)
Qt Continuous Integration System [Thu, 12 May 2011 08:54:44 +0000 (18:54 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
New algorithm for drawing thin lines
Lars Knoll [Thu, 14 Apr 2011 19:38:45 +0000 (21:38 +0200)]
New algorithm for drawing thin lines
Added a new QCosmeticStroker class for drawing thin
lines. The class can handle both aliased and antialiased
lines.
The code replaces all the midpoint line drawing algorithms in
the raster paintengine and gives correct subpixel positioning
for lines.
It gives around 30% to 50% speedup against the midpoint algorithm. If
we missed that fast path, the speedup is around between a factor of
6 to 8 for lines and aliased paths and 100 and 400 for antialiased
paths.
Reviewed-by: Kim
(cherry picked from commit
37c329a3e35fabc88fbcad824a69f37c671d2132)
Qt Continuous Integration System [Wed, 11 May 2011 16:11:15 +0000 (02:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Prevent crash in OpenGL engine when scaling images / pixmaps.
Qt Continuous Integration System [Wed, 11 May 2011 15:42:31 +0000 (01:42 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Add the QIdentityProxyModel.
Stephen Kelly [Wed, 10 Nov 2010 10:21:53 +0000 (11:21 +0100)]
Add the QIdentityProxyModel.
Older commit history is in KDE svn:
http://websvn.kde.org/trunk/KDE/kdelibs/kdeui/itemviews/kidentityproxymodel.cpp?view=log
Ammended to update the license headers.
Merge-request: 900
Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
Conflicts:
doc/src/frameworks-technologies/model-view-programming.qdoc
tests/auto/headers/tst_headers.cpp
(cherry picked from
b00089261eafbdf5f92ed94d7fb20b402bfcaeb2)
Samuel Rødal [Wed, 11 May 2011 15:34:12 +0000 (17:34 +0200)]
Prevent crash in OpenGL engine when scaling images / pixmaps.
Make sure the resulting image / pixmap is valid if the source was valid.
Task-number: QTBUG-19157
Reviewed-by: Kim
Reviewed-by: Benjamin Poulain
(cherry picked from commit
1c5da7207a21cc44a4a08d291c290ffcd9b958fd)
Qt Continuous Integration System [Wed, 11 May 2011 14:49:55 +0000 (00:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
update def files
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
Don't run XLib check if -no-gui is used
don't ignore create_prl for static plugins
make QLibraryInfo return clean paths
make relative paths in qt.conf work inside qmake
Sockets: Fix potential null pointer usages
QNAM: Re-order checks in migrateBackend()
Fix initial main window dimensions for "fullscreen with softkeys" case
Fix spelling mistake
Fixes crash in QWidget::effectiveWinId.
Fix crash when QSocketNotifier used with an invalid descriptor
Optimisation - buffer packet read in pendingDatagramSize
Remove warnings when disabling notifications on a closed socket
Fix some warnings in symbian network tests
Shane Kearns [Tue, 10 May 2011 12:11:45 +0000 (13:11 +0100)]
update def files
Reviewed-by: Trust Me
(cherry picked from commit
84cf56543c3e9add4f06ed65cf419561117ee739)
Martin Petersson [Mon, 9 May 2011 11:56:47 +0000 (13:56 +0200)]
emit QNetWorkAccessManager::finished on QNetworkReply::abort()
If we can not get online when the request is made then we are in the
WaitingForSession state. This will happen for example if the device
is in flight mode. This fix follows the same logic as in
_q_networkSessionFailed, but we should look into why we have the
WaitingForSession check in finished().
Task-number: QT-4747
Reviewed-by: Markus Goetz
(cherry picked from commit
0c9cb9a34d6b472cb53bf1af4616af55b593b616)
Bernhard Rosenkraenzer [Mon, 9 May 2011 09:34:17 +0000 (11:34 +0200)]
Don't run XLib check if -no-gui is used
Currently, an attempt to compile Qt even with -no-gui on a Linux box
that doesn't have libX11 installed fails becaue of the XLib
functionality check in configure.
This check can be turned off in -no-gui mode, since QtCore, QtXml,
QtNetwork and friends don't use libX11.
Merge-request: 1214
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
912b6804bcacbf1b4f356d947986df8156a545a4)
Oswald Buddenhagen [Wed, 20 Apr 2011 17:47:49 +0000 (19:47 +0200)]
don't ignore create_prl for static plugins
Task-number: QTBUG-18436
Reviewed-by: joerg
(cherry picked from commit
2ca4ce848c63c9fa0a48c0f9f4e7fdbc90463bf1)
Oswald Buddenhagen [Wed, 20 Apr 2011 14:28:58 +0000 (16:28 +0200)]
make QLibraryInfo return clean paths
as a side effect, don't use QDir for path resolution - it doesn't buy us
anything.
Task-number: QTBUG-1371
Reviewed-by: joerg
(cherry picked from commit
9cd62e4f7b23894a672297f6eebda64cdbd53cb0)
Oswald Buddenhagen [Wed, 20 Apr 2011 14:27:55 +0000 (16:27 +0200)]
make relative paths in qt.conf work inside qmake
Task-number: QTBUG-11602
Reviewed-by: joerg
(cherry picked from commit
e6bb6ba76942d98e4b50a7fd32bf44e211f2fa5e)
Shane Kearns [Thu, 5 May 2011 15:32:11 +0000 (16:32 +0100)]
Sockets: Fix potential null pointer usages
QAbstractSocketEngine::createSocketEngine can return 0 as well as throw.
In two cases the pointer was being used before the null check, in a 3rd
case the null check was missing.
Reviewed-by: Markus Goetz
(cherry picked from commit
19edac88af53eea7f733cabbaee77f9b725b7ea9)
Markus Goetz [Thu, 5 May 2011 13:44:00 +0000 (15:44 +0200)]
QNAM: Re-order checks in migrateBackend()
Do the easy checks first, will avoid a crash in the HTTP code
if request is serviced from the cache.
Task-number: QTBUG-18770
Reviewed-by: Peter Hartmann
(cherry picked from commit
d03a28a289cf0665290e6ea0375b31cbb2d6649e)
Miikka Heikkinen [Thu, 5 May 2011 11:10:51 +0000 (14:10 +0300)]
Fix initial main window dimensions for "fullscreen with softkeys" case
The application main window defaults to fullscreen size when initially
constructed, even if softkeys are specified for it, as the screen
furniture is constructed later in show_sys. This resulted in the main
window being partially under softkeys.
Fixed by invoking handleClientAreaChange() explicitly in show_sys in
fullscreen with softkeys case.
Task-number: QTBUG-19043
Reviewed-by: Sami Merila
(cherry picked from commit
e8fc93973a41f193665baa5fdc26cba951bd692f)
Shane Kearns [Wed, 4 May 2011 16:41:22 +0000 (17:41 +0100)]
Fix spelling mistake
Reviewed-by: Trust Me
(cherry picked from commit
b166c30d8d0834518337ded44d2ebfe097ee312f)
Bjørn Erik Nilsen [Mon, 2 May 2011 10:39:45 +0000 (12:39 +0200)]
Fixes crash in QWidget::effectiveWinId.
Widgets are left in a transitional (and incosistent) state while being
re-parented, which caused QWidget::effectiveWinId() to crash in certain
circumstances. See patch for more details.
Auto test included.
Reviewed-by: ogoffart
(cherry picked from commit
6db0153cd7e35e4a919a76ae2aadbf2d2510bfb7)
Shane Kearns [Wed, 20 Apr 2011 15:21:36 +0000 (16:21 +0100)]
Fix crash when QSocketNotifier used with an invalid descriptor
select code for open C file/socket descriptors was crashing in FD_SET
if a QSocketNotifier was created with an invalid descriptor.
Added two autotests to QSocketNotifier, one to check notifiers with
bogus socket descriptors don't crash, the other to check that notifiers
with posix socket descriptors do work. (symbian socket engine doesn't
use them so they are not implicitly tested)
Reviewed-by: mread
Task-Number: QTBUG-18138
(cherry picked from commit
8a9a6afcf02f089f932bc81431ab46a60af32134)
Shane Kearns [Wed, 13 Apr 2011 17:04:00 +0000 (18:04 +0100)]
Optimisation - buffer packet read in pendingDatagramSize
In Symbian, the OS function to get the size of a pending datagram also
includes the size of the packet header (which is different for IPv4 and
IPv6). We were reading the datagram with the "peek" flag set to
implement pendingDatagramSize, then reading again normally when the
client called read/readDatagram.
This change removes the "peek" flag, and buffers the datagram in the
socket engine, returning it and clearing the buffer when read or
readDatagram is called.
If there is no buffered data, the existing code path is followed - it
isn't mandatory to call pendingDatagramSize before reading from the
socket.
Reviewed-by: Markus Goetz
(cherry picked from commit
dd8de4c2437397748daba49569cbc7f89a8bfbee)
Shane Kearns [Tue, 12 Apr 2011 17:01:49 +0000 (18:01 +0100)]
Remove warnings when disabling notifications on a closed socket
The generic layer calls setReadNotificationEnabled(false) on sockets
after they are closed. This no longer causes a warning from the symbian
socket engine. A warning will only be emitted if trying to enable
notifications on a closed socket.
Task-number: QTBUG-18713
Reviewed-by: Markus Goetz
(cherry picked from commit
0aa780235c24ed724fcf6a9095a6467e34b9346e)
Shane Kearns [Tue, 12 Apr 2011 16:58:12 +0000 (17:58 +0100)]
Fix some warnings in symbian network tests
Ignore warning when the test intentionally sets an invalid socket descriptor.
Make sure to set content type on all http post tests in tst_qnetworkreply.
Run test with enough capabilities to avoid platsec errors when accessing
certificate store.
Reviewed-By: Markus Goetz
(cherry picked from commit
9632fdefa9012ca11cd1345d66bafd6f417de88e)
Qt Continuous Integration System [Wed, 11 May 2011 13:47:33 +0000 (23:47 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix tst_QVariant::invalidColor
Move QTextCursor::MoveStyle to Qt namespace
Add some QRawFont related low level functions to avoid extra copying
Jiang Jiang [Wed, 11 May 2011 13:21:14 +0000 (15:21 +0200)]
Fix tst_QVariant::invalidColor
Since
a423ff5474b89028eeca95b254f5184311c8223b, the warning message is
no longer produced.
Reviewed-by: Samuel Rødal
(cherry picked from commit
8a5e82732be3aac37d14ef85c6974add46c6b65f)
Jiang Jiang [Wed, 11 May 2011 10:13:01 +0000 (12:13 +0200)]
Move QTextCursor::MoveStyle to Qt namespace
We cannot use QTextCursor::MoveStyle enums in QTextLine because
QTextCursor is not a QObject, while referring to that enum in
Q_PROPERTY requires it to be. That's why we need to move the
enums in Qt namespace.
Reviewed-by: David Boddie
(cherry picked from commit
5eba82b752e85a5d6cb3a893214ed2646d75f362)
Jiang Jiang [Tue, 10 May 2011 11:30:33 +0000 (13:30 +0200)]
Add some QRawFont related low level functions to avoid extra copying
Added functions:
- QRawFont::glyphIndexesForChars(const QChar *chars, int numChars,
quint32 *glyphIndexes, int *numGlyphs) const
- QRawFont::advancesForGlyphIndexes(const quint32 *glyphIndexes,
QPointF *advances, int numGlyphs) const
Reviewed-by: Eskil
(cherry picked from commit
965af9eb2932efae5d736df54c3859460017b6a5)
Qt Continuous Integration System [Wed, 11 May 2011 13:20:45 +0000 (23:20 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix GLES2 include path for applications when not using the dash shell
Paul Olav Tvete [Wed, 11 May 2011 10:32:46 +0000 (12:32 +0200)]
Fix GLES2 include path for applications when not using the dash shell
Backslash escapes normally requires "-e" option to echo
Reviewed-by: Jørgen
(cherry picked from commit
68f37a29f911fce5bcdd285b1fc1bc6d4868d78e)
Qt Continuous Integration System [Wed, 11 May 2011 12:30:28 +0000 (22:30 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix to commit
7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.
Kim Motoyoshi Kalland [Wed, 11 May 2011 12:24:45 +0000 (14:24 +0200)]
Qt Continuous Integration System [Wed, 11 May 2011 11:47:11 +0000 (21:47 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
tests: fixed or disabled qtbase tests with circular dependencies
Rohan McGovern [Wed, 11 May 2011 09:57:01 +0000 (19:57 +1000)]
tests: fixed or disabled qtbase tests with circular dependencies
tst_lancelot did QT+=svg, but didn't actually use QtSvg.
qlocalsocket/lackey uses QtScript, which is not available when compiling
qtbase.
Change-Id: Ic3cc5a6f74a58ee8f2fdc48b9c852d9551b85f68
Qt Continuous Integration System [Wed, 11 May 2011 10:41:00 +0000 (20:41 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Check if OES_texture_npot is present on OpenGL ES 2.
Kim Motoyoshi Kalland [Wed, 11 May 2011 08:53:00 +0000 (10:53 +0200)]
Check if OES_texture_npot is present on OpenGL ES 2.
Unless the OES_texture_npot extension is present, non-power-
of-two textures have some restrictions on OpenGL ES 2.
Reviewed-by: Samuel
Qt Continuous Integration System [Wed, 11 May 2011 08:18:18 +0000 (18:18 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
Fix a bug in syncqt.
Liang Qi [Wed, 11 May 2011 08:05:43 +0000 (10:05 +0200)]
Fix a bug in syncqt.
Move the generation of version header file before the sync of header
files.
Reviewed-by: TrustMe
Qt Continuous Integration System [Wed, 11 May 2011 07:11:28 +0000 (17:11 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
tests: fix private header inclusion in qtbase autotests
tests: disable tests in qtbase which depend on qtsvg
tests: make benchmarks compile or disable those which don't compile
tests: remove references to benchmark directories which don't exist
tests: enable compilation of autotests for qtbase by default
tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change
tests: mark some tests as using private API
Rohan McGovern [Wed, 11 May 2011 04:02:54 +0000 (14:02 +1000)]
tests: fix private header inclusion in qtbase autotests
Any test which needs private headers from some Qt module must do:
QT += modulename-private
Reviewed-by: Jason McDonald
Change-Id: I6924a577a960e4990f4379b02bca4822d8248fb4
Rohan McGovern [Wed, 11 May 2011 04:02:41 +0000 (14:02 +1000)]
tests: disable tests in qtbase which depend on qtsvg
Reviewed-by: Jason McDonald
Change-Id: I2416d34b5c262e20ee18f7121e8745327d5614f8
Rohan McGovern [Wed, 11 May 2011 04:00:53 +0000 (14:00 +1000)]
tests: make benchmarks compile or disable those which don't compile
Reviewed-by: Jason McDonald
Change-Id: Idc9fa4722b59f9b75d5e4a91bbfd0ae068d29b3d
Rohan McGovern [Wed, 11 May 2011 03:04:08 +0000 (13:04 +1000)]
tests: remove references to benchmark directories which don't exist
Reviewed-by: Jason McDonald
Change-Id: I14d0981c9f962c4eb048ca426a8ba19aa7ea66de
Rohan McGovern [Tue, 10 May 2011 23:21:51 +0000 (09:21 +1000)]
tests: enable compilation of autotests for qtbase by default
Tests are now treated like examples and demos: compiled by default,
unless you configured with `-nomake tests'. (They are still not
installed by default, however.)
Reviewed-by: Jason McDonald
Change-Id: Ifc56f6763bb2aafe6fe57b684751f99ec82ea26f
Rohan McGovern [Tue, 10 May 2011 23:53:54 +0000 (09:53 +1000)]
tests: make tst_qrawfont compile for QGlyphs -> QGlyphRun API change
Broken by
051ef6f294e8cbfa1e30e99e7fd4cf5fb38393f4
Reviewed-by: Jason McDonald
Change-Id: Ia8589aba1bfb71d000d8fad455d90e704ba28972
Rohan McGovern [Wed, 11 May 2011 00:05:36 +0000 (10:05 +1000)]
tests: mark some tests as using private API
These autotests are all using private symbols, available only when Qt is
configured with -developer-build. So, gracefully disable them when
the private symbols are not available.
Reviewed-by: Jason McDonald
Change-Id: Iafd1c7af486feeee810110bc021e75984827f78a
Qt Continuous Integration System [Tue, 10 May 2011 16:07:56 +0000 (02:07 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Prevent crash in wayland mimedata in case there is no offer.
Laszlo Agocs [Tue, 10 May 2011 16:03:43 +0000 (18:03 +0200)]
Prevent crash in wayland mimedata in case there is no offer.
Qt Continuous Integration System [Tue, 10 May 2011 14:10:15 +0000 (00:10 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-earth-staging:
Add QT_xxx_VERSION macros for each library in qtbase
Qt Continuous Integration System [Tue, 10 May 2011 13:49:29 +0000 (23:49 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Prevent having Status undefined in xlib platform plug-in.
Laszlo Agocs [Tue, 10 May 2011 13:42:01 +0000 (15:42 +0200)]
Prevent having Status undefined in xlib platform plug-in.
Commit
4b75ceea08815c096ec35a077c5c1e3bfca0e5ed changed
qcoreapplication_p.h to include qsettings.h, which undefines Status.
This breaks the xlib platform plug-in (and its includes).
Liang Qi [Tue, 10 May 2011 13:15:15 +0000 (15:15 +0200)]
Add QT_xxx_VERSION macros for each library in qtbase
Provide version info for each library like QTCORE_VERSION and etc.
Task-number: QTMODULARIZATION-44
Reviewed-by: axis
Qt Continuous Integration System [Tue, 10 May 2011 11:43:23 +0000 (21:43 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging: (142 commits)
ifdef out mac/no_coreservices path more cleanly
fix build on symbian
Allow different text for undo actions and items in QUndoView
Allow using not only prefixes for undo command text
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
Massively update the hurd-g++ mkspec.
Do not allow multiple threads to acquire a QMutex
Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.
don't crash in QProcessEnvironment::systemEnvironment()
HTTP backend: do not load resources from cache that must be revalidated
Compile fix for QLocale on Symbian.
Added Kazakh language to the QLocale mapping table on Symbian.
Added support for QLocale::uiLanguages on Symbian.
Fix drawing text in item view:
Add enablers for Symbian App Booster
Don't rely on uninitialized data
Don't realloc user-provided buffer
qmake: Introduce new template type
Make autotest more resilient against network timeout (cherry picked from commit
50be38737507f5c23b4d050e635a200024164a13)
Do not filter adhoc clients (cherry picked from commit
4fe5307af44a76b99cc8c70aa330180c1985eabc)
...
Qt Continuous Integration System [Tue, 10 May 2011 11:21:45 +0000 (21:21 +1000)]
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Compile on Mac
Olivier Goffart [Tue, 10 May 2011 11:15:10 +0000 (13:15 +0200)]
Merge remote-tracking branch 'staging/master'
Eskil Abrahamsen Blomfeldt [Tue, 10 May 2011 11:06:57 +0000 (13:06 +0200)]
Compile on Mac
Missing API update in Q_WS_MAC block
Reviewed-by: Jiang Jiang
(cherry picked from commit
4b95d9939db75d7bd55db4bbbf2d67af459f7eb5)
Oswald Buddenhagen [Mon, 9 May 2011 15:44:48 +0000 (17:44 +0200)]
ifdef out mac/no_coreservices path more cleanly
the symbian path was also dead
(cherry picked from commit
76ac26383922b4c452592a9175e7f3b9b3fd2513)
Oswald Buddenhagen [Mon, 9 May 2011 15:42:53 +0000 (17:42 +0200)]
fix build on symbian
provide dummy implementation of QProcessEnvironment::systemEnvironment()
(cherry picked from commit
e4920a4b4bc454ad309324a62db0e9257bba7367)
Alexander Potashev [Mon, 9 May 2011 08:39:18 +0000 (10:39 +0200)]
Allow different text for undo actions and items in QUndoView
Now the texts used for undo actions and for items in QUndoView can
be set separately. This introduces an extended format of text that
can be passed to QUndoCommand::setText or QUndoCommand constructor.
The action text can now contain two strings separated by a "\n". The
first string (that goes before "\n") is then returned by
QUndoCommand::text() and used as name of item in QUndoView.
The second string (that goes after "\n") is returned by
QUndoCommand::actionText() and used when the text properties of the
undo and redo actions are updated.
If the text passed to QUndoCommand does not contain "\n", everything
works as before, and both QUndoCommand::text() and
QUndoCommand::actionText() return the same string.
Even though action text in English usually does not need different forms
for undo actions and QUndoView item, translators can employ this new
command text format, for example to adjust the grammatical case used in
command text to match the context of "Undo %1"/"Redo %1".
Merge-request: 2610
Reviewed-by: ossi
(cherry picked from commit
9b784789c75d59b27530bbf1d12676cc44f64f46)
Alexander Potashev [Mon, 9 May 2011 08:35:29 +0000 (10:35 +0200)]
Allow using not only prefixes for undo command text
Functions QUndo{Group,Stack}::create{Undo,Redo}Action() now use action
text templates "Undo %1" and "Redo %1" if no custom prefix was provided.
This makes more flexible translations possible. The surrounding text
(like "Undo" and "Redo") can now be suffixed to the command name as
German and Korean languages require ("%1 rueckgaengig machen" for German).
Also, now the default action text (when no command can be undone) can be
translated differently from the prefix. For example, it can be
translated as "Undo action", not just "Undo".
When a non-empty prefix is passed to QUndo*****::create****Action(),
those functions work as before, and the features described above become
unavailable.
Task-number: QTBUG-14442
Merge-request: 1212
Reviewed-by: ossi
(cherry picked from commit
213c25ad24e4f3b0a44f82f23d34746cd294f8d6)
Pino Toscano [Thu, 5 May 2011 17:19:28 +0000 (19:19 +0200)]
QFileSystemEngine::currentPath(): use QFileSystemEntry() also for the no-PATH_MAX case
... in the same way as done in the other code path.
This makes qmake/QtCore compile again on glibc systems without PATH_MAX (e.g. GNU/Hurd).
Merge-request: 1218
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
c8812fe6e642520532d65744caefcea790d59de8)
Pino Toscano [Thu, 5 May 2011 17:18:23 +0000 (19:18 +0200)]
Massively update the hurd-g++ mkspec.
Bring it to the same level as linux-g++:
- copy the defines from common/linux.conf
- use the common gcc/g++ .conf files
- keep the trick of linking the pthread library everywhere
- leave out the wayland variables, which are not useful for Hurd
Merge-request: 1219
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit
027605f67f73c8021c1ae604adad298599785a79)
Bradley T. Hughes [Thu, 5 May 2011 15:03:54 +0000 (17:03 +0200)]
Do not allow multiple threads to acquire a QMutex
After the mutex optimizations on Mac, we did not handle the case where
semaphore_wait() could return KERN_ABORTED. Under heavy contention, this
happens, and when running in release mode, the assert in qmutex.cpp is not
executed. The code silently allows multiple threads to continue as if it
had acquired the mutex exclusively.
Fix this by checking for KERN_ABORTED from semaphore_wait(), and retry the
wait. We do not handle KERN_ABORTED for timed waits, simply return false and
let the code doing the tryLock() handle it how it deems best.
Reviewed-by: joao
(cherry picked from commit
b54af0a9d6406356616889826e31925d2fa05718)
Robin Burchell [Thu, 5 May 2011 08:49:59 +0000 (10:49 +0200)]
Ensure that QDateTimeEdit::calendarWidget() will always return a valid widget.
This case may be triggered in the (admittedly slightly abnormal) case where a
user wishes to embed the calendar widget in a layout or, for whatever reason, do
something else that will change its ownership.
We work around this by detecting when it is deleted and recreating the widget.
This will also have a positive side effect if setCalendarWidget() is called with
a widget which is then subsequently deleted, returning the default widget
instead of a pointer to (now deleted) memory.
Reviewed-by: Denis Dzyubenko
Merge-request: 2568
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
(cherry picked from commit
124ec3200f8453142717fcfe7a4aa0a55164aaa6)
Oswald Buddenhagen [Wed, 4 May 2011 20:06:36 +0000 (22:06 +0200)]
don't crash in QProcessEnvironment::systemEnvironment()
as the implementations moved to platform-specific files, the
QSharedDataPointer<QProcessEnvironmentPrivate>::detach() specialization
needs to go to the private header.
Reviewed-by: thiago
(cherry picked from commit
c79246683a5033f605acd59d1c37d68381383a06)
Peter Hartmann [Wed, 4 May 2011 11:47:06 +0000 (13:47 +0200)]
HTTP backend: do not load resources from cache that must be revalidated
The header field "Cache-Control: must-revalidate" is a strict
requirement for loading the resource from the server, and not reading it
from the cache without revalidating first. With this patch, PreferCache
will load such from the network instead of loading them from the cache,
and AlwaysCache will throw a ContentNotFound error.
Reviewed-by: Markus Goetz
Task-number: QTBUG-18983
(cherry picked from commit
0e449f38894b1bd2dbb2f14206a011424679f063)
Denis Dzyubenko [Wed, 4 May 2011 11:07:54 +0000 (13:07 +0200)]
Compile fix for QLocale on Symbian.
The previous change added new ELangEnglish_India that doesn't
necesserally present in all SDKs.
Reviewed-by: trustme
(cherry picked from commit
154ab1cb4c4cdf34f21fc93b078f91cc79048bd4)
Denis Dzyubenko [Tue, 3 May 2011 14:22:43 +0000 (16:22 +0200)]
Added Kazakh language to the QLocale mapping table on Symbian.
Reviewed-by: trustme
(cherry picked from commit
c6808af66d45541546b30c8e6de155b9812b4ef9)
Denis Dzyubenko [Tue, 3 May 2011 14:18:42 +0000 (16:18 +0200)]
Added support for QLocale::uiLanguages on Symbian.
Extended the mapping table that matches symbian device languages to a
locale name and language code.
Task-number: QTBUG-7329
Reviewed-by: trustme
(cherry picked from commit
93233fc811920002d5b5b8272d9b5b8d5d3e2b98)
Olivier Goffart [Tue, 3 May 2011 17:36:26 +0000 (19:36 +0200)]
Fix drawing text in item view:
Put back code that was removed by mistake in
e8019cf8feb402303e6d253f5ca58bebfda42679
Task-number: QTBUG-18998
(cherry picked from commit
bbbd4b8f3949b58d4fd21854241cb46cbc024a80)
Simon Frost [Tue, 3 May 2011 17:29:56 +0000 (18:29 +0100)]
Add enablers for Symbian App Booster
To use the Symbian App Booster, a registration file (matching the
filename of the executable, eg helloworld.applite) must be copied to the
import folder within QtAppBooster's private directory. The appropriate
library (qdeclarativebooster) must also be linked against. With this
change, the required actions are carried out by adding
"CONFIG += symbian_appbooster" to the application's .pro file.
Task-number: QT-4892
Reviewed-by: Miikka Heikkinen
(cherry picked from commit
ae128aef03d246c9f89bed015092b1c5a925bcbc)
João Abecasis [Mon, 2 May 2011 11:49:36 +0000 (13:49 +0200)]
Don't rely on uninitialized data
HB_GetCharAttributes used to require a zero-initialized array for
attributes, as it selectively sets relevant bits for each character. We
ease that requirement by always initializing the attributes buffer
explicitly with memset.
Task-number: QT-4911
Reviewed-by: Ritt Konstantin
(cherry picked from commit
4cb9db404224c55859713c282aa90409e375c372)
João Abecasis [Mon, 2 May 2011 11:46:40 +0000 (13:46 +0200)]
Don't realloc user-provided buffer
When QTextBoundaryFinder doesn't own the buffer, don't realloc it and
get a new one instead.
Reviewed-by: Ritt Konstantin
(cherry picked from commit
320f172c851a4720299297c8b3b757eb1202c568)