Commit Graph

7369 Commits

Author SHA1 Message Date
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
Jørgen Lind
d34b0eb633 Fix platformsupport as installable module
Change-Id: I17c4723c551c1cee9c442e8d6c1289bccf505d3d
Reviewed-on: http://codereview.qt.nokia.com/2868
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Andy Nichols
2011-08-11 15:20:17 +02:00
Morten Sorvig
cbce0088bb Cocoa: Set child window geometry correctly.
Qt child window geometry is in the parent window
coordinate space, convert from/to OS X screen
coordinates when needed.

Change-Id: I50d35dd35e51af8fc161ec363c0e996a0e8aa9f3
Reviewed-on: http://codereview.qt.nokia.com/2859
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@nokia.com>
2011-08-11 13:22:36 +02:00
Morten Sorvig
9ff59c4ef4 Configure: Make QPA default when building on OS X
Minimal patch to change the default. PLATFORM_MAC
is now obsolete, and at some point we need to go
through configure and remove it or replace usages
with for example BULD_ON_MAC.

Change-Id: Ic6a8609158b6021ead23d8731e683ef3a51cc4d7
Reviewed-on: http://codereview.qt.nokia.com/2780
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-11 13:17:15 +02:00
Morten Sorvig
845291ba19 Cocoa: Activate Qt apps on startup.
This prevents Qt apps from launching behind the
terminal and QProcess parent apps, which is the
native OS X but not the cross-platform Qt behavior.

This reverses the change made mid 4.x series and
reverts back to the "old" Qt 4 behavior

Change-Id: I99d9f95980db884f8614ec2df663305505e08531
Reviewed-on: http://codereview.qt.nokia.com/2858
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-11 12:38:07 +02:00
Gunnar Sletta
3c36a52e1b include .cc and .CC in fix headers script
Change-Id: Ie8903d59013535e04537c1a5b50fa710a02cb8f0
Reviewed-on: http://codereview.qt.nokia.com/2849
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
2011-08-11 12:18:48 +02:00
Gunnar Sletta
46c9f4c212 Implement "quit on last window closed" logic for QWindow
Change-Id: Ide33578ad60796f3e267b09be76cda87eaf873d0
Reviewed-on: http://codereview.qt.nokia.com/2827
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-11 08:20:55 +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
Samuel Rødal
73769d85ec Don't try to use IBUS when dbus is not configured.
Change-Id: I315ef3d834e923b649e4306866666549852c254f
Reviewed-on: http://codereview.qt.nokia.com/2825
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Matthew Cattell <matthew.cattell@nokia.com>
2011-08-10 14:31:13 +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
Samuel Rødal
ac26ac4650 Removed unnecessary debug output in xcb plugin.
Change-Id: I3b354a8649971a5d8c68a0b4f6bbdf6475116d65
Reviewed-on: http://codereview.qt.nokia.com/2808
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
2011-08-10 08:35:50 +02:00
Samuel Rødal
24c7776c62 Made QWindow::setVisible() send show and hide events.
Change-Id: Ideae15f7bd6801d7afe2354627c0893b0b6a32ca
Reviewed-on: http://codereview.qt.nokia.com/2741
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2011-08-10 08:17:41 +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
Matthew Cattell
2ac6eb142e build without dbus
Change-Id: I5af35ff094bea08c83f0e65e72efa59adac2581c
Reviewed-on: http://codereview.qt.nokia.com/2790
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-09 18:05:34 +02:00
Samuel Rødal
d9a95fb6a0 Removed Q_XCB_NOOP's from QGLXContext.
QGLXContext might be used from different threads than the gui thread, so
don't trigger any XCB logging from there.

Change-Id: I96a51ebf6987749d209b447c9ae2ac8b7298bd4c
Reviewed-on: http://codereview.qt.nokia.com/2782
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-09 16:11:03 +02:00
Samuel Rødal
44ad7a7f2b Removed QPaintDevice dependency in blitFramebuffer().
Change-Id: I7294be5c4447d7e24dda95b822a9ce7b2abbccc4
Reviewed-on: http://codereview.qt.nokia.com/2783
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-09 16:10:28 +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
Gunnar Sletta
f66065f281 Get linux input plugin compiling by removing keyboard support
Change-Id: I46ade27b5dde6c8d326a84e94abbbde1435889f8
Reviewed-on: http://codereview.qt.nokia.com/2765
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-09 09:20:56 +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
Gunnar Sletta
a36f23292b make eglfs compile
Change-Id: I724b700ed87cbc5d69647032c0c9c8e7e1d82748
Reviewed-on: http://codereview.qt.nokia.com/2689
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-08 09:58:34 +02:00
Gunnar Sletta
5c435189d4 Implement map/unmap and force geometry EglFS
Change-Id: Ia2d86e84acfeb30f41b06f106b93033fe54ed839
Reviewed-on: http://codereview.qt.nokia.com/2730
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-08 09:28:01 +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
Samuel Rødal
e09d427baf Properly initialize window properties in xcb plugin.
Since 833090abb9 these need to be called manually.

Change-Id: Iabc263d499e724d4d39c3d8350563feb57749879
Reviewed-on: http://codereview.qt.nokia.com/2704
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 16:35:44 +02:00
Samuel Rødal
ca1ad7e9a5 Get wayland plugin working after latest QPA API changes.
Change-Id: If54e7068aaed84fe765b887250bca79c787bd8a3
Reviewed-on: http://codereview.qt.nokia.com/2684
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 16:34:35 +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
Samuel Rødal
6b728caee4 Get rid of missing qmake warning.
Change-Id: I470e89cb5b2042cda1811ef327e0703c7510fd08
Reviewed-on: http://codereview.qt.nokia.com/2683
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
2011-08-05 12:32:42 +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
Gunnar Sletta
2a682d2418 Added some convenience to QWindow
Change-Id: I367f5e3f586661322184cfa5f7653814569cb6e3
Reviewed-on: http://codereview.qt.nokia.com/2611
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:42:47 +02:00
Friedemann Kleint
8dc2f81c9f Add WindowStateChanged event.
Not currently considering activation state.

Change-Id: Iea9265d35536947b6cc85639bd9839e9fda69bdf
Reviewed-on: http://codereview.qt.nokia.com/2609
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:41:43 +02:00
Gunnar Sletta
7d07ca2488 Undefine "slots" before including cocoa headers to make it compile
Change-Id: Id2ba9d657a93e0d10b70b31b6a44a6ea9f598d8f
Reviewed-on: http://codereview.qt.nokia.com/2328
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
2011-08-05 10:38:17 +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