5 years agoClarify how two digit years are parsed by QDateTime::fromString().
Mitch Curtis [Thu, 3 Jan 2013 12:01:17 +0000 (13:01 +0100)]
Clarify how two digit years are parsed by QDateTime::fromString().

It's currently not obvious that two digit years will always be in the
20th century (1900's).

Task-number: QTBUG-28797
Change-Id: I7dee9a46e0cb803a8f097debc5443d1789c2f16c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
5 years agoBenchmarks: Remove declaration of built-in and automatic metatypes.
Stephen Kelly [Thu, 3 Jan 2013 09:43:34 +0000 (10:43 +0100)]
Benchmarks: Remove declaration of built-in and automatic metatypes.

These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.

Change-Id: Iba4b7f8ff7a1c7974d144b955cbf064e43b36ec7
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agoNetwork: Remove declaration of built-in and automatic metatypes.
Stephen Kelly [Thu, 3 Jan 2013 09:44:24 +0000 (10:44 +0100)]
Network: Remove declaration of built-in and automatic metatypes.

These types are either built-in or 'automatically declared' and so
don't need to be explicitly declared as metatypes.

Change-Id: Ifdce72af844901665c4ebab11507216ba5f00fc1
Reviewed-by: Richard J. Moore <rich@kde.org>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agoQNX: Don't crash because the window hasn't been initialized yet.
Sergio Martins [Thu, 3 Jan 2013 10:34:38 +0000 (10:34 +0000)]
QNX: Don't crash because the window hasn't been initialized yet.

Don't call window->handle() inside the backingstore ctor, because
we might still have the window ctor in the call stack
( ex: a QWindow sub-class that creates a backingstore inside it's

Crash can be reproduced by running examples/gui/analogclock.

Change-Id: I4622ceaeb05696c5ae0181a528f58e5d102dcb22
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agoDon't read from deleted member variable
Peter Kümmel [Sat, 1 Dec 2012 14:29:43 +0000 (15:29 +0100)]
Don't read from deleted  member variable

QNetworkProxy::setApplicationProxy deletes factory set by

Change-Id: Iaafd62d1cdb2045d69c7359cacc513056216826c
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
5 years agoWINCE: Follow new library naming schema
Andreas Holzammer [Thu, 3 Jan 2013 14:56:20 +0000 (15:56 +0100)]
WINCE: Follow new library naming schema

Change-Id: Iad85e64bf504053e21cad809d2435c1ca239201b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoFix copy-pasto in QMetaObject::methodCount docs.
Stephen Kelly [Thu, 3 Jan 2013 15:06:44 +0000 (16:06 +0100)]
Fix copy-pasto in QMetaObject::methodCount docs.

Copy-pasto'ed from the propertyCount docs.

Change-Id: Iddb4ce9c9559ca274a80deb0785424df108af762
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
5 years agoFix possible crash in QTextDocument
Eskil Abrahamsen Blomfeldt [Tue, 11 Dec 2012 13:07:16 +0000 (14:07 +0100)]
Fix possible crash in QTextDocument

With trailing spaces in some cases, we would not get the
"no justification at end of paragraph" special case, and continue
in the code, getting the unexpected case where line_length becomes
< 0 which would lead to memory corruption because we were writing
outside our buffers. I added an assert to catch this type of bug
earlier, and I added the trailing spaces to the test for the end
of the paragraph.

The test case added is one example which would crash.

Task-number: QTBUG-27354
Change-Id: Id720a6fa55dbc709ce04dd5321e55687bf960d75
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoRemove metatype registration of built-in types.
Stephen Kelly [Thu, 3 Jan 2013 09:33:51 +0000 (10:33 +0100)]
Remove metatype registration of built-in types.

As they are built-in, they are effectively registered at compile-time

Change-Id: I7ae6ba16088eab5d19213fa7b07c2a7760988a86
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agoDeclare the QMetaType::WasDeclaredAsMetaType enum as private
Thiago Macieira [Wed, 2 Jan 2013 16:33:42 +0000 (14:33 -0200)]
Declare the QMetaType::WasDeclaredAsMetaType enum as private

Omit its value in the documentation.

Change-Id: I474faefde23b0e2e0a77a9e6391fd556a6523128
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoRemove some dead code from qtriangulator.cpp
Thiago Macieira [Sat, 22 Dec 2012 05:40:30 +0000 (21:40 -0800)]
Remove some dead code from qtriangulator.cpp

The CompareEdges functor class is never used anywhere. Clang saw it
through to the static function that never got used:

qtriangulator.cpp:227:12: error: unused function 'comparePoints'
static int comparePoints(const QPodPoint &u, const QPodPoint &v)

Change-Id: I67d821e454daf82bd8107bf20f787aff9496e878
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix warnings found by GCC 4.7 in the XCB platform plugin
Thiago Macieira [Sat, 22 Dec 2012 03:42:22 +0000 (19:42 -0800)]
Fix warnings found by GCC 4.7 in the XCB platform plugin

qxcbnativeinterface.cpp:246:8: error: unused parameter 'context' [-Werror=unused-parameter]
qxcbcursor.cpp:550:85: error: 'root' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Change-Id: I5fa4e717c86d0e8198e501e6c799e0ceb9264708
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agotest: Change trolltech.com:443 to qt-project.org:443
Sergio Ahumada [Thu, 3 Jan 2013 10:00:33 +0000 (11:00 +0100)]
test: Change trolltech.com:443 to qt-project.org:443

trolltech.com seems to be shut down already

Change-Id: Ic90ce01aeb51b6f154b9bbf4762c365a398c9e3d
Reviewed-by: Simo Fält <simo.falt@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoMove the Q_DECLARE_METATYPE for QList<QSslError> to qsslerror.h
Stephen Kelly [Wed, 2 Jan 2013 16:44:17 +0000 (17:44 +0100)]
Move the Q_DECLARE_METATYPE for QList<QSslError> to qsslerror.h

Otherwise it is possible to assert if

 qRegisterMetaType<QList<QSslError> >("QList<QSslError>")

is called in a TU which does not include the Q_DECLARE_METATYPE

Change-Id: Ice1ffbb0f8d0a745d2bffc8b4e13ca31621e8ca4
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
5 years agoFix GCC warning about parentheses in QtPlatformSupport
Thiago Macieira [Sat, 22 Dec 2012 03:39:46 +0000 (19:39 -0800)]
Fix GCC warning about parentheses in QtPlatformSupport

atspiadaptor.cpp:2140:12: error: suggest explicit braces to avoid ambiguous 'else' [-Werror=parentheses]

Change-Id: Ib21308f9c1b3bf813fed803228d8adbcc3ce7e9f
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoMake qtestaccessible.h compile with QT_NO_KEYWORDS
Thiago Macieira [Sat, 22 Dec 2012 21:26:10 +0000 (13:26 -0800)]
Make qtestaccessible.h compile with QT_NO_KEYWORDS

Change-Id: I2065be84d69db62cdae1ad6ac66a09fc5f3454eb
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoqdbusxml2cpp: Check string length before checking for \r\n.
Jon Severinsson [Sat, 22 Dec 2012 22:45:15 +0000 (23:45 +0100)]
qdbusxml2cpp: Check string length before checking for \r\n.

Change-Id: I5370bae258933536ecf9785da95a9006fafc1a62
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix warning about unused variable
Thiago Macieira [Sat, 22 Dec 2012 21:40:26 +0000 (13:40 -0800)]
Fix warning about unused variable

qeglfshooks.h:77:21: error: 'hooks' defined but not used [-Werror=unused-variable]

Defining a static variable in a header file is a terrible idea. But if
I remove it, other code breaks and I don't have the time to fix them

Change-Id: I4f94cbc7f0790df91853662749701e8fb11c2347
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix bug in multisampling handling when converting from surface format
Sean Harmer [Mon, 31 Dec 2012 12:56:56 +0000 (12:56 +0000)]
Fix bug in multisampling handling when converting from surface format

Task-number: QTBUG-28875

Change-Id: If72ce0669de8f344603d2da53eeb5644bd5c4f82
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoMake QImage::mirrored() propagate devicePixelRatio
Morten Johan Sorvig [Mon, 10 Dec 2012 08:00:14 +0000 (09:00 +0100)]
Make QImage::mirrored() propagate devicePixelRatio

Change-Id: I2dfeacc941cb411a7ec6752f745fed9d6345ed8a
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
5 years agoMake these headers includable directly, on all systems
Thiago Macieira [Sat, 22 Dec 2012 21:07:11 +0000 (13:07 -0800)]
Make these headers includable directly, on all systems

For qwineventnotifier.h, just wrap the code around #ifdef Q_OS_WIN. This
has the added benefit of fixing the current qt_no_master_include problem
(that is, even if you #include <QtCore> on Windows, you wouldn't get

For qtypetraits.h, it requires qglobal.h first.

Change-Id: If1ba09a0a29de429a5b87e9878c8ac6a62a443c4
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix warning found by clang:
Thiago Macieira [Mon, 24 Dec 2012 22:38:33 +0000 (14:38 -0800)]
Fix warning found by clang:

kernel/qwidgetsfunctions_wince.h:61:34: error: no newline at end of file [-Werror,-Wnewline-eof]

Change-Id: Icbc35227946652db53fc8454d1d42043aa7c15b9
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoSpeed up and fix QByteArray::setNum()
hjk [Thu, 20 Dec 2012 12:20:43 +0000 (13:20 +0100)]
Speed up and fix QByteArray::setNum()

Going through QLocale and QString is not really needed.

This also makes the result of the conversion of negative numbers
in bases other than 10 independent of the architecture and
implements the documented behavior of treating them as
unsigned types.

Change-Id: Ibc231dc5241deb5cbadd9796484a8b5f79c29410
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoRemove unused function _q_qgraphicsItemSetFlag
Thiago Macieira [Fri, 28 Dec 2012 22:38:19 +0000 (20:38 -0200)]
Remove unused function _q_qgraphicsItemSetFlag

Clang reports:
graphicsview/qgraphicsitem.cpp:1779:13: error: function '_q_qgraphicsItemSetFlag' is not needed and will not be emitted [-Werror,-Wunneeded-internal-declaration]
static void _q_qgraphicsItemSetFlag(QGraphicsItem *item, QGraphicsItem::GraphicsItemFlag flag,

According to the public Git history, in Qt 4.5.1 this function was
already unused. The only reason it wasn't caught so far is that it is
recursive: it calls itself. So it is used... by itself.

Change-Id: I6fc6b33cb314b845525dc9315d0ad742e113d5cd
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix warnings reported by Clang in QtWidget
Thiago Macieira [Sat, 22 Dec 2012 06:07:13 +0000 (22:07 -0800)]
Fix warnings reported by Clang in QtWidget

qwizard.cpp:919:24: error: equality comparison with extraneous parentheses [-Werror,-Wparentheses-equality]
    if ((info.wizStyle == QWizard::AeroStyle)

Change-Id: I477cc4e331633682b79df3cb0113558e9019280c
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoAdd qtest_widget.h to the list of testlib headers
Thiago Macieira [Sat, 22 Dec 2012 21:34:18 +0000 (13:34 -0800)]
Add qtest_widget.h to the list of testlib headers

It was missing.

Change-Id: I356f6ccddf4fc56e76858fdeaa8ef116e3b680af
Reviewed-by: Jason McDonald <macadder1@gmail.com>
5 years agoFix warnings in the SQL drivers found by GCC 4.7
Thiago Macieira [Sat, 22 Dec 2012 03:51:03 +0000 (19:51 -0800)]
Fix warnings in the SQL drivers found by GCC 4.7

qsql_psql.cpp:774:12: error: enumeration value 'CancelQuery' not handled in switch [-Werror=switch]
qsql_mysql.cpp:1163:12: error: enumeration value 'CancelQuery' not handled in switch [-Werror=switch]
qsql_sqlite.cpp:527:12: error: enumeration value 'CancelQuery' not handled in switch [-Werror=switch]
qsql_odbc.cpp:88:97: error: format '%d' expects argument of type 'int', but argument 3 has type 'long unsigned int' [-Werror=format]
qsql_odbc.cpp:706:76: error: cast to pointer from integer of different size [-Werror=int-to-pointer-cast]

Change-Id: I79965283057e92a44a0c8375530cfb30107c891c
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agoDon't use MPProcessorsScheduled on Mac OS X
Thiago Macieira [Sat, 22 Dec 2012 04:47:08 +0000 (20:47 -0800)]
Don't use MPProcessorsScheduled on Mac OS X

It's deprecated and it's not available on iOS anyway. The recommended
way of getting the number of processors online is via sysctl or
sysconf (both of which are just slightly below).

qthread_unix.cpp:397:13: error: 'MPProcessorsScheduled' is deprecated: first deprecated in Mac OS X 10.7 [-Werror,-Wdeprecated-declarations]

Change-Id: I4bf60985fbde155b78b840f3de3ff0a142b78b19
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
5 years agoSuppress warning in valgrind headers: variable set but not used
Thiago Macieira [Sat, 22 Dec 2012 03:22:09 +0000 (19:22 -0800)]
Suppress warning in valgrind headers: variable set but not used

qbenchmarkvalgrind.cpp:229:5: error: variable '_qzz_res' set but not used [-Werror=unused-but-set-variable]

Change-Id: I3c5896659105650d6d824b10ff3beffbdf494e24
Reviewed-by: Jason McDonald <macadder1@gmail.com>
5 years agoPolish code of some opengl examples
hjk [Wed, 19 Dec 2012 10:27:10 +0000 (11:27 +0100)]
Polish code of some opengl examples

Change-Id: If24ae1845176fc525cf6a239a5079f4802f8df3f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoAdd test for QByteArray::setNum
hjk [Fri, 28 Dec 2012 00:11:45 +0000 (01:11 +0100)]
Add test for QByteArray::setNum

Change-Id: I66f3954433bf50fb23fdaeef804838d993e965b5
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoRemoved an unnecessary forward declaration
Thorbjørn Lindeijer [Fri, 28 Dec 2012 10:29:25 +0000 (11:29 +0100)]
Removed an unnecessary forward declaration

qstringlist.h is already being included.

Change-Id: I1790cd560b934b6697702bd11f78f39cddc3389f
Reviewed-by: Thorbjørn Lindeijer <bjorn@lindeijer.nl>
5 years agoFixed typo 'collasping' in QTreeView documentation
Thorbjørn Lindeijer [Fri, 28 Dec 2012 10:09:02 +0000 (11:09 +0100)]
Fixed typo 'collasping' in QTreeView documentation

Change-Id: Ib49c3500c4b3a40a7eaf17404cecc2c38de90530
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoCocoa: Re-enable per class palette on QPA plugin
Gabriel de Dietrich [Tue, 11 Dec 2012 11:34:46 +0000 (12:34 +0100)]
Cocoa: Re-enable per class palette on QPA plugin

Task-number: QTBUG-28443
Change-Id: If66604e8d002be6cf4c308378199c96be7422e06
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoMac: Bring back proper layout in QMessageBox
Gabriel de Dietrich [Fri, 21 Dec 2012 11:51:37 +0000 (12:51 +0100)]
Mac: Bring back proper layout in QMessageBox

Resolved by s/Q_WS_MAC/Q_OS_MAC where appropriate.

Task-number: QTBUG-28738
Change-Id: I8f1239839bffb092387d527af78e9dbe1628ef67
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoFix QMutex::tryLock with negative values
Thiago Macieira [Fri, 21 Dec 2012 19:41:30 +0000 (11:41 -0800)]
Fix QMutex::tryLock with negative values

The Linux futex implementation had a Q_ASSERT for positive values, but
the documentation says that negative values should be interpreted as
infinite (equal to lock()).

Test that too.

Change-Id: I2f96a502d672732781e88e49797756ca9a809121
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix standalone header compilation
Thiago Macieira [Sat, 22 Dec 2012 21:31:04 +0000 (13:31 -0800)]
Fix standalone header compilation

qtconcurrentfunctionwrappers.h:277:22: error: 'QStringList' was not declared in this scope

Change-Id: I54c48386d90146c872679672a1d8cc3675d49c39
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix Clang warning about memcpy a class with vtables
Thiago Macieira [Sat, 22 Dec 2012 08:47:47 +0000 (00:47 -0800)]
Fix Clang warning about memcpy a class with vtables

Change-Id: I7966014a49cdf4c6c82f012d8b1d16ba8ddc3fcc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix warning about unused variable in qdoc
Thiago Macieira [Sat, 22 Dec 2012 03:11:58 +0000 (19:11 -0800)]
Fix warning about unused variable in qdoc

codeparser.cpp:245:18: error: unused variable ‘dn’ [-Werror=unused-variable]

Change-Id: Id271b3829ba3278e80d4e79746db7aabfabd751a
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoQUrl::fromUserInput: fix for urls without a host.
David Faure [Fri, 21 Dec 2012 16:38:19 +0000 (17:38 +0100)]
QUrl::fromUserInput: fix for urls without a host.

QUrl::fromUserInput("http://") was invalid, which doesn't make sense
since QUrl("http://") is valid. Same for "smb:" which is actually
even more a valid URL from a user's point of view.

Change-Id: I371ac393d61b49499edf5adbbc2a90b426fe9e5d
Reviewed-by: Marco Martin <mart@kde.org>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix QSqlQuery test in relation to PSQL support
Andy Shaw [Thu, 20 Dec 2012 18:20:27 +0000 (19:20 +0100)]
Fix QSqlQuery test in relation to PSQL support

Some things needed to be corrected for testing with PSQL, this was
checked against the the PostgreSQL documentation to confirm that the
exepected behaviour is correct.

Change-Id: I45a6b343e9eb920fcae2a62910ecc956abcac0f0
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agoFix warning about unused variable in QtPlatformSupport
Thiago Macieira [Sat, 22 Dec 2012 03:36:12 +0000 (19:36 -0800)]
Fix warning about unused variable in QtPlatformSupport

GCC was complaining:
qevdevtouch.cpp:475:13: error: 'maxId' may be used uninitialized in this function [-Werror=maybe-uninitialized]

Which got me scratching my head: maxId was unconditionally initialised. How
could GCC be complaining about it being uninitialised? Well, turns out that
bestId could be uninitialised and the code does:

            if (bestId > maxId)
                maxId = bestId;

Of course, if bestId was uninitialised, the warning should have been in the
"if" line first.

Change-Id: I5e174ab2957d76ad040c14fa6ef8535129b6dce3
Reviewed-by: Laszlo Agocs <lagocs83@gmail.com>
5 years agoBump Qt version to 5.0.1
Sergio Ahumada [Thu, 20 Dec 2012 11:31:53 +0000 (12:31 +0100)]
Bump Qt version to 5.0.1

Change-Id: Ie8f437b8dfe8a67c7b34321439dd988a02612437
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUse the new QUrlPrivate::validateComponent validator in the main parser
Thiago Macieira [Wed, 26 Sep 2012 10:23:21 +0000 (12:23 +0200)]
Use the new QUrlPrivate::validateComponent validator in the main parser

The code was copied from the main parser there, so remove the

Change-Id: I85748f6f76b3097ff22958d9de67cfa27061a72b
Reviewed-by: David Faure (KDE) <faure@kde.org>
5 years agoMake sure that the strict parser is also operating on setXxx
Thiago Macieira [Wed, 26 Sep 2012 10:10:32 +0000 (12:10 +0200)]
Make sure that the strict parser is also operating on setXxx

These cases weren't handled before.

The validateComponent function is copied from QUrlPrivate::parse, with
the added modification that it now needs to check the gen-delims for
the userinfo.

Change-Id: I055167b977199fa86b56a3a7259a7445585129c6
Reviewed-by: David Faure (KDE) <faure@kde.org>
5 years agoadd and use qtHaveModule() function
Oswald Buddenhagen [Fri, 21 Dec 2012 11:09:56 +0000 (12:09 +0100)]
add and use qtHaveModule() function

this is much more elegant than the so far propagated !isEmpty(QT.foo.name).
also replace feature-specific tests (no-gui and no-widgets) and the
obsolete contains(QT_CONFIG, foo) syntax.

Change-Id: Ia4b3c8febcabf9eeca67b1f9173a523820b1038b
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix some typos
Sergio Ahumada [Fri, 21 Dec 2012 14:51:50 +0000 (15:51 +0100)]
Fix some typos

Change-Id: I4e8d9bd8ea66ec810e4f1fbfd8ddbf25c4b3d980
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
5 years agofix linker command line
Oswald Buddenhagen [Fri, 21 Dec 2012 09:36:10 +0000 (10:36 +0100)]
fix linker command line

gcc is apparently tolerant against this abuse. icc is not.

Task-number: QTBUG-28775
Change-Id: I872d32177562f076ca8aecd263bc4bb3c7e8edc0
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoqmake:Add a case sensitivity flag to ProString::{starts,ends}With()
Debao Zhang [Fri, 21 Dec 2012 02:24:44 +0000 (10:24 +0800)]
qmake:Add a case sensitivity flag to ProString::{starts,ends}With()

Change-Id: I457cd8288ae8a0138f7b28321fe87be3308b5215
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoAdd a manual test for QFile.
Friedemann Kleint [Fri, 21 Dec 2012 10:28:29 +0000 (11:28 +0100)]
Add a manual test for QFile.

Add a command line program allowing to test rename, copy, etc.

Task-number: QTBUG-28246

Change-Id: Ie9667f03b65a874475700ec9ecd91ca2ed32ed97
Reviewed-by: David Faure (KDE) <faure@kde.org>
5 years agoFix main() signature of headersclean stub file
Kai Koehne [Fri, 21 Dec 2012 12:19:45 +0000 (13:19 +0100)]
Fix main() signature of headersclean stub file

Fix MinGW build errors by using the standard main signature.

Change-Id: I0ebe7307a825a7ec50e654f163fbf8fe7060a478
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoMerge "Merge 'release' into stable" into refs/staging/stable
Oswald Buddenhagen [Fri, 21 Dec 2012 09:38:41 +0000 (10:38 +0100)]
Merge "Merge 'release' into stable" into refs/staging/stable

5 years agoFix typo in docs.
Richard Moore [Thu, 20 Dec 2012 22:56:43 +0000 (22:56 +0000)]
Fix typo in docs.

Change-Id: I37ccb10d40d2a848b7c251286d29aeb85411e912
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoFix typo in docs.
Richard Moore [Thu, 20 Dec 2012 22:29:05 +0000 (22:29 +0000)]
Fix typo in docs.

Change-Id: I608fbf5751bf1fa819d9fe10e159fa2a9c5e238d
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoMac: fix transient QScrollBar flashing
J-P Nurmi [Mon, 17 Dec 2012 17:04:40 +0000 (18:04 +0100)]
Mac: fix transient QScrollBar flashing

Task-number: QTBUG-28669
Change-Id: I9825584f15c34709f7897533220911b6bf3ea21d
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
5 years agoTests: stabilize tst_QAbstractScrollArea::setScrollBars2()
J-P Nurmi [Thu, 20 Dec 2012 14:16:30 +0000 (15:16 +0100)]
Tests: stabilize tst_QAbstractScrollArea::setScrollBars2()

Use QWidget::isVisibleTo(parent) instead of isVisible(), just like
QAbstractScrollArea::replaceScrollBar() does. This removes the need
of using QCoreApplication::processEvents() to deliver the actual
hide event just for testing if the scrollbar was requested to be
hidden as it should.

Change-Id: Ie9a816e7b871d280a4b3d9d76adb10601915bd56
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
5 years agotst_QDBusXmlParser: more reliable solution for setting the seed
David Faure [Mon, 17 Dec 2012 17:27:20 +0000 (18:27 +0100)]
tst_QDBusXmlParser: more reliable solution for setting the seed

As recommended by Giuseppe, don't rely on the env var, but use the
internal but exported seed atomic int. This way, the compiler will
detect breakages, rather than runtime.

Change-Id: Iec2bc88c53532d3463d2dc5c73631fc9bc34747b
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQAbstractProxyModel: Document setSourceModel a bit more
David Faure [Thu, 20 Dec 2012 12:20:29 +0000 (13:20 +0100)]
QAbstractProxyModel: Document setSourceModel a bit more

Especially so that subclasses remember to emit reset.

Change-Id: Iadcae3fc5fe72584465d4134f385ed0a1d77bfcd
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agoDoc: Removed the \relates instances
Venugopal Shivashankar [Tue, 18 Dec 2012 14:56:44 +0000 (15:56 +0100)]
Doc: Removed the \relates instances

QDoc supports \relates in the context of a function that
relates to an existing class or a namespace, but not in the context
of a class. We can use \sa to list the related classes or namespaces
for a class instead.

This change ensures that QDoc generates documentation for QMessageLogger
and QMessageLogContext classes.

Task-number: QTBUG-28468

Change-Id: I2242ab730fe5e3acf54b6fa65774e751d2daa7a4
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
Reviewed-by: Martin Smith <martin.smith@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoStyle animations: fix QCommonStylePrivate::stopAnimation()
J-P Nurmi [Wed, 19 Dec 2012 12:36:41 +0000 (13:36 +0100)]
Style animations: fix QCommonStylePrivate::stopAnimation()

Explicitly delete animations, and remove the check for stopped state
as that is already done by QAbstractAnimation::stop() and we want to
delete the animation regardless of the current state.

Task-number: QTBUG-28506
Change-Id: I3e34316e5077a8627ff5e6d3babd1873bbbaa774
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoFixes: out of bounds memory access in QImage autotest
aavit [Wed, 19 Dec 2012 13:17:05 +0000 (14:17 +0100)]
Fixes: out of bounds memory access in QImage autotest

A pointer to the data of one qimage is used, with an offset, in a copy.
In the mono case, that could lead to overflow: the last row would
of the copy would stretch 1 byte beyond the end of the allocated
area. Fix by reducing the height of the copy, so that it keeps
within the allocated memory.

Task-number: QTBUG-28322

Change-Id: I09abfc83f738f8af000fc50f8c94f63dba3a6cfe
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoQUrl auto tests: make sure setAuthority is consistent with setHost
Peter Hartmann [Fri, 14 Dec 2012 19:23:25 +0000 (20:23 +0100)]
QUrl auto tests: make sure setAuthority is consistent with setHost

... with respect to empty and null strings.

Change-Id: Ic107d5bcc8b659497a567b75a7244caceba5a715
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix linking ANGLE on MinGW-w64 64-bit
Jonathan Liu [Thu, 20 Dec 2012 12:13:50 +0000 (23:13 +1100)]
Fix linking ANGLE on MinGW-w64 64-bit

The MinGW-w64 32-bit .def files shouldn't be used with MinGW-w64 64-bit.
Rename .def files from <library>_mingw.def to <library>_mingw32.def and
only use them if QT_ARCH is i386.

Change-Id: I5dc2a87f7d2ed59bf954faf2983d0787ed9e00e9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Patrick von Reth <vonreth@kde.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoGeneralize the check for gui in static plugin import generation
Miikka Heikkinen [Thu, 20 Dec 2012 08:07:20 +0000 (10:07 +0200)]
Generalize the check for gui in static plugin import generation

Generalize the check for gui by checking for needs_qpa_plugin
CONFIG value instead, which gui adds to MODULE_CONFIG.

Task-number: QTBUG-28215
Change-Id: I5834a3f81e5c3868ee1a3fa405ebc6410db1f900
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoEnable forcing generation of static plugin imports
Miikka Heikkinen [Thu, 20 Dec 2012 08:05:29 +0000 (10:05 +0200)]
Enable forcing generation of static plugin imports

Using some modules requires importing static plugins also for shared
libraries (namely QtAxServer), so provided a way to force plugin
imports even for non-applications using force_import_plugins
MODULE_CONFIG value. This required moving the plugin handling after
qtAddModules calls in qt.prf.

Task-number: QTBUG-28215
Change-Id: Id6bb92ed7c078cc8c54538ddc9bb8e8ad316f277
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoEnable module build with QT_NO_ACCESSIBILITY
Tasuku Suzuki [Thu, 22 Nov 2012 20:20:04 +0000 (05:20 +0900)]
Enable module build with QT_NO_ACCESSIBILITY

Change-Id: I330c3ddd70232d94eae5543cb0282b962e67eae5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoUse PG_VERSION if PG_MAJORVERSION is not defined
Andy Shaw [Thu, 20 Dec 2012 04:26:50 +0000 (05:26 +0100)]
Use PG_VERSION if PG_MAJORVERSION is not defined

When only PG_VERSION was available for getting the client driver version
for PostgreSQL it meant that it would not detect the client version and
subsequently would not set the connection up correctly as a result.

This fixes the blob test already in tst_qsqlquery.

Change-Id: Ie2176a43b6be9c0e835498fca5aea129f0cc8fc6
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agoFix the computation of the location of mkspecs.
Stephen Kelly [Wed, 19 Dec 2012 15:34:10 +0000 (16:34 +0100)]
Fix the computation of the location of mkspecs.

The location of the mkspecs directory comes from the archdatadir, which
distros will all set.

Change-Id: I20dbdce76db13dbd37eec065009e215f98985907
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoPrevent a crash if the pixmap passed in is null
Andy Shaw [Mon, 17 Dec 2012 10:53:55 +0000 (11:53 +0100)]
Prevent a crash if the pixmap passed in is null

If the pixmap passed in is null then we should not try to create a
NSImage for it, so we just return 0 instead.

Change-Id: Idae7ba304c97878e0aa8ae1eead5f4bb644a73de
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoDisable the JSC portion of the test unless we have a system PCRE
Thiago Macieira [Wed, 19 Dec 2012 22:29:29 +0000 (14:29 -0800)]
Disable the JSC portion of the test unless we have a system PCRE

CONFIG += pcre is enabled if we're using the Qt PCRE, which isn't
compiled for 8-bit. If it isn't set, then we have a system PCRE.

Change-Id: I29d043b9d3f4d3223dcbb41eadc9f859e710eb88
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
5 years agoDBUS: Fix linker errors on Windows.
Friedemann Kleint [Mon, 17 Dec 2012 11:03:53 +0000 (12:03 +0100)]
DBUS: Fix linker errors on Windows.

QDBusMarshaller symbols were duplicated.

Initial-patch-by: vonreth@kde.org
Change-Id: Ic66681696aaf2a440119c06fce8d1dbd99c8396a
Reviewed-by: Patrick von Reth <vonreth@kde.org>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoReview of documentation.
Michele Caini [Mon, 17 Dec 2012 22:33:49 +0000 (23:33 +0100)]
Review of documentation.

Terms fixing. Changes apply to Qt5 as well as Qt4.

Change-Id: Ibb31ab0d68c62f3feb63722dd967932c2543fa37
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQUrl auto tests: ensure toEncoded() and toString() match wrt. empty auth
Peter Hartmann [Fri, 14 Dec 2012 16:49:01 +0000 (17:49 +0100)]
QUrl auto tests: ensure toEncoded() and toString() match wrt. empty auth

Task-number: QTBUG-8701

Change-Id: I55780a910a0d0996488475f5ce49a240f6223df0
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoUpdate connman bearer plugin for changed connman API.
Lorn Potter [Thu, 6 Dec 2012 21:41:44 +0000 (07:41 +1000)]
Update connman bearer plugin for changed connman API.

This should also remain working for previous connman

Change-Id: I5f0a1947f11948b202391ba0c256067faa01ce6d
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoRemove compat, obsolete headers
Thiago Macieira [Tue, 18 Dec 2012 00:51:42 +0000 (16:51 -0800)]
Remove compat, obsolete headers

These headers did not exist before 5.0 and should not exist in 5.0

Change-Id: I9dd40cb07c468db32777a7ce45afa41e693b7839
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoMake qtestaccessible.h compile on its own.
Thiago Macieira [Tue, 18 Dec 2012 00:17:25 +0000 (16:17 -0800)]
Make qtestaccessible.h compile on its own.

It needs the QTest namespace and QTest::qWait to be declared.

Change-Id: I1c72a13231603a61221cf1b7ad9234aa4cba6d60
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
5 years agoSimilarly to the 797f3c0a01e9, fix qbasicatomic.h inclusion
Thiago Macieira [Tue, 18 Dec 2012 00:13:41 +0000 (16:13 -0800)]
Similarly to the 797f3c0a01e9, fix qbasicatomic.h inclusion

qatomic.h includes qbasicatomic.h, so break the cyclic inclusion

Change-Id: If72bacbcfa36993336786f31e8980fbd43df8bdc
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix compilation of Open GL ES 2 examples when using a Qt-namespace.
Friedemann Kleint [Wed, 19 Dec 2012 13:19:18 +0000 (14:19 +0100)]
Fix compilation of Open GL ES 2 examples when using a Qt-namespace.

Change-Id: I174569a8c989ab53fb6b9bb700c110db2f93c2d5
Reviewed-by: hjk <qthjk@ovi.com>
5 years agoMac: Ignore ScrollBarAlwaysOn policy for transient scrollbars
Gabriel de Dietrich [Wed, 5 Dec 2012 16:26:38 +0000 (17:26 +0100)]
Mac: Ignore ScrollBarAlwaysOn policy for transient scrollbars

Change-Id: I8a542263df64a21cad6b8cddc5ab1d8a93e153d5
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agoMac: New rendering for disclose triangle, get proper color when selected
Gabriel de Dietrich [Tue, 11 Dec 2012 11:35:15 +0000 (12:35 +0100)]
Mac: New rendering for disclose triangle, get proper color when selected

Change-Id: I2be0a28df3f5dd2fdfae13be6ec98763a04187c1
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
5 years agofix examples/gui/analogclock for MSVC
Joerg Bornemann [Mon, 17 Dec 2012 16:37:40 +0000 (17:37 +0100)]
fix examples/gui/analogclock for MSVC

This example is hit by the infamous QTBUG-13496 issue.

Task-number: QTBUG-28665

Change-Id: I9bcffe72d34b1eaa9f5beafc69a16913a597d17f
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
5 years agoAdd qmake generated files to .gitignore.
Miikka Heikkinen [Wed, 19 Dec 2012 12:53:29 +0000 (14:53 +0200)]
Add qmake generated files to .gitignore.

Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I2a2da2f8db41b41601566e66238affa3dcc66dff
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoCheck for gtk_adjustment_configure as this is not always implemented
Andy Shaw [Tue, 4 Dec 2012 13:25:36 +0000 (14:25 +0100)]
Check for gtk_adjustment_configure as this is not always implemented

Some implementations seem to not have the gtk_adjustment_configure
function implemented so we check for this so that there is no problem
when it tries to use it.

Task-number: QTBUG-23569

Change-Id: I777ce09268f86907f3da3cede408c9a41be566cf
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Karim Pinter <karim.pinter@digia.com>
5 years agoFix handling of precompiled header files in XCode projects
Andy Shaw [Tue, 11 Dec 2012 21:15:40 +0000 (22:15 +0100)]
Fix handling of precompiled header files in XCode projects

Task-number: QTBUG-24589
Change-Id: If81e15aa038f418abea25d96a7b7ec773a87d2db
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
5 years agoRespect the OBJECTS_DIR setting for XCode projects
Andy Shaw [Sun, 9 Dec 2012 19:03:35 +0000 (20:03 +0100)]
Respect the OBJECTS_DIR setting for XCode projects

Task-number: QTBUG-28104
Change-Id: I0361cb979c40ce14ac163453d8229efc69527b6c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoMerge 'release' into stable
Oswald Buddenhagen [Wed, 19 Dec 2012 18:31:35 +0000 (19:31 +0100)]
Merge 'release' into stable

Change-Id: I57aaa6747c1bfacc7dee036cd69d91a8c0d9ae7a

5 years agotst_qaccessibility: Fix warnings about window geometry on Windows.
Friedemann Kleint [Tue, 18 Dec 2012 14:22:48 +0000 (15:22 +0100)]
tst_qaccessibility: Fix warnings about window geometry on Windows.

Make windows frameless so that size constraints for
decorated windows do not interfere.

Task-number: QTBUG-28696
Change-Id: Ic4410d8a6e8166bdfe013ed2362173f8e02d4b29
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
5 years agoQDoc: Fix warning - unused variable
Frederik Gladhorn [Tue, 18 Dec 2012 16:39:07 +0000 (17:39 +0100)]
QDoc: Fix warning - unused variable

Change-Id: Id4068e1a1fcfad8fb3cc9174f995cb2b73b6e194
Reviewed-by: Martin Smith <martin.smith@digia.com>
5 years agoFix linking ANGLE on MinGW-w64 32-bit
Jonathan Liu [Tue, 18 Dec 2012 13:53:46 +0000 (00:53 +1100)]
Fix linking ANGLE on MinGW-w64 32-bit

MinGW-w64 32-bit requires the functions exported in the .def file
to be decorated.

Change-Id: I174a92829706a9fb6b0007b2c057300bd69e6d9e
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
5 years agoChange ftp.qt.nokia.com -> ftp.qt-project.org
Sergio Ahumada [Tue, 18 Dec 2012 20:13:53 +0000 (21:13 +0100)]
Change ftp.qt.nokia.com -> ftp.qt-project.org

Task-number: QTBUG-28156
Change-Id: I0060144f0336791933205355b125251ccba73b3e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoQt Gui Examples: Fixed QDoc files
Christiaan Janssen [Tue, 18 Dec 2012 12:00:29 +0000 (13:00 +0100)]
Qt Gui Examples: Fixed QDoc files

Change-Id: I160d8d186a1078f20f2b779bfbdae90459c27641
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoDoc: Removing extra included images in the HTML online build.
Jerome Pasion [Tue, 18 Dec 2012 16:04:01 +0000 (17:04 +0100)]
Doc: Removing extra included images in the HTML online build.

-images not needed and removed.

Change-Id: I917544dcc9e3cf959b1f8f2723cf4709cdc96a46
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Geir Vattekar <geir.vattekar@digia.com>
5 years agoAccessibility indexes are no longer 1-based.
Frederik Gladhorn [Mon, 17 Dec 2012 13:52:33 +0000 (14:52 +0100)]
Accessibility indexes are no longer 1-based.

The updates for focus/selection in QTreeView
were still adding +1 as it was required in Qt 4.

Task-number: QTBUG-28174

Change-Id: Ib9fea7e20d431a0ef0db18494e7bdda06a0646b0
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
5 years agofix DLL manifest resource ids for debug builds
Joerg Bornemann [Tue, 18 Dec 2012 10:26:09 +0000 (11:26 +0100)]
fix DLL manifest resource ids for debug builds

The resource id must be 2 for DLLs. This was broken for the
"debug with incremental linking" case.

Task-number: QTBUG-28682
Task-number: QTBUG-28683
Change-Id: Id8c48a1dec30e341de949213c63c1c9b73956dac
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoslash the -fast configure option
Oswald Buddenhagen [Tue, 18 Dec 2012 15:55:20 +0000 (16:55 +0100)]
slash the -fast configure option

it's completely broken, and i have no time to fix it properly now.
configure runs no qmake -r by default any more, so it's fast enough.

Change-Id: Ib2b4c68f1fc2fe95accecbe93dd5a87c9b015692
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agofinish changelog for qmake, configure & co.
Oswald Buddenhagen [Tue, 18 Dec 2012 15:09:59 +0000 (16:09 +0100)]
finish changelog for qmake, configure & co.

Change-Id: I69e88421b2959215f05f024aedc60dc2c52133fe
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agomention that qt3support is gone
Oswald Buddenhagen [Tue, 18 Dec 2012 15:28:09 +0000 (16:28 +0100)]
mention that qt3support is gone

Change-Id: I08f01eef9d93876471d365ce09f5e1706e74312d
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoadded changelog for linguist
Oswald Buddenhagen [Tue, 18 Dec 2012 15:26:23 +0000 (16:26 +0100)]
added changelog for linguist

Change-Id: Id4920837017de1496fa1a72581a3453e32dc93a2
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoANGLE: Fix typedefs for Win64
Jonathan Liu [Mon, 17 Dec 2012 13:37:11 +0000 (00:37 +1100)]
ANGLE: Fix typedefs for Win64

The long int type is incorrect for Windows 64-bit as LLP64 is used

Change-Id: If4ccf49d6bb0cd7ba4ff2997cebfdbe5e7e9711c
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoFix font sizes when X11 has a forced dpi setting v5.0.0
Lars Knoll [Tue, 18 Dec 2012 13:05:45 +0000 (14:05 +0100)]
Fix font sizes when X11 has a forced dpi setting

On X11, the X resource system can override the physical DPI of
the screen for resolving font sizes etc. Correctly load the
setting and adjust the logicalDpi() accordingly.

Change-Id: Id60d03d1d214fb99e9de17a65976abd170bb7cca
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>