profile/ivi/qtbase.git
12 years agoworkaround issue where casing diff overflows signed short
Konstantin Ritt [Mon, 23 Apr 2012 15:11:57 +0000 (18:11 +0300)]
workaround issue where casing diff overflows signed short

there are two such codepoints were added in the Unicode 5.1:
  U+1D79  LATIN SMALL LETTER INSULAR G
  U+A77D  LATIN CAPITAL LETTER INSULAR G
two more of them were added in the Unicode 6.0:
  U+0265  LATIN SMALL LETTER TURNED H
  U+A78D  LATIN CAPITAL LETTER TURNED H
and two more were added in the Unicode 6.1:
  U+0266  LATIN SMALL LETTER H WITH HOOK
  U+A7AA  LATIN CAPITAL LETTER H WITH HOOK

we map them like special cases with length == 1
(note: all are in BMP which is checked explicitly in the generator)

Change-Id: I8a34164eb3ee2e575b7799cc12d4b96ad5bcd9c6
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQChar: reduce code duplication by inlining some methods
Konstantin Ritt [Mon, 9 Apr 2012 14:56:44 +0000 (17:56 +0300)]
QChar: reduce code duplication by inlining some methods

using templates for toLower()/toUpper()/toTitleCase()/toCaseFolded()
makes the upcoming patches smaller and thus easier to review

Change-Id: Ideb23e8669dbc2fe9ea3f129bf0137e1805ece11
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoMake NVDA read aloud stuff from a Qt app again.
Jan-Arve Saether [Tue, 24 Apr 2012 11:20:07 +0000 (13:20 +0200)]
Make NVDA read aloud stuff from a Qt app again.

Previously, NVDA did not read aloud anything from a Qt app.

Change-Id: Ie738e7e7d7acc54f45fab9195adc09bfde930174
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoFix a regression where events were not delivered on windows
Jan-Arve Saether [Tue, 24 Apr 2012 07:52:52 +0000 (09:52 +0200)]
Fix a regression where events were not delivered on windows

Regression caused by a17907829e6b180f2bb4af9a8594996b2a0e531a

Change-Id: I8a2ca35cf176b4db47f29d848cbc2cd8180596d0
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoAdd QDebug operator<< for QAccessibleEvent
Jan-Arve Saether [Tue, 24 Apr 2012 07:45:43 +0000 (09:45 +0200)]
Add QDebug operator<< for QAccessibleEvent

(Keep it internal)

Change-Id: I9e99ccbd16cc595d2aff97a26181e8d8c3d9d7ae
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoProvide access to RTLD_NODELETE flag on Unix.
Yan Shapochnik [Fri, 20 Apr 2012 12:41:18 +0000 (08:41 -0400)]
Provide access to RTLD_NODELETE flag on Unix.

Introduce a new QLibrary::PreventUnloadHint to support the
RTLD_NODELETE flag support by dlcompat on Unix platforms.

Change-Id: Ib1327e968a2a888850ad1086a102a143f86c5090
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
12 years agoIntegrate Blackberry Platform Services (BPS) with Qt event loop.
Jeff Kehres [Fri, 23 Mar 2012 14:43:44 +0000 (10:43 -0400)]
Integrate Blackberry Platform Services (BPS) with Qt event loop.

This ensures interoperability between the Blackbery C and C++ APIs
and makes it easier to expose platform services in C++ that are
exposed in BPS - since events from both APIs can be processed on
the same thread.

Change-Id: I7270adc64c26396f66d9126141500d5e58be51e7
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Giuseppe D'Angelo <dangelog@gmail.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoEnsure that QUrl::toLocalFile returns decoded paths
Thiago Macieira [Mon, 23 Apr 2012 15:06:08 +0000 (17:06 +0200)]
Ensure that QUrl::toLocalFile returns decoded paths

QUrl::path() already decodes almost everything, but let's pass the
formatting flag to be sure.

Note: decoding of control characters from U+0001 to U+001F is not
implemented. Non-UTF8 sequences are also not representable.

Change-Id: I9a0ae2282ec3d48cc0e70e5b2d3824fb120709ed
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoDon't use the QRegExp methods that modify the object [QtGui]
Thiago Macieira [Fri, 20 Apr 2012 12:59:30 +0000 (14:59 +0200)]
Don't use the QRegExp methods that modify the object [QtGui]

QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.

QRegularExpression has no such shortcoming.

Task-number: QTBUG-25064
Change-Id: If119e06221ca99e57c5ad1a1d4cc6468e9f68c7b
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
12 years agoDon't strip the leading slash of letter+colon paths on Unix
Thiago Macieira [Mon, 23 Apr 2012 15:02:17 +0000 (17:02 +0200)]
Don't strip the leading slash of letter+colon paths on Unix

It's perfectly valid to have a path of /c:/a.txt on Unix, so don't
strip the leading slash unless we're on Windows.

Task-number: QTBUG-20322
Change-Id: I721bd0a65b41048bc735d4eaa0d536174164fe64
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoRemove insignification from qabstractitemmodel test on Mac OS X.
Jason McDonald [Tue, 24 Apr 2012 11:10:54 +0000 (21:10 +1000)]
Remove insignification from qabstractitemmodel test on Mac OS X.

Since this test began to run again on Mac, it has been passing
consistently.

Task-number: QTBUG-22748
Change-Id: Ia81cf60b11d45fb331b5eca5d13df00556c18e07
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agolancelot test: Skip crashing test function on Mac OS X.
Jason McDonald [Tue, 24 Apr 2012 11:20:04 +0000 (21:20 +1000)]
lancelot test: Skip crashing test function on Mac OS X.

Task-number: QTBUG-22792
Change-Id: Iee70dafe9b4aced1a7c6cea63da88a92dff7d43d
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoAdd flag in testlib to disable committing the simulated touch
Laszlo Agocs [Tue, 24 Apr 2012 07:57:57 +0000 (10:57 +0300)]
Add flag in testlib to disable committing the simulated touch

Some declarative tests (e.g. 24319) need more fine-grained control
over processing the simulated touch events.

Change-Id: Ib163cfd29254016ea16e8d739ad97369b6ccdc90
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoAdd a QWindow autotest case for reentrant mouse/touch events
Laszlo Agocs [Mon, 23 Apr 2012 13:18:01 +0000 (16:18 +0300)]
Add a QWindow autotest case for reentrant mouse/touch events

Declarative used to have some issues when the MouseArea event handlers
spinned the event loop: subsequent mouse events were all lost. Let's
add an autotest also for QGuiApplication to make sure the same problem
won't occur there.

Change-Id: If5c3b4f58dad609efb302d2ca932493680ffdf13
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoRun DBus tests only if QtDBus is found.
Stephen Kelly [Mon, 23 Apr 2012 17:24:13 +0000 (19:24 +0200)]
Run DBus tests only if QtDBus is found.

It's not enough to check for UNIX because Qt may have been configured
without dbus, or we could be running on APPLE (on which DBus is not
commonly installed).

Change-Id: Ic57200dad42c0c12b292d1066f799c827294fe9a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoUpdate the QUrl documentation concerning the encoding
Thiago Macieira [Tue, 24 Apr 2012 11:33:16 +0000 (13:33 +0200)]
Update the QUrl documentation concerning the encoding

Looks like I failed to update this earlier, when the behaviour changed.

Change-Id: Ic020c2a14d4e9153f2bc9d22d943a3a380c0851c
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoDon't use the QRegExp methods that modify the object [QtTest]
Thiago Macieira [Fri, 20 Apr 2012 12:59:30 +0000 (14:59 +0200)]
Don't use the QRegExp methods that modify the object [QtTest]

QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.

QRegularExpression has no such shortcoming.

Task-number: QTBUG-25064
Change-Id: I7c5f5ebf4521c32337c9ea9aeeef50e1e8690bf8
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoUse the C99 keyword "restrict" in compilers that support it
Thiago Macieira [Thu, 29 Dec 2011 18:36:46 +0000 (16:36 -0200)]
Use the C99 keyword "restrict" in compilers that support it

This allows the compiler to produce better / smaller code due to not
being required to deal with two pointers possibly aliasing each
other. This also enables vectorisation where otherwise the compiler
wouldn't be able to do.

Change-Id: Ie7db3a54a1ba22f87ac5283d5c43905707957549
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoMark some functions as always_inline with GCC and ICC.
Thiago Macieira [Thu, 29 Dec 2011 17:12:59 +0000 (15:12 -0200)]
Mark some functions as always_inline with GCC and ICC.

These functions are too critical to be called. They should always be
inlined.

Change-Id: I698dc6d83e02c323759c6d066f17993340bd53a5
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agoQLocale: Clean up QLocalePrivate implementation
John Layt [Mon, 26 Mar 2012 16:23:21 +0000 (17:23 +0100)]
QLocale: Clean up QLocalePrivate implementation

In Qt4 QLocalePrivate is a struct returned by a d() method.  This will be
unsuitable for the planned change to use ICU and may cause BIC issues.

This change makes QLocalePrivate a class and creates a new struct
QLocaleData to hold the data index.  Further clean-ups are possible
but are left for later.

Change-Id: Ie316a07790f74674a3b520b735dff72695cc4060
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoCleanup QMetaObject string access.
Jędrzej Nowacki [Tue, 24 Apr 2012 10:44:34 +0000 (12:44 +0200)]
Cleanup QMetaObject string access.

We do not need operate on raw QByteArrayData, QByteArray gives us
better, stable API, without any performance penalty.

Change-Id: Idf47af2333c3694e81dcd31cd07d1a4720046df7
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix creation of config files in debug mode.
Stephen Kelly [Mon, 23 Apr 2012 19:55:14 +0000 (21:55 +0200)]
Fix creation of config files in debug mode.

f88212c22f7e4bec261130a6f82294adfc75abca was not complete.

Change-Id: Ie5b1bb4832176ec8a72ace473f7dbc6c4de10ff2
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoRe-enable network tests on Mac OS.
Jason McDonald [Fri, 20 Apr 2012 15:06:48 +0000 (01:06 +1000)]
Re-enable network tests on Mac OS.

Switch on most of the tests (all but the bearer tests), marking the two
known failures as insignificant tests.

Change-Id: I17f228a938de1a23eddf897f494bfa4e54338dae
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
12 years agoFix tst_qtcpserver::serverAddress on Mac OSX
Shane Kearns [Mon, 23 Apr 2012 14:29:41 +0000 (15:29 +0100)]
Fix tst_qtcpserver::serverAddress on Mac OSX

While linux returns the local address of dual mode sockets as "::"
i.e. the IPv6 address, OSX returns "::FFFF:0.0.0.0" i.e. the IPv4 address.

In the unix socket engine, treat both of these as candidates for
being a dual mode socket. This should hopefully cover other unixes
which we haven't tested.

Task-Number: QTBUG-25445
Change-Id: If1251018d54da98618223ba538c00ba54ac4cb4e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoqdoc: Further changes to the QML specialization
Martin Smith [Tue, 24 Apr 2012 11:10:40 +0000 (13:10 +0200)]
qdoc: Further changes to the QML specialization

1.  Body elements to include type, property, method, signal, enum info, so:

qmlDetail to
- qmlTypeDetail
- qmlPropertyDetail
- qmlEnumerationDetail
- qmlMethodDetail
- qmlSignalDetail

2.  Same thing for a section that contains elements specialized for QML, so

qmlDef to
- qmlTypeDef
- qmlPropertyDef
- qmlEnumerationDef
- qmlMethodDef
- qmlSignalDef

Rationale for both items above is that otherwise the body and section
content models would have to be exactly the same for a type, property,
method, etc.

3.  For the import statement use:

<qmlImportModule>
<apiItemName>QtGraphicalEffects</apiItemName>
<apiData>1.0</apiData>
</qmlImportModule>

So we have an element indicating that this is for the import
statement, not an outputclass.  And no need to specialize the elements
inside it as we know from the ancestor (qmlImportModule) what they're
for.
<qmlImportModule> to be specialized from apiDef.

4.  The 'description' section name doesn't need to be specialized further from the API ref. DTDs so

<qmlDesc> should be <apiDesc>

The content model for the 'description' section would be similar to that of a normal DITA section, specialized into apiDesc in the API ref. DTDs, so we don't need to rename it for QML.

5. We need a separate element for the since information.

<qmlSince>
    <apiItemName>QtGraphicalEffects</apiItemName>
     <apiData>1.0</apiData>
</qmlSince>

6.  Public identifier should be like this for a type:

-//NOKIA//DTD DITA QML Type//EN

Not like this:

-//NOKIA//DTD DITA QML API Type Reference v0.1.0//EN

Change-Id: Ie9047965bf32a2e3e9339eb743f2019cb38c88e4
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemove insignification of QMdiArea test on Windows.
Jason McDonald [Thu, 19 Apr 2012 16:03:55 +0000 (02:03 +1000)]
Remove insignification of QMdiArea test on Windows.

This test had two stable failures, caused by including code not meant
for Windows.

Task-number: QTBUG-25298
Change-Id: I43d9d62ecf5a3c6eec240fafbc43a625c00f45fa
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRe-enable the QMacStyle test.
Jason McDonald [Wed, 18 Apr 2012 17:37:37 +0000 (03:37 +1000)]
Re-enable the QMacStyle test.

This test has only stable failures.  Mark those failures with
QEXPECT_FAIL and re-enable the test.

Task-number: QTBUG-25296
Change-Id: I5615700ec8119a827c30e43ae651a684e78170fe
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoFix QMutex::tryLock timeout regression (integer overflow)
Markus Rathgeb [Mon, 16 Apr 2012 20:31:51 +0000 (22:31 +0200)]
Fix QMutex::tryLock timeout regression (integer overflow)

The timeout given in milliseconds should be converted to a timespec
struct.
To separate the seconds and nanoseconds the milliseconds are first
multiplied to represent the whole value in an int64 variable.
The calculation is done on integers, so we get an overflow if the
milliseconds are bigger then 2148.
If we cast the given value to an int64 we can avoid this problem.

Fix the used cast.

Task-number: QTBUG-24795
Change-Id: I864ae227cf7dda16a6f30aa4db74acc49e20f6eb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoImproved detection of libcrypto and libssl.
Niels Weber [Fri, 20 Apr 2012 12:31:34 +0000 (14:31 +0200)]
Improved detection of libcrypto and libssl.

The previous solution didn't work on systems where the libraries
aren't in the same location.
Now we search for both libcrypto and libssl and load them if their
versions match, even if they are in different directories.

Task-number: QTBUG-25398

Change-Id: I37164638890586947d07670d8a59fc53a84f9c42
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoAdd N9 device mkspec to device mkspecs folder
Donald Carr [Mon, 23 Apr 2012 21:15:14 +0000 (21:15 +0000)]
Add N9 device mkspec to device mkspecs folder

Change-Id: Ie8b0e8a014316b218c86cfdc0c58cad1ae4d3015
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
12 years agoWindows: Fix for frameless widgets.
Friedemann Kleint [Tue, 24 Apr 2012 08:34:46 +0000 (10:34 +0200)]
Windows: Fix for frameless widgets.

Let Qt::FramelessWindowHint take precedence over
Qt::WindowTitleHint (which enforces WS_CAPTION and thus
WS_DLGFRAME).

Change-Id: I2c0248d8a3ee3ed0f04b926acdef3cbeb98ca571
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix windowgeometry test for Windows.
Friedemann Kleint [Tue, 24 Apr 2012 08:21:10 +0000 (10:21 +0200)]
Fix windowgeometry test for Windows.

- Specify main.cpp with full path to avoid obscure link
  errors (grabbing main.cpp from windowflags)
- Set proper flags on the test window.

Change-Id: I9bbaf9cb5c7e210f53a51b58bd48a827d6104fe2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRemove insignification from QDateTimeEdit test on Mac OS X.
Jason McDonald [Thu, 19 Apr 2012 16:41:39 +0000 (02:41 +1000)]
Remove insignification from QDateTimeEdit test on Mac OS X.

This test only has stable failures. Mark those with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-23674
Change-Id: I0e6cfe4f1992410bbc27b266f7bdafa14451aff7
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove insignification of QSizeGrip test on Mac OS X.
Jason McDonald [Thu, 19 Apr 2012 16:25:18 +0000 (02:25 +1000)]
Remove insignification of QSizeGrip test on Mac OS X.

The test has one stable failure.  Mark it with QEXPECT_FAIL and
re-enable the test.

Task-number: QTBUG-23681
Change-Id: Iade17cbbd1570863bb628572d8da52ec9c0f62ba
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoSkip unstable tst_QMdiArea::subWindowActivated2 test on Mac OS X.
Jason McDonald [Tue, 24 Apr 2012 07:54:20 +0000 (17:54 +1000)]
Skip unstable tst_QMdiArea::subWindowActivated2 test on Mac OS X.

This test function recently became unstable in parallel with the change
to re-enable the test.  Skip the unstable function until it can be
fixed.

Change-Id: I0fb962aa3294a0c9b799acee52ab1fb1cd1c6924
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoRemove Qt 5 todo in QVariant: we're not going to change the behaviour
Thiago Macieira [Mon, 23 Apr 2012 14:24:22 +0000 (16:24 +0200)]
Remove Qt 5 todo in QVariant: we're not going to change the behaviour

Task-number: QTBUG-25111
Change-Id: I2387767698c402e2bd0ecdfdd6ed41d4a224f1b6
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoChange Windows font database to use qendian.h
Miikka Heikkinen [Tue, 24 Apr 2012 06:39:11 +0000 (09:39 +0300)]
Change Windows font database to use qendian.h

Removed the custom BigEndian class and utilized qendian.h functions
instead.

Change-Id: Ieb10f77411404e1524fcedaceffa5b0e333c7429
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRename the default organisation from "Trolltech" to "Qt" on Mac
Thiago Macieira [Fri, 20 Apr 2012 12:28:07 +0000 (14:28 +0200)]
Rename the default organisation from "Trolltech" to "Qt" on Mac

This doesn't seem to be documented -- or if it was, the documentation
has been changed.

Task-number: QTBUG-23269
Change-Id: Ie7aa51aeb251bfaa3d0018fbac4adc9517c97fa0
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoqdoc: Don't write '...' for empty <apiName>
Martin Smith [Mon, 23 Apr 2012 11:45:28 +0000 (13:45 +0200)]
qdoc: Don't write '...' for empty <apiName>

qdoc now <apiName/>, when there is no name.

Change-Id: I0aa85eef633776f691c9e2238514194cf89b8a8f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoqdoc: Update qdoc to use QML spec for DITA
Martin Smith [Mon, 23 Apr 2012 10:41:16 +0000 (12:41 +0200)]
qdoc: Update qdoc to use QML spec for DITA

qdoc now generates DITA XML from QML docs according
to the QML specialization.

Change-Id: I51d93c2ab3b1deefab9bbedcd2e752f49648809f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
12 years agoRemoved unused QUrlPrivate::clear()
Simon Hausmann [Mon, 23 Apr 2012 06:46:05 +0000 (08:46 +0200)]
Removed unused QUrlPrivate::clear()

The function is not used anymore.

Change-Id: Idfdc0505358421a866b15e2ad322679a1808e223
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoUse the Q_PROCESSOR_* macros in qsimd.cpp
Thiago Macieira [Thu, 19 Apr 2012 22:07:31 +0000 (00:07 +0200)]
Use the Q_PROCESSOR_* macros in qsimd.cpp

Change-Id: I7be9b14a24329be32c43603ae87df17328696109
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoRemove insignification of QMdiArea test on Mac OS X.
Jason McDonald [Thu, 19 Apr 2012 15:12:22 +0000 (01:12 +1000)]
Remove insignification of QMdiArea test on Mac OS X.

This test has only stable failures on Mac.  Mark those failures with
QEXPECT_FAIL and re-enable the test.

Task-number: QTBUG-25298
Change-Id: I1c768226dfeb9307386e8853091baa68936bed29
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoSet thread name on QNX
Sean Harmer [Mon, 23 Apr 2012 09:55:18 +0000 (10:55 +0100)]
Set thread name on QNX

Change-Id: I4fc786afce2e53676b148332dddd2c84228f7d87
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQTimer: fix typo in singleShot optimization for 0 msecs
Giuseppe D'Angelo [Sun, 22 Apr 2012 21:11:07 +0000 (22:11 +0100)]
QTimer: fix typo in singleShot optimization for 0 msecs

The SIGNAL/SLOT/METHOD(x) macros prepend a character between
'0' and '2' inclusive, and not '0' and '3'.

Change-Id: Ibdbf442422925a43f956b2ba70f1f9c6a2812305
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRevert "Add workaround for projects using 'QT += declarative'"
Friedemann Kleint [Fri, 20 Apr 2012 14:50:44 +0000 (16:50 +0200)]
Revert "Add workaround for projects using 'QT += declarative'"

The workaround should no longer be necessary.
It causes compile errors for MinGW since the command lines
are too long.

This reverts commit 6225e3ba01ef918724a15dd1311ab5d8205be534.

Change-Id: I0288f4621f072b91dc94f25092ef124fa4c1b09e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoDon't use the QRegExp methods that modify the object [qmake]
Thiago Macieira [Fri, 20 Apr 2012 12:59:30 +0000 (14:59 +0200)]
Don't use the QRegExp methods that modify the object [qmake]

QRegExp matching methods modify the object, which we don't want to. In
particular, when we receive a QRegExp from the user or we store in a
context that might require thread-safety, make sure we make a copy
before using it.

QRegularExpression has no such shortcoming.

Task-number: QTBUG-25064
Change-Id: I6b2d2530238a7e04b44859664a2962f2f466ee30
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoAdd missing private headers to testlib.pro
Thiago Macieira [Mon, 9 Apr 2012 14:07:42 +0000 (11:07 -0300)]
Add missing private headers to testlib.pro

Change-Id: Id927b05374b9e82fbee029258f176223b8b32e90
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMove Q_FUNC_INFO to qcompilerdetection.h
Thiago Macieira [Wed, 28 Mar 2012 19:40:28 +0000 (16:40 -0300)]
Move Q_FUNC_INFO to qcompilerdetection.h

Change-Id: Ibc63913f070febe561890e98ef079ca883d9bfc9
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoMove the QT_STRINGIFY macro to the top of qglobal.h
Thiago Macieira [Wed, 28 Mar 2012 19:27:09 +0000 (16:27 -0300)]
Move the QT_STRINGIFY macro to the top of qglobal.h

This will allow me to use them in qcompilerdetection.h.

Also, leave them defined.

Change-Id: I73cb39e3cfcc2463d1d47a856e4a64354ebe743c
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoQSqlQueryModel::setQuery() don't use deprecated reset()
Mark Brand [Sun, 22 Apr 2012 23:06:17 +0000 (01:06 +0200)]
QSqlQueryModel::setQuery() don't use deprecated reset()

Previously the method attempted to reset only as a last resort.

Now reset() is deprecated and resetting must happen between emitting
modelAboutToBeReset() and modelReset(). Since this suffices in all
cases to notify views that they must reinterrogate the model, it is no
longer necessary to signal explicitly row removals and insertions
within the scope of the reset.

Additionally, fetchMore() is now called within the scope of the reset
so insert signals do not have to be emitted here either.

This improved handling of resetting in QSqlQueryModel also allows the
cache in QSqlTableModel to be cleared directly at select().

This change may actually allow views to operate more efficiently since
they no longer have to react to separate row removal and insert
signals. Views can avoid pointless deallocation and reallocation
by considering row count only after the reset is finished. The cost is
that the columns and horizontal headers must be considered in the view
at each setQuery() call. In any case, it is not clear that trying to
be smart about this in the model justifies additional complexity.

Tests had to be adjusted where they expected explicit row removal
and insert signals.

Change-Id: I4f7eac1419824361d7d9bdcc6a87092b33e80d7a
Task-Id: QTBUG-25419
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
12 years agoQSqlQueryModel::fetchMore() documentation fix
Mark Brand [Sun, 22 Apr 2012 21:17:33 +0000 (23:17 +0200)]
QSqlQueryModel::fetchMore() documentation fix

Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
12 years agoSet default Lighthouse plugin for QNX
Andreas Holzammer [Mon, 23 Apr 2012 08:48:45 +0000 (10:48 +0200)]
Set default Lighthouse plugin for QNX

Change-Id: Id1e51fcd3ce795b2c408d0376679597f6da5c33a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoBuild the QNX plugin with -no-opengl enabled.
Stephen Kelly [Wed, 18 Apr 2012 13:07:23 +0000 (15:07 +0200)]
Build the QNX plugin with -no-opengl enabled.

Change-Id: I776a3eb0d7ada4399b8c191bbfa1e3ed9236b20e
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoMove the CMake unit tests to auto/
Stephen Kelly [Wed, 18 Apr 2012 14:46:26 +0000 (16:46 +0200)]
Move the CMake unit tests to auto/

This will allow the CI system to run the tests. The tests are only
run if cmake is found.

Change-Id: Ie73a56114c151871160bafcbf0b90b2d54620855
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoDon't tell CMake we're making debug libraries if we're not.
Stephen Kelly [Fri, 20 Apr 2012 17:43:00 +0000 (19:43 +0200)]
Don't tell CMake we're making debug libraries if we're not.

The config option debug_and_release is set on Windows and on
mac (unless xcode is used independently of whether Qt is configured
with -release or not.)

We need to check CONFIG(release,debug|release) to see if
-release was set.

Change-Id: Ibf952958874f6b102981526b3397e848c207a3f2
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoFix compilation of QDesktopServices without deprecated
Olivier Goffart [Fri, 20 Apr 2012 12:09:55 +0000 (14:09 +0200)]
Fix compilation of QDesktopServices without deprecated

Change-Id: I9e225d32b3f7db403cf3eea6a277580b4b7410a7
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix warning in qobject.cpp
Olivier Goffart [Sun, 22 Apr 2012 17:50:48 +0000 (19:50 +0200)]
Fix warning in qobject.cpp

Variable only used in debug mode

Change-Id: I6601ca68c427b909680423ae81802f1ed5cd178a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoWindows: Fix QRawFont loading from data.
Miikka Heikkinen [Mon, 23 Apr 2012 11:27:02 +0000 (14:27 +0300)]
Windows: Fix QRawFont loading from data.

The implementation for loading QRawFont from data was missing from
Windows QPA plugin.
For freetype font database, just called the parent QBasicFontDatabse
implementation.
For native font database, ported the implementation from Qt 4.8
qrawfont_win.cpp.

Task-number: QTBUG-24197
Change-Id: Ia784d4cbc4f37c925aa49e53d04faf06a7169a73
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoStart running some disabled tests again on Mac OS.
Jason McDonald [Fri, 20 Apr 2012 14:25:11 +0000 (00:25 +1000)]
Start running some disabled tests again on Mac OS.

These tests were disabled when trying to get CI working on Mac OS
because they asserted or crashed.  Now that CI is working well on Mac
OS, start running these tests again, initially as insignificant tests.
CI results will then be used to determine whether the tests can be made
significant.

Change-Id: Ife411e6b8c84ade45c865ef35f3ae0071d6f8d2b
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQDoc: Support -indexdir on CLI and depends in qdocconf.
Casper van Donderen [Fri, 20 Apr 2012 11:56:50 +0000 (13:56 +0200)]
QDoc: Support -indexdir on CLI and depends in qdocconf.

You can now specify a list of modules in the "depends" qdocconf
variable. This stringlist is then used by the -indexdir option to
specify in which directory to search for [depends entry]/[depends entry].index

Change-Id: Icab6dd0133e180ac04365da9605743def6fb754d
Reviewed-by: Martin Smith <martin.smith@nokia.com>
12 years agoDoc: Fix most QDoc errors in QtXml.
Casper van Donderen [Sat, 21 Apr 2012 07:17:40 +0000 (09:17 +0200)]
Doc: Fix most QDoc errors in QtXml.

Changes:
- XML processing document moved from Qt XML Patterns.
- Moves documentation from /doc/src to /src/xml/doc
- Add new qdocconf file.

Change-Id: I4bc2104714a28905304997e5ff252e662ddf0bee
Reviewed-by: Jerome Pasion <jerome.pasion@nokia.com>
12 years agoFix unmatched double quote character
Jonathan Liu [Sun, 22 Apr 2012 11:21:11 +0000 (21:21 +1000)]
Fix unmatched double quote character

Change-Id: I25fb7dac38db2800ce974d40ec275d510f6d47f4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRe-enable QGraphicsView test on Windows, Mac and Ubuntu 11.10.
Jason McDonald [Thu, 19 Apr 2012 13:04:55 +0000 (23:04 +1000)]
Re-enable QGraphicsView test on Windows, Mac and Ubuntu 11.10.

On Windows, the test had a stable failure and an XPASS related to an
already closed bug report.  On Mac, the test had one stable failure, on
the same statement that had the XPASS on Windows.  On Ubuntu, the test
has been passing consistently.

Mark the stable failures with QEXPECT_FAIL, remove the QEXPECT_FAIL that
causes the XPASS, and remove the insignificant_test markers to re-enable
the test.

Task-number: QTBUG-24296
Change-Id: I05dd16b39296919268fee216332929df591f2b66
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoFix bug in qsslsocket peek()
Kalle Viironen [Tue, 17 Apr 2012 13:43:40 +0000 (16:43 +0300)]
Fix bug in qsslsocket peek()

Calling peek() for qsslsocket caused socket data to be copied into
qiodevices buffer and therefore make it unaccessible in qsslsocket.

Cherry picked form 4.8-branch & modified to Qt5 API changes
(int -> qintptr)
Original commits:
commit 621f18955082fc73471e75d1f8c35c2dcd4befeb
Author: Shane Kearns <ext-shane.2.kearns@nokia.com>
commit 68b1d5c17aa38d5921bdade2b0e0cb67c6c90513
Author: Kalle Viironen <kalle.viironen@digia.com>

Task-number: QTBUG-18498
Change-Id: I6be4b19baec2f3197537f5e7b61432040ec84ad2
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix XPASS in QGraphicsWidget test on Ubuntu 11.10.
Jason McDonald [Thu, 19 Apr 2012 11:52:07 +0000 (21:52 +1000)]
Fix XPASS in QGraphicsWidget test on Ubuntu 11.10.

This test was marked insignficiant on Ubuntu 11.10, but the only failure
was an XPASS.  Make the test significant again, and only include the
QEXPECT_FAIL for CI platforms where the test is known to fail, i.e.
Windows and Ubuntu 10.04.

Task-number: QTBUG-20778
Change-Id: I24af3dab45118758382ba03c8c7a310f16301f8c
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove insignification from QGraphicsProxyWidget test on Windows.
Jason McDonald [Thu, 19 Apr 2012 10:43:52 +0000 (20:43 +1000)]
Remove insignification from QGraphicsProxyWidget test on Windows.

This test has three stable failures on Windows.  Mark those failures
with QEXPECT_FAIL and re-enable the test.

Task-number: QTBUG-24294
Change-Id: I9eee2701a228912c3a91fa730e712661fb93add6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemove insignification from QCompleter autotest.
Jason McDonald [Thu, 19 Apr 2012 08:51:37 +0000 (18:51 +1000)]
Remove insignification from QCompleter autotest.

Until March 15, 2012, this test failed consistently on Mac and passed
on other platforms. Since then, the test has passed consistently on all
platforms.

Change-Id: Ie773643a1c9dc0ab3596786badbc3c3afd4824d6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake the QNX QPA plugin work with non blackberry.
Stephen Kelly [Wed, 18 Apr 2012 10:07:10 +0000 (12:07 +0200)]
Make the QNX QPA plugin work with non blackberry.

Change-Id: Id85d18d9f21711e8d53e8e4bfdf39d10e135f593
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoSend Expose event when top level window becomes visible
Kevin Krammer [Fri, 20 Apr 2012 15:53:54 +0000 (17:53 +0200)]
Send Expose event when top level window becomes visible

Change-Id: I0b45c27fa03bbe073c88ce8d01d9fb283f4051c1
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
12 years agoQTextLayout::d is private
Girish Ramakrishnan [Mon, 23 Apr 2012 03:11:01 +0000 (05:11 +0200)]
QTextLayout::d is private

Compile fix for tst_qtextscriptengine.cpp test on the mac.

Change-Id: I912a339c6c659dc8958cc5997a331e3c18c9cb06
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoRemoved invalid C-style license header from .pro file
Rohan McGovern [Mon, 23 Apr 2012 00:09:09 +0000 (10:09 +1000)]
Removed invalid C-style license header from .pro file

/* C-style comments */ cannot be parsed by qmake.

Additionally, Qt Project legal has agreed that .pro files do not need to
be covered by license headers.

Change-Id: Ie4d75ee09c2fc85a2f954ec4a931b36ea9d51d93
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoDon't assume QAbstractDeclarativeData::objectNameChanged is available.
Michael Brasser [Thu, 19 Apr 2012 02:27:45 +0000 (12:27 +1000)]
Don't assume QAbstractDeclarativeData::objectNameChanged is available.

Preparation for removal from declarative now that a proper NOTIFY
signal exists.

Change-Id: If0acb73b73d17c49dc8de211d95ecd1e8e80ff1b
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoUse org.example instead of com.trolltech for the D-Bus examples
Thiago Macieira [Fri, 20 Apr 2012 12:31:12 +0000 (14:31 +0200)]
Use org.example instead of com.trolltech for the D-Bus examples

We could use org.qtproject, but since this is an example anyway, and
since example.org and example.com are reserved to IANA by RFC 2606
anyway, let's use that.

Task-number: QTBUG-23274
Change-Id: Icdb1ac0390f88b72fa21b02ab362f1a98f26266c
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
12 years agoReplace com.trolltech with org.qtproject in D-Bus's performance tests
Thiago Macieira [Fri, 20 Apr 2012 12:34:15 +0000 (14:34 +0200)]
Replace com.trolltech with org.qtproject in D-Bus's performance tests

I had missed these, apparently.

Task-number: QTBUG-23274
Change-Id: I6455dc34b18ec9cefccfe527b3fd3ad34fb61aa3
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
12 years agoExamples: Don't use deprecated methods
Olivier Goffart [Fri, 20 Apr 2012 14:55:59 +0000 (16:55 +0200)]
Examples: Don't use deprecated methods

Change-Id: Ib6e795f6b5bb6a3ac19882a5fb224460ef1fc8ad
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoEnsure that qXXXdetection.h can be included directly
Thiago Macieira [Wed, 28 Mar 2012 19:28:46 +0000 (16:28 -0300)]
Ensure that qXXXdetection.h can be included directly

Those files might have dependency on one another, on qconfig.h and on
early qglobal.h definitions, so ensure that the only correct include
order is that of qglobal.h.

Change-Id: I89098bacaf16353ee8b51604ee885508dc8e201a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMake the fallback Q_ASSUME and Q_UNREACHABLE be qt_noop
Thiago Macieira [Wed, 28 Mar 2012 19:41:07 +0000 (16:41 -0300)]
Make the fallback Q_ASSUME and Q_UNREACHABLE be qt_noop

That way, we can properly add ; after them, and I can use Q_ASSUME in
Q_ASSERT's else condition.

Change-Id: Iad35819fbb06714116b7dd0f952e1c2c89044c72
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMove Q_DECL_{IMPORT,EXPORT,HIDDEN} to qcompilerdetection.h
Thiago Macieira [Wed, 28 Mar 2012 19:21:40 +0000 (16:21 -0300)]
Move Q_DECL_{IMPORT,EXPORT,HIDDEN} to qcompilerdetection.h

Mindful of QT_VISIBILITY_AVAILABLE and Q_OS_WIN for GCC: when GCC is
used on Windows (i.e., MinGW or potentially Cygwin), use the declspec
variant so we produce proper DLL imports and exports.

When used on other platforms, rely on configure adding
QT_VISIBILITY_AVAILABLE to qconfig.h, which confirms that the
-fvisibility argument is available. That flag has been available since
GCC 4.0 on ELF targets, but it could be missing on some other targets.

Change-Id: I3dbc0043c1eaee0c469c5b1dc8bf05842fe9cd47
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMove some compiler macro definitions into the compiler sections
Thiago Macieira [Wed, 28 Mar 2012 19:00:59 +0000 (16:00 -0300)]
Move some compiler macro definitions into the compiler sections

Makes for a couple of cleaner definitions of fallbacks.

Change-Id: I9b1a6f77bab986514e1862ae1f431ea37b89c1b5
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoMove the compiler-related macros to qcompilerdetection.h
Thiago Macieira [Wed, 28 Mar 2012 18:48:04 +0000 (15:48 -0300)]
Move the compiler-related macros to qcompilerdetection.h

This cleans up qglobal.h a little further and organises things a bit
more.

Change-Id: Ic025e720941cdf59b8a1a0baf515b29f25eba0f1
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoCompile on Windows.
Jan-Arve Saether [Wed, 18 Apr 2012 11:58:50 +0000 (13:58 +0200)]
Compile on Windows.

The previous code was trying to sum one pointer with one string
literal...
Using QVarLengthArray should also potentially speed things up a bit,
since it will avoid a malloc if className is small enough (less
than 15 bytes).

Change-Id: I41218babb3030e7e6f9c31fc77e4af1c209ae0a5
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoFix typo in backwards compatibility code.
Stephen Kelly [Fri, 20 Apr 2012 19:31:26 +0000 (21:31 +0200)]
Fix typo in backwards compatibility code.

The patch just submitted to Qt4 is not affected by this.

Change-Id: I3f38f1a56f2a9a2058b2c8ff0a6ee1715be41e85
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix compilation with Q_DECL_OVERRIDE
Olivier Goffart [Fri, 20 Apr 2012 15:18:15 +0000 (17:18 +0200)]
Fix compilation with Q_DECL_OVERRIDE

In C++11, the override keyword is placed after the function declaration

Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoBuild the tests with the build type that the top-level was invoked with.
Stephen Kelly [Fri, 20 Apr 2012 17:46:20 +0000 (19:46 +0200)]
Build the tests with the build type that the top-level was invoked with.

Change-Id: I87918276987b3a506c2ac8556940fce89a2d20cd
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoQDataStream: Update Version info for doc
Aurindam Jana [Fri, 20 Apr 2012 13:13:14 +0000 (15:13 +0200)]
QDataStream: Update Version info for doc

QDataStream::Qt_5_0 was modified in
aee1f6cc413f56bf4962324799ee3887c3dd037f
but the documentation was not updated.

Change-Id: I520798a7572b0f21cd275290bcd689e1b686d098
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoSilence two warnings in QVariant's unit test.
Thiago Macieira [Fri, 20 Apr 2012 15:30:10 +0000 (17:30 +0200)]
Silence two warnings in QVariant's unit test.

These warnings are expected and correct, so ignore them.

Change-Id: I43931950e46bd3c931db869902574ee7219efa1d
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoDon't push unnecessary data to a data stream for QVariant()
Thiago Macieira [Fri, 20 Apr 2012 14:52:45 +0000 (16:52 +0200)]
Don't push unnecessary data to a data stream for QVariant()

Adjust the test because we don't read past the end anymore.

Task-number: QTBUG-25108
Change-Id: I8243f1d5ae79d1256aab2cb1132598a716a7eeeb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoWindows - "bypass proxy for local..." also affects IP addresses
Shane Kearns [Fri, 20 Apr 2012 14:04:29 +0000 (15:04 +0100)]
Windows - "bypass proxy for local..." also affects IP addresses

If the "bypass proxy for local addresses" option is enabled in
the windows proxy configuration, then do not use the proxy for
any IP address in the subnet of any network interface.

As the systemProxyForQuery api is now offering HTTP proxy tunnels
for TCP sockets, this change avoids local ad-hoc network
connections being routed through the proxy.
In the case where the local address was on a different interface to
the proxy server, it may have been unreachable through the proxy.
For example IP over USB or Bluetooth.

Change-Id: I0842732832a7795112be029d923ed168edc008d6
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoMake sure -fPIE is added to the compile flags.
Stephen Kelly [Fri, 20 Apr 2012 09:46:40 +0000 (11:46 +0200)]
Make sure -fPIE is added to the compile flags.

Change-Id: I279881693b6eba15a2e145742b3281c9425e9b2e
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoOnly run the CMake DBus unit tests on UNIX systems.
Stephen Kelly [Fri, 20 Apr 2012 15:40:16 +0000 (17:40 +0200)]
Only run the CMake DBus unit tests on UNIX systems.

Change-Id: I0c5b511229a7ac0c2aa23a9c3d2053077e94936c
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoWindows: Remove fontengine autodetection logic
Miikka Heikkinen [Fri, 20 Apr 2012 08:57:17 +0000 (11:57 +0300)]
Windows: Remove fontengine autodetection logic

Always default to native font engine as native fonts now work in
QML applications, too.

Change-Id: Iafa5f6d25a9a3b22f49763f287e4e358216cfc2d
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoWindow geometry manual tests: Add Window state controls.
Friedemann Kleint [Fri, 20 Apr 2012 11:54:52 +0000 (13:54 +0200)]
Window geometry manual tests: Add Window state controls.

- Factor out controls from the window flags test, split state
  into Qt::WindowState (QWindow) and Qt::WindowStates(Qt::Widget).
- Add to geometry test.

Change-Id: I25b9a8696bfb7f4faef113ac82559ebb90a140c5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix missing Windows native fonts in QML applications
Miikka Heikkinen [Fri, 20 Apr 2012 08:21:45 +0000 (11:21 +0300)]
Fix missing Windows native fonts in QML applications

Windows native fonts were not getting rendered because the font engine
was cloned incorrectly for QRawFont, resulting in multi-engine instead
of the specific cloned engine.

Task-number: QTBUG-25410
Change-Id: I08f543e541739ac1b51f96f381ae1bb20b59399a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoDisable the tst_exceptionsafety_others test completely.
Thiago Macieira [Fri, 20 Apr 2012 12:06:53 +0000 (14:06 +0200)]
Disable the tst_exceptionsafety_others test completely.

QObject is no longer exception-safe and there's no one working on
improving this, so let's not block innocent commits because of this
failure.

QObjectPrivate's constructor initialises the
QObjectPrivate::threadData member to null, but the destructor
dereferences it unconditionally (the member is initialised in the
QObject constructor). That means QObjectPrivate is not exception-safe
by any definition and, so, anything depending on QObject is not
exception-safe.

Change-Id: If9d5004630b7ce2fb357e328627794caad67564f
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoStabilisation of tst_qnetworkreply on windows
Shane Kearns [Wed, 18 Apr 2012 19:31:35 +0000 (20:31 +0100)]
Stabilisation of tst_qnetworkreply on windows

Workaround QTBUG-24451 by retrying creation of SocketPair if it fails
(waitForConnected and waitForNewConnection are used in the factory
function).
Skip very unstable test cases due to QTBUG-25386

Change-Id: I32129922329b895eb3719d61719c487a4d52c466
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQDoc: Remove the text around previous and next page links.
Casper van Donderen [Thu, 19 Apr 2012 19:34:42 +0000 (21:34 +0200)]
QDoc: Remove the text around previous and next page links.

Previously we printed "[Previous: <link>] and [Next: <link>]. After this
change we only print the <link>, which should include an icon.

Change-Id: I30d0c7d53b70ec2e537774d57a4ac9af01b26b16
Reviewed-by: Martin Smith <martin.smith@nokia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
12 years agoRevert "List QtPrintSupport as a dependency of QtPlatformSupport."
Lars Knoll [Thu, 19 Apr 2012 12:34:38 +0000 (14:34 +0200)]
Revert "List QtPrintSupport as a dependency of QtPlatformSupport."

This reverts commit 9c7cdce672df7da5c84b0ae6ca10ff09a670a315.

platform support does not and should never depend on widgets
or print support.

Change-Id: I828d1dfc02e7993325cf653ed92100750761eaae
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix MSVC conversion warnings in new bytearray code.
Friedemann Kleint [Tue, 17 Apr 2012 15:26:29 +0000 (17:26 +0200)]
Fix MSVC conversion warnings in new bytearray code.

Change-Id: Ifc81564daf3fef0d7f08ae8d250ba41d3b1d5b0f
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQSslSocket: call to ERR_free_strings to free loaded error strings
Martin Petersson [Fri, 30 Mar 2012 12:38:10 +0000 (14:38 +0200)]
QSslSocket: call to ERR_free_strings to free loaded error strings

Since we are calling q_SSL_load_error_strings to load error strings
we should call ERR_free_strings to free the memory again.

Task-number: QTBUG-15732
Change-Id: Ie41291bb0e1434f82025378edfca51930712a8aa
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>