Commit Graph

1094 Commits

Author SHA1 Message Date
Frederik Gladhorn
7465b55d9c Remove more inconsistencies with invisible.
Visible status should not influence child count and
other properties.

Reviewed-by: Jan-Arve
(cherry picked from commit b6a6953d21a95c402e8a5010c1ea5131509eeea3)

Change-Id: I854349bfe48ab3d81bb9eee284965461b1e66aef
Reviewed-on: http://codereview.qt.nokia.com/3019
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:07:45 +02:00
Frederik Gladhorn
fe59af2c00 QAccessibleToolButton::text should return accessibleName if set.
This was most likely a copy and paste error.

Reviewed-by: Denis Dzyubenko
(cherry picked from commit e29ef45e404dbe888c0848eb28317a10b2aff768)

Change-Id: I55dec5b9d101f9015f97cf453dc804d3cc22db8d
Reviewed-on: http://codereview.qt.nokia.com/3018
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:07:27 +02:00
Frederik Gladhorn
ddb0b4a838 Remove stray semicolon.
Reviewed-by: TrustMe
(cherry picked from commit f045367df74fbb5befeef81afa9102d0a6e59d54)

Change-Id: Idcdb0115606447d74a49f2dd1101ad0ad7745db0
Reviewed-on: http://codereview.qt.nokia.com/3017
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:07:09 +02:00
José Millán Soto
5622e32ac9 Changing cursor position in all boundaries
Merge-request: 1242
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
(cherry picked from commit 97c59df43d821e8e1784749e72f8ee7f90d46da2)

Change-Id: Iccb872281a443e57ff3e492911490a8d7495bbdc
Reviewed-on: http://codereview.qt.nokia.com/3004
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-16 15:06:40 +02:00
Kai Koehne
d6d3a32a68 Configure: Set separate_debug_info for all modules
separate_debug_info was previously stored in .qmake.cache, and
therefore only affected qtbase. Store it as a QT_CONFIG setting instead,
and add it to CONFIG for all Qt plugins and modules.

Change-Id: I940c8cb30f1c42c85f4d0342e6a482f20677ff04
Reviewed-on: http://codereview.qt.nokia.com/2975
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-08-16 11:48:43 +02:00
Robert Hogan
0536ec05c3 HTTP internals: send password even if no username is set
Setting only a password (no username) for HTTP requests does not
result in the password being sent.
Only cancel authentication if neither a username nor a password is set.
Requiring a username was preventing user-less logins.

Merge-request: 1250
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Task-number: QTBUG-15566
(cherry picked from commit 6057909d2b73c2c3aa01a0e9216714ef07fb652f)

Change-Id: I23a52362e3e8cf114219accca2b548ceb9dccff7
Reviewed-on: http://codereview.qt.nokia.com/2940
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
2011-08-15 21:51:37 +02:00
David Faure
168fe50106 Make QThread::sleep/msleep/usleep public.
Merge-request: 43
Reviewed-by: olivier
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

Change-Id: Ic5e3ce8f49daf83665865f89fa9fd3488cc5b349
Reviewed-on: http://codereview.qt.nokia.com/2959
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-15 15:45:52 +02:00
David Faure
3a1568c30c Add flag for non-recursive lookup of child qobject(s)
Merge-request: 40
Reviewed-by: olivier
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>

Change-Id: I1194ba0d8bba92ece3132171e230cece341ec127
Reviewed-on: http://codereview.qt.nokia.com/2957
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
2011-08-15 13:37:49 +02:00
Alan Alpert
c74aa53383 FocusScope's focusItem must always be a descendent
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
Change-Id: Iaaaabaabaabaabaabaaaaaffaaaeaaaaaaaacaaa
(cherry picked from commit 0ee51351894296df7328f206e444ece262692f3f)
Reviewed-on: http://codereview.qt.nokia.com/2931
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-08-15 10:00:37 +02:00
Alan Alpert
7b49a23888 Don't endless loop
Task-number: QTBUG-20699
Reviewed-by: Michael Brasser
(cherry picked from commit ce36e8afa47e3625737208b5a912f9f191a59678)
Change-Id: Iaaaabadbabaaaeaaaaaaaaffaaaeaaaaaaaacaaa
Reviewed-on: http://codereview.qt.nokia.com/2757
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
2011-08-15 10:00:37 +02:00
Alan Alpert
81b559631a Don't leak MouseEvents
Based off merge request 1312

Reviewed-by: Michael Brasser
(cherry picked from commit 206c9ba930095efb6d569f6e61a9809f16361dd5)
Change-Id: Iaaaabadbadbadaaaaaaaaaffaaaeaaaaaaaacaaa
Reviewed-on: http://codereview.qt.nokia.com/2843
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2011-08-15 08:06:25 +02:00
Rohan McGovern
bf7ca774bd test: fixed crash in tst_qmenubar::accel in qpa
Always verify that the application has an active window before
attempting to generate a key click.

This problem potentially affected all platforms, but is rare on non-qpa
Linux since QTest::qWaitForWindowShown would usually avoid the problem
on that platform.

Change-Id: I0c30be6228361faffa121c9c2d7a667f8351ebd6
Reviewed-on: http://codereview.qt.nokia.com/2896
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-13 00:00:46 +02:00
Friedemann Kleint
879e351961 Submit ui4.cpp/h as generated by corresponding change in qttools.
Change: 6b02fc50ec6a5236f628b08ebeca50e62b22f362 (Remove QDom code).

Also introduces QStringLiteral.
Remove QtXml from uitools profile.

Done-with: Kai Koehne <kai.koehne@nokia.com>

Change-Id: I56ee88a5dc76041eeb3685a982f2e9c60bcebd13
Reviewed-on: http://codereview.qt.nokia.com/2907
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
2011-08-12 13:12:46 +02:00
Laszlo Agocs
80e7ea928f Handle EINTR gracefully in Wayland clipboard.
Change-Id: Idd5082f02eb6708685421492afb8ad5b8546a5d6
Reviewed-on: http://codereview.qt.nokia.com/2810
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-12 10:49:52 +02:00
Rohan McGovern
4a33154406 test: skip tst_QMenu::task258920_mouseBorder on qpa
This test can't work because QCursor::setPos() isn't yet implemented
for qpa.

Task-number: QTBUG-20753
Change-Id: I2da8f920bd2d4706bbbcd983e11d2cc19055d2bf
Reviewed-on: http://codereview.qt.nokia.com/2891
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-12 06:55:30 +02:00
Rohan McGovern
1159467353 test: skip some broken tests in tst_qpixmap for qpa
These tests cannot be written properly for qpa, due to missing API.

Task-number: QTBUG-20864
Task-number: QTBUG-20863
Change-Id: I2b311833a6738b1830c1cd8be1f20293492bebda
Reviewed-on: http://codereview.qt.nokia.com/2877
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-12 03:02:23 +02:00
Rohan McGovern
32ae0d2bdd test: skip tst_QPrinter::testNonExistentPrinter for qpa
Since the test is irrelevant for Q_WS_X11 and Q_WS_QWS, it's almost
certainly irrelevant for Q_WS_QPA too.

Change-Id: Icc563046baf4c2a5217b87dee150afc7f6fd034d
Reviewed-on: http://codereview.qt.nokia.com/2876
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-12 03:02:17 +02:00
Lars Knoll
f2b3dfd1f1 QXmlStream lives in QtCore
We can finally remove the hack where a copy of QXmlStream
was compiled into QtXml on some platforms.

Change-Id: Ia164caa73dfb470ac86d1b4062031093b433d10c
Reviewed-on: http://codereview.qt.nokia.com/2869
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
2011-08-11 16:21:14 +02:00
Rohan McGovern
96d987edac Let CONFIG+=no_default_target also disable `check' by default
If the compilation of a subdir was explicitly disabled by default, then
the testing of that subdir should also be disabled by default.

Change-Id: I928e232393e89a7c27813b7a48864d4e0fb687f8
Reviewed-on: http://codereview.qt.nokia.com/2835
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-11 05:21:48 +02:00
Rohan McGovern
7ebfe33e38 configure: fixed usage of rpath on mac
This logic should be used for all mac platforms.
Currently it is erroneously skipped for qpa on mac.

Change-Id: Ibc8e0bb38d4c08f48292639c614bc328c703b1bc
Reviewed-on: http://codereview.qt.nokia.com/2836
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-11 05:21:47 +02:00
Peter Hartmann
661fcee779 QLabel documentation: add warning about sanitizing input
make users more aware of QLabel guessing the text format.

Reviewed-by: Gabriel de Dietrich <gabriel.dietrich-de@nokia.com>
(cherry picked from commit 31f7ecbdcdbafbac5bbfa693e4d060757244941b)

Change-Id: I681c7daf568a6107b01908fa85d2da2a7e4e228a
Reviewed-on: http://codereview.qt.nokia.com/2817
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
2011-08-10 13:00:59 +02:00
Michael Goddard
ca3120aa20 Don't print the "Configuration tests:" header if there aren't any.
Change-Id: Ie7f0022348aba90e240f5b68e838430ec4e43ae9
Reviewed-on: http://codereview.qt.nokia.com/2228
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-10 10:39:52 +02:00
Rohan McGovern
81d15e059f configure: fixed debug-and-release default for qpa on mac
debug/release is always supposed to default on for platforms where
debug/release affects linkage (i.e. mac and windows).  Previously, it
did not correctly default on for qpa mac builds.

Change-Id: I8d3c418f3fb787136ab120872fdd4d2ebf82c90e
Reviewed-on: http://codereview.qt.nokia.com/2796
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
2011-08-10 06:10:35 +02:00
Rohan McGovern
de9caf16fe test: mark tst_qfontdatabase qpa failures as expected
Task-number: QTBUG-20754
Change-Id: Ibb57e7724d453b390a8e37e62f6e5cf2691f48f8
Reviewed-on: http://codereview.qt.nokia.com/2654
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-10 03:56:37 +02:00
Rohan McGovern
5d481fa240 test: only QEXPECT_FAIL tst_qgraphicstransform in release mode
The floating point problem which causes this test to fail is not
triggered if Qt is compiled in debug mode.  Enable QEXPECT_FAIL more
narrowly.

Task-number: QTBUG-20661
Change-Id: I25f3260b516cd4fda9d8b711aa1140cbda821412
Reviewed-on: http://codereview.qt.nokia.com/2719
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-10 03:56:36 +02:00
Rohan McGovern
61d60402bf test: mark tst_qftp as insignificant
As virtually all of our tests which use the live qt-test-server, this
test is inherently unstable.

Change-Id: I27fc07a28b8dd6cd4dd3cb6414389e3cf41d0318
Reviewed-on: http://codereview.qt.nokia.com/2795
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-10 03:56:34 +02:00
Harald Fernengel
ad9f5c7e93 Remove all non-const operator==
We had to leave the non-const operator== for binary compatibility.
Remove them all, just leave the const version in there. 100% source
compatible.

Change-Id: Ib7a70fb441fe51d5164d9cbf495cbeda0f48fafe
Reviewed-on: http://codereview.qt.nokia.com/2773
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Griebl <robert.griebl@nokia.com>
2011-08-09 12:00:51 +02:00
Liang Qi
92d88e4755 Support -qtnamespace and -qtlibinfix in qtbase examples
Task-number: QTBUG-19971
Change-Id: Ie20eb2fc133658dd34e1ec25a3b80c36f0f01aa3
Reviewed-on: http://codereview.qt.nokia.com/2754
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Liang Qi <liang.qi@nokia.com>
2011-08-08 16:41:27 +02:00
Laszlo Agocs
ffb279a149 Change mouse and wheel QPA events to use QPointF.
At least QMouseEvent already uses QPointF so there is no reason to
restrict handleMouseEvent to integer positions.

Change-Id: I9c72d2e0e99518b40a1898aec9ad2b3421a3e9e2
Reviewed-on: http://codereview.qt.nokia.com/2739
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-08 14:21:04 +02:00
Rohan McGovern
991033cf46 test: mark tst_qgraphicswidget as insignificant on qpa, xcb
This autotest is unstable.

Task-number: QTBUG-20778
Change-Id: If862a64d2be2f3f66ea8435b0412bfb401f9aceb
Reviewed-on: http://codereview.qt.nokia.com/2721
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-08 08:00:54 +02:00
Rohan McGovern
3e522ca6e2 tests: handle many expected crashing tests on qpa, xcb
Mark all of these autotests as `insignificant' until the underlying
crash bug is fixed.

Task-number: QTBUG-20756
Change-Id: I18fb7038dd86ef2e9a5f37c8f26d7fe76032754e
Reviewed-on: http://codereview.qt.nokia.com/2714
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-08 05:53:26 +02:00
Rohan McGovern
532ba5aa70 test: fixed usage of QEXPECT_FAIL in tst_qglyphrun::initTestCase
The rest of this test gives unpredictable results if initTestCase fails.

Normally, a failure in initTestCase skips the rest of the test, but this
is not the case if QEXPECT_FAIL is used.  Adjust the test to ensure the
rest of it is still correctly skipped.

Change-Id: I8ba76161e788f10801029ef10693e9ac275a2897
Reviewed-on: http://codereview.qt.nokia.com/2713
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-08 05:53:26 +02:00
Charles Yin
230b088c37 add qml related usage help message
Change-Id: Ieabbca64793ba128746193786bac3d0213e8e746
Reviewed-on: http://codereview.qt.nokia.com/2716
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-08-08 03:36:55 +02:00
Jiang Jiang
6729dfbe0e Fix fallbacksForFamily in QBasicUnixFontDatabase
So that this function instead of the one in QPlatformFontDatabase
will be called.

Change-Id: Ifdb75ada27723c688e42067c7633b08391d66467
Reviewed-on: http://codereview.qt.nokia.com/2696
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 16:19:06 +02:00
Rohan McGovern
687c33ea79 test: mark tst_qgraphicseffect as insignificant for qpa
This test unstably fails for qpa, xcb, so mark it as insignificant.

Task-number: QTBUG-20761
Change-Id: I0b4228c2803946ef87d7d11f4167017c2ffd0ad6
Reviewed-on: http://codereview.qt.nokia.com/2658
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-05 13:19:58 +02:00
Rohan McGovern
b4cc8fcbdd test: mark expected failures in tst_qglyphrun for qpa
Task-number: QTBUG-20760
Change-Id: Id046abfc8dcce2c6d068e5febf8c2b8777b50f53
Reviewed-on: http://codereview.qt.nokia.com/2657
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-05 13:19:58 +02:00
Rohan McGovern
791bcba203 test: mark expected failures in tst_qfontmetrics for qpa
Task-number: QTBUG-20759
Change-Id: Idb9493f5bf4ce031d7800b2187bf7c15757eb963
Reviewed-on: http://codereview.qt.nokia.com/2656
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-05 13:19:58 +02:00
Rohan McGovern
06a7e8c017 test: blacklist crashing tst_qfontdialog for qpa, xcb
Task-number: QTBUG-20756
Change-Id: I04b5ace4d357f756a3148597170b87a60b008cf5
Reviewed-on: http://codereview.qt.nokia.com/2655
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-05 13:19:58 +02:00
Rohan McGovern
dccdeb77c7 test: fixed tst_qfont for qpa
Extend the QWS skip case to also cover QPA.

Change-Id: I2bb93b179a384cf4304284d4d550c0bf4b61f4ca
Reviewed-on: http://codereview.qt.nokia.com/2653
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-05 13:19:58 +02:00
Rohan McGovern
24fd1ae14d test: fixed tst_qabstractitemview for qpa
Test uses QCursor::setPos(), which is broken for QPA.

Task-number: QTBUG-20753
Change-Id: Ibeb1278f46dc5dec081c19ba25dd83cc8390aef3
Reviewed-on: http://codereview.qt.nokia.com/2652
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
2011-08-05 13:19:58 +02:00
Jiang Jiang
e95edf644e Fix weight parsing in QBasicUnixFontDatabase
First check the usWeightClass in OS/2 font table, then check
the weight byte in panose structure because Nokia Pure Text
fonts only have that set correctly.

Change-Id: Idce2626c8df17ce74ba78b317846cb42c3f1fe84
Reviewed-by: Jørgen Lind
Reviewed-on: http://codereview.qt.nokia.com/2682
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jiang Jiang <jiang.jiang@nokia.com>
2011-08-05 13:19:58 +02:00
Oswald Buddenhagen
7ce8491280 support xcb-icccm 3.8
this is a rather crude hack, but whatever.

Change-Id: I3fa363572842b207202d4aac8526951c0e16bf5b
Reviewed-on: http://codereview.qt.nokia.com/2602
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:55:30 +02:00
Alan Alpert
4334d07f52 Use more numerically robust algorithm to compute QBezier::pointAt().
QBezier::pointAt() could potentially return values outside the bezier's
bounds, even when the bezier was a straight horizontal line. For
example, with y = 0.5, it would produce y=0.5 or y=0.49999999999999 for
different values of t, which when rounded cause jittering in a QML
PathView.

Task-number: QTBUG-17007
Task-number: QTBUG-18133
Cherry-pick-of: 8b66982ec7b4b5d2071931c288973dce73dc9875
Change-Id: I4ecac7b9085aaaaaaaaaaaaaaaaaaaaaa7d7b0bc
Reviewed-on: http://codereview.qt.nokia.com/2467
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:55:30 +02:00
Sergio Ahumada
1eea477323 test: fixed tst_qundostack and removed CONFIG+=insignificant_test
This test had an invalid circular dependency: the test is in qtbase, and
it depends on lrelease in qttools, which depends on qtbase.

Change the test to skip if lrelease is not available or not working.

Change-Id: I4696f4a178a6f8c0f2e76b5c4ae7f60c4f953334
Reviewed-on: http://codereview.qt.nokia.com/2619
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-05 08:12:57 +02:00
Marius Storm-Olsen
dcd435b7fc Allow adding to @ignore_headers from sync.profile
We need this to avoid syncing certain files in QtDeclarative on
Windows.

Change-Id: Ia9fc95262ac18bafc39efc038ea70a1b5d67cddd
Reviewed-on: http://codereview.qt.nokia.com/2641
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
2011-08-04 22:56:33 +02:00
Peter Hartmann
8ef86d05f1 QSslCertificate: deprecate alternateSubjectNames()
... and add a new method subjectAlternativeNames() instead. This was
a typo in the API.

Change-Id: Id8704c387c9ff8e1af2b9a524ff628f5c053a294
Reviewed-on: http://codereview.qt.nokia.com/2618
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
2011-08-04 16:13:33 +02:00
Rohan McGovern
69d6012de4 test: fixed tst_qundogroup and removed CONFIG+=insignificant_test
This test had an invalid circular dependency: the test is in qtbase, and
it depends on lrelease in qttools, which depends on qtbase.

Change the test to skip if lrelease is not available or not working.

Change-Id: I964ddaf9485a2afed5a1bd4f88d9bdccadf1cfca
Reviewed-on: http://codereview.qt.nokia.com/2472
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Kalle Lehtonen <kalle.ju.lehtonen@nokia.com>
2011-08-04 16:13:17 +02:00
Laszlo Agocs
beb3dfed07 Support QImage and others in Wayland clipboard.
The wayland plugin's clipboard implementation lacked support for data
set via QMimeData::setImageData, QClipboard::setPixmap, etc. because
everything was treated as a QByteArray. A variant having an image
cannot however be converted to a byte array. Therefore, to make these
convenience functions to work, the image is now encoded via
QImageWriter before sending it. On the receiving side QMimeData is
capable of decoding images from byte arrays, so no problem there.
The patch also renames an internal QWaylandMimeData class to a more
suitable clipboard-specific name as the functionality is clipboard
specific.

Change-Id: I77e7df903b8dbe9731613fdbb9693b2a37b05d18
Reviewed-on: http://codereview.qt.nokia.com/2616
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-04 12:10:53 +02:00
Richard Moore
9158f5a979 Fix the lifespan of the test CA cert used by the autotests.
The test CA I used for the QSslCertificate autotests had a short
lifespan which meant that the tests now fail. See bug QTBUG-20582.
This change gives it a lifespan of 10 years matching the leaf
certificates.
In addition, remove the temporary QEXPECT_FAIL statements.

Change-Id: Ic1918e6e31f5cc755ec43d899663140ebe95a2a9
Merge-request: 37
Task-number: QTBUG-20582
Reviewed-by: Peter Hartmann <peter.hartmann@nokia.com>
Reviewed-on: http://codereview.qt.nokia.com/2548
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
2011-08-03 10:46:12 +02:00
Friedemann Kleint
6f4212e593 Fix QString/QByteArray literals for MSVC2010 (compilation of tests).
- Specify return type of QByteArrayLiteral/QStringLiteral lambdas.
- Define QT_UNICODE_LITERAL instead of QT_UNICODE_MARKER.

Change-Id: I8a53506887d2736b093798220b088f645f05e415
Reviewed-on: http://codereview.qt.nokia.com/2514
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
2011-08-02 17:14:02 +02:00