Commit Graph

661 Commits

Author SHA1 Message Date
Jason McDonald
29851474c7 Remove unused functions.
Change-Id: I8cae0550c58238bd99bc759c21b022c54fe2de8b
Reviewed-by: Trust Me
(cherry picked from commit 1191dc0c278ddd22556d6c8e5ea5a898fa7b35f6)
2011-05-18 10:46:40 +10:00
Jason McDonald
4044d3c8f5 Remove Q_ASSERT calls from gestures autotest
Make the test report a useful warning, rather than terminating with an
unintelligible assertion failure, if the GestureState enum is ever
extended.

Change-Id: Ib876a5f2986cbea4e181678a83a72e0d1444f1ee
Task-number: QTBUG-17582
Reviewed-by: Rohan McGovern
(cherry picked from commit ed5dd84582881bc30a5ce85902b37aae9c243978)
2011-05-18 10:46:40 +10:00
Jason McDonald
084b7ababd Cosmetic changes to exceptionsafety_objects test
Sort test data alphabetically and remove excess whitespace.

Change-Id: I0e244efca9e9adbe747a375a28a63f70992ef4f8
Reviewed-by: Trust Me
(cherry picked from commit 10f3f270c8a319205590ae13bdeab063d5216441)
2011-05-18 10:46:40 +10:00
Jason McDonald
22d6cd5cdd Don't try to run exceptionsafety_objects test by default on windows.
This test relies on some API specific to MSVC's debug runtime, which is
not always guaranteed to be available.

Change-Id: Ib0ae4694ad51f59198dadfce802f0dfdf0522002
Reviewed-by: Rohan McGovern
(cherry picked from commit 01dfb9ca25bfaec5784f404dcd4bf41bbc2b6fcb)
2011-05-18 10:46:40 +10:00
Jason McDonald
667a40fe36 Partially re-enable exception safety test
Re-enabling for object types that don't crash the test.

Change-Id: I8c2f0d02171c973bf1ede227d4139b52cac5939f
Reviewed-by: Rohan McGovern
(cherry picked from commit 3788a90338e9328710b9d3335a63fb85ab7d97fc)
2011-05-18 10:46:39 +10:00
Jason McDonald
3b98db1606 Make test compile in namespaced build.
Change-Id: I824864b8db755a8dc731e3c9de39e3dd7b16224a
Reviewed-by: Rohan McGovern
(cherry picked from commit ced0a98b5274be6a62ae7e4a0f9fc3161d0e40cb)
2011-05-18 10:46:39 +10:00
Jason McDonald
11b8382d41 Rename test class.
Fixes warning from tst_maketestselftest about test class name not
matching TARGET.

Change-Id: I7a81d87bb64d2902e842d097248e33eacb388746
Reviewed-by: Rohan McGovern
(cherry picked from commit 069e4441f2e14a82b4ae39601734acb71c909bd9)
2011-05-18 10:46:39 +10:00
Jason McDonald
fc52cbbc13 Make tst_exceptionsafety_objects part of the test set.
Re-enable this test, with the two test functions that fail on Linux
disabled until the failures can be diagnosed.

Change-Id: I915e1a0d675cb71a80086e89f9799a4f9f6b600c
Reviewed-by: Rohan McGovern
(cherry picked from commit ee55dec1efe9c67518bf3e27f81b0696075f7153)
2011-05-18 10:46:39 +10:00
Qt Continuous Integration System
eab70faca3 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 auto tests.
2011-05-17 01:15:50 +10:00
Bjørn Erik Nilsen
862a819762 Compile auto tests.
Reviewed-by: mstormo
2011-05-16 16:59:05 +02:00
Qt Continuous Integration System
ad5ded99d2 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:
  Update configure to enable QtConcurrent for Symbian
2011-05-16 18:33:46 +10:00
Liang Qi
76db499560 Update configure to enable QtConcurrent for Symbian
(cherry picked from commit 5fc99e9f8e3b24c712d1673d3b55afa8c8090cb4)
2011-05-16 10:27:12 +02:00
Qt Continuous Integration System
083867348f 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: clean up usage of QT_CONFIG to fix circular dependencies
2011-05-16 13:16:12 +10:00
Rohan McGovern
173099696f tests: clean up usage of QT_CONFIG to fix circular dependencies
With modularized Qt, using QT_CONFIG is dangerous, because the behavior
changes depending on the order in which modules are qmake'd.

For example, an autotest doing:

  contains(QT_CONFIG,svg):QT += svg

...will depend on libQtSvg if (and only if) the autotest is qmake'd
_after_ qtsvg is qmake'd.

This makes the tested functionality unpredictable.
Also, if the above example occurs within qtbase, it causes the test to
sometimes have a circular dependency: if qtsvg is qmake'd before the
test is qmake'd, the test in qtbase depends on qtsvg which depends on
qtbase.

Tests must avoid functionality tests via QT_CONFIG except where all the
tested modules are dependencies of the current module.

Usage of QT_CONFIG with qt3support was entirely removed since Qt5
will not retain qt3support.

Reviewed-by: Jason McDonald
Change-Id: I5a5013b3ec7e1f38fb78864763c9e7586c15e70b
2011-05-16 13:10:00 +10:00
Qt Continuous Integration System
b5155fbb3a Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Removed duplicate setting of QT dependencies
2011-05-14 01:53:05 +10:00
Eckhart Koppen
73e1f35fa3 Removed duplicate setting of QT dependencies
Reviewed-by: TrustMe
2011-05-13 18:36:12 +03:00
Qt Continuous Integration System
c0b9ed2e09 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  Temporarily changed autotest behaviour to ignore Qt version
  Updated version references in autotests
  Updated default Qt version to 5.0.0
  Removed deprecated functions in QList
  Updated Qt and QtBase module version number to 5.0.0
  Updated data stream version for Qt 4.9 and 5.0
2011-05-14 00:34:32 +10:00
Eckhart Koppen
bf6534bad5 Temporarily changed autotest behaviour to ignore Qt version
Version past 5.0.0 was checked, but the test failed to compile in that
configuration.
2011-05-13 17:28:20 +03:00
Eckhart Koppen
890d08add4 Merge branch 'master' of scm.dev.nokia.troll.no:qt/qtbase-staging 2011-05-13 15:52:30 +03:00
Eckhart Koppen
f3341fd555 Updated version references in autotests
Tests now refer to version 5.0.0
2011-05-13 15:38:50 +03:00
Eckhart Koppen
a9c2c15487 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.
2011-05-13 15:38:00 +03:00
Eckhart Koppen
36c29abc0d Removed deprecated functions in QList
Removed detach, detach2, detach3 and append which were marked
as required only up to 4.5.x
2011-05-13 13:47:56 +03:00
Eckhart Koppen
23d98f70b9 Updated Qt and QtBase module version number to 5.0.0
Updated version in qglobal.h as well as the module version itself
2011-05-13 13:22:30 +03:00
Eckhart Koppen
7d756ed718 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.
2011-05-13 13:15:04 +03:00
Qt Continuous Integration System
ed76e600d9 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
  tst_moc: remove QtSvg dependency
2011-05-13 19:19:33 +10:00
Olivier Goffart
bcc7ddff9f tst_moc: remove QtSvg dependency
The test for no keyword of every header should be done by the
tst_CompilerWarnings test
2011-05-13 11:11:55 +02:00
Qt Continuous Integration System
305577936d 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.
2011-05-13 17:31:10 +10:00
Laszlo Agocs
542ba35f2f 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
2011-05-13 09:27:11 +02:00
Qt Continuous Integration System
359c5e4a71 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
2011-05-13 11:48:59 +10:00
Jason McDonald
dd1a7a6379 Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging 2011-05-13 10:42:41 +10:00
Jason McDonald
d9119535a2 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
2011-05-13 10:42:06 +10:00
Qt Continuous Integration System
0add5fe930 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
2011-05-13 09:47:50 +10:00
Rohan McGovern
bef27c48ef tests: add bug numbers to a few FIXMEs
Change-Id: Idd01ce127859516dbab10644b97b281cb5218720
2011-05-13 09:14:09 +10:00
Qt Continuous Integration System
cdd524ea97 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
2011-05-13 09:05:00 +10:00
Rohan McGovern
152a10012c 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)
2011-05-13 08:59:43 +10:00
Qt Continuous Integration System
664517abde 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
2011-05-13 06:58:29 +10:00
Lars Knoll
1a1471718d fix compilation with namespaces
Reviewed-by: Bjørn Erik Nilsen
(cherry picked from commit 7a1c29f101b95c9cc2cb53f8b80d231b5a994a9a)
2011-05-12 22:52:49 +02:00
Qt Continuous Integration System
d4a649e8b0 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
2011-05-13 01:11:57 +10:00
Lars Knoll
4214ddc1d9 Fix compilation with namespaces enabled
Reviewed-by: Samuel Rødal
(cherry picked from commit bff68fc7094a50af57f7da23ecf9b25cab00f188)
2011-05-12 16:36:48 +02:00
Qt Continuous Integration System
46ecdac5c9 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
2011-05-13 00:03:52 +10:00
Frederik Gladhorn
38ed8c2ddd 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
2011-05-12 15:59:33 +02:00
Jan-Arve Sæther
1625b25a9f 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)
2011-05-12 15:51:02 +02:00
Sergio Ahumada
446a7ba4ff Fix licence headers again for MR 900
See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2

Reviewed-by: Gabriel de Dietrich
(cherry picked from commit bc16ebdb7aeff70fe8149297183636ea7fd14ed1)
2011-05-12 15:48:46 +02:00
Jan-Arve Sæther
f76acd935d Improve invalidate() testcase.
Test number of:
* events
* setGeometry() calls
* invalidate() calls
(cherry picked from commit b8b4e6fe141d99c4639d492a546226cdc3fc06c5)
2011-05-12 15:48:00 +02:00
Jan-Arve Sæther
913ff73200 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
2011-05-12 15:47:26 +02:00
Gabriel de Dietrich
1ce725cb60 Fix licence headers again for MR 900
See commit b00089261eafbdf5f92ed94d7fb20b402bfcaeb2

Reviewed-by: Trust me
(cherry picked from commit 7b6a7f475119878681c9d0c06b29896ec3fe72c3)
2011-05-12 15:43:54 +02:00
Qt Continuous Integration System
c31a354bd1 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
2011-05-12 18:54:44 +10:00
Lars Knoll
1f806aa1b4 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)
2011-05-12 10:36:29 +02:00
Qt Continuous Integration System
c6b4da2f8a 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.
2011-05-12 02:11:15 +10:00
Qt Continuous Integration System
ca724e095b 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.
2011-05-12 01:42:31 +10:00