profile/ivi/qtbase.git
12 years agoFix tests of QMimeDatabase.
Friedemann Kleint [Fri, 24 Feb 2012 13:18:08 +0000 (14:18 +0100)]
Fix tests of QMimeDatabase.

- Use temporary directories to avoid instabilities
  due to remains of previous failed tests and locked
  directories.
- Replace SRCDIR by QFINDTESTDATA(), reference only
  the freedesktop.org.xml contained in the Qt source
  tree by $$QT.corelib.sources.
- Improve some error messages, test suite instructions
  for Windows.

Change-Id: Idee8e3767ef0a8299df3bdaaac20334164878db0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: David Faure <faure@kde.org>
12 years agoQPlatformTheme: Add virtual destructor.
Morten Johan Sorvig [Wed, 29 Feb 2012 13:20:11 +0000 (14:20 +0100)]
QPlatformTheme: Add virtual destructor.

Change-Id: I78aab57cc16ef4542bfb88c81dd6a9d8b4c4d853
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoSkip test tst_QTextScriptEngine::thaiWithZWJ on Windows.
Friedemann Kleint [Wed, 29 Feb 2012 07:31:41 +0000 (08:31 +0100)]
Skip test tst_QTextScriptEngine::thaiWithZWJ on Windows.

Change-Id: I9286ae8b1200b2d6638d1257a872450a9886fce0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoFix build of QImageReader tests with QT_USE_QSTRINGBUILDER.
Stephen Kelly [Wed, 29 Feb 2012 11:50:23 +0000 (12:50 +0100)]
Fix build of QImageReader tests with QT_USE_QSTRINGBUILDER.

Change-Id: I789d99d0741bc178d2d7fd82558edc684eb6daf8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoFix build of QWizard tests with QT_USE_QSTRINGBUILDER
Stephen Kelly [Wed, 29 Feb 2012 11:49:00 +0000 (12:49 +0100)]
Fix build of QWizard tests with QT_USE_QSTRINGBUILDER

Change-Id: Id276cdb9b84c61bf75a5bde149142f39f52f563e
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove Mac/QPA collision breaking library linkage
Donald Carr [Thu, 23 Feb 2012 21:07:42 +0000 (21:07 +0000)]
Remove Mac/QPA collision breaking library linkage

Prior to this change, explicitly passing -qpa to configure breaks compilation on Mac. This is due to a false dichotomy between MAC/QPA

Change-Id: I52cacf96ae8d8d203787f9bbade417f2c55ab3f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoAdded helpful notice in configure about how to enable the xcb plugin.
Samuel Rødal [Wed, 29 Feb 2012 07:34:57 +0000 (08:34 +0100)]
Added helpful notice in configure about how to enable the xcb plugin.

This should make it less confusing for people building Qt 5 on Linux.

Change-Id: I3aa7151f790587d5944c837d701b1b1b580b4bc3
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
12 years agoCleaned up examples/opengl/cube/cube.pro, removed message()
Rohan McGovern [Tue, 28 Feb 2012 06:07:07 +0000 (16:07 +1000)]
Cleaned up examples/opengl/cube/cube.pro, removed message()

It's arbitrary and confusing to put a message(OpenGL support is enabled)
in this one OpenGL example and no others, especially since the message
is output during configure.

Change-Id: I7b55868d10c288f3459a7fda594fea1e6f45bf9a
Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
12 years agoRemove unused selftest data file.
Jason McDonald [Tue, 28 Feb 2012 04:57:29 +0000 (14:57 +1000)]
Remove unused selftest data file.

The private git history shows that the test program associated with this
data file was missing from the original commit and was never
subsequently added.

Change-Id: I3401724ac04168158a48eb06436db83d3557711f
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoQHeaderView - remove sectionCount variable
Thorbjørn Lund Martsum [Mon, 27 Feb 2012 09:56:42 +0000 (10:56 +0100)]
QHeaderView - remove sectionCount variable

A previous patch ensures that we have exactly one section in a Span.
( see SHA : b800d8b94a7861ecf8853621f6556fca186fb5b7 )

Therefore we no longer need the sectionCount variable. We have
assess to it through the sectionSpan.count.  To keep this patch
quite simple the variable sectionCount has been changed to a
function returning the count value.

Change-Id: Ibc419eafa38ab64b08f93074cb6ae4b8518995f6
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoAdd support for QT_NO_SIGNALS_SLOTS_KEYWORDS
Stephen Kelly [Wed, 22 Feb 2012 15:36:52 +0000 (16:36 +0100)]
Add support for QT_NO_SIGNALS_SLOTS_KEYWORDS

QT_NO_KEYWORDS can be used for example to ensure that foreach can
not be used, but Q_FOREACH must be, that slots must not be used but
Q_SLOTS must be, etc.

Typically they are used to avoid symbol conflict with other
libraries that may use the same keywords (I think boost uses
signals).

For 3rd party libraries, it makes sense to use Q_SLOTS and Q_SIGNALS
instead of slots and signals, so that downstreams can still choose
to use QT_NO_KEYWORDS in their code.

The most convenient way to enforce that currently is to define
QT_NO_KEYWORDS when building the 3rd party library. However, that
has the inconvenient side effect of making foreach, forever and emit
not usable within the library implementation.

This patch makes it possible for the 3rd party library to use
QT_NO_SIGNALS_SLOTS_KEYWORDS to exclude signals and slots without
affecting whether the other keywords can be used in the library
implementation.

Change-Id: If1e16a4fa384bd3a2ddd737143499f8b587bc4f8
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoQRingBuffer: make constructor explicit
Marc Mutz [Tue, 28 Feb 2012 21:52:41 +0000 (22:52 +0100)]
QRingBuffer: make constructor explicit

This is a private class, but it's so close to
the classical Stack(int) example for explicit
that I just have to make this ctor explicit,
too:

   QRingBuffer rb = 0; // oops: meant '*rb'

now no longer compiles.

Change-Id: I7d58c1f08c1b14d14930426159c5c8db71b4cf4d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoActivate replacements when installing .pc files for win32
Hib Eris [Wed, 8 Feb 2012 12:52:01 +0000 (13:52 +0100)]
Activate replacements when installing .pc files for win32

Change-Id: Iaacbe8528bdbe1c1fca60ae8c94625e951f14554
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQPair: don't copy-initialise 'first'/'second' in the default ctor
Marc Mutz [Tue, 28 Feb 2012 21:09:48 +0000 (22:09 +0100)]
QPair: don't copy-initialise 'first'/'second' in the default ctor

Why would we want copy-initialisation if we can
have the default constructor?

Change-Id: Id2de36d42ef9f63793ff4e3ec36202d3f2bf5f30
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoDe-duplicate platform-dependent paths
Hib Eris [Wed, 8 Feb 2012 15:13:42 +0000 (16:13 +0100)]
De-duplicate platform-dependent paths

Change-Id: Ifee9f05fc8d924877f24edfddb0dc5e324a29080
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQPair: remove user-defined copy assignment operator
Marc Mutz [Tue, 28 Feb 2012 21:06:36 +0000 (22:06 +0100)]
QPair: remove user-defined copy assignment operator

The compiler-generated copy assignment operator is fine,
and the user-defined one prevents the compiler from
synthesising a move assignment operator.

Change-Id: I044104a2fd4d7522a910d5c2a68d11dabeca99c4
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoImplement missing replacements when installing .pc files for win32
Hib Eris [Wed, 8 Feb 2012 12:36:28 +0000 (13:36 +0100)]
Implement missing replacements when installing .pc files for win32

This implements replacements for win32 makefile generators similar
to the replacement functionality in unix makefile generators.

To enable Makefile code generation for replacements in win32 makefile
generators, you must set QMAKE_STREAM_EDITOR to e.g. sed.

When building for win32, sed is normally only available in the
mingw/msys build environment and when cross compiling on unix.
In these cases QMAKE_STREAM_EDITOR is set to sed in qmake.conf.

For other win32 build environments QMAKE_STREAM_EDITOR is not set
in qmake.conf and the replacements Makefile code is not generated.

Change-Id: Ie5de5d517eafaeaa2544f1e972aec3fe11d0a6f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agodon't abuse $$fromfile() for inspecting entire projects
Oswald Buddenhagen [Tue, 21 Feb 2012 20:50:29 +0000 (21:50 +0100)]
don't abuse $$fromfile() for inspecting entire projects

a project can rightfully expect a sane environment. $$fromfile() does
not necessarily provide that. so instead use include() with a target
namespace.

Change-Id: I8d6d30ab1b760d4930c9b4453bc92f8f8ad0b0ae
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agolook for mkspecs in the project root, not next to every project
Oswald Buddenhagen [Thu, 23 Feb 2012 16:16:03 +0000 (17:16 +0100)]
look for mkspecs in the project root, not next to every project

qmake would look for mkspecs/ in the directory containing the current
project file. this makes completely no sense with recursive projects:
a) nobody would make per-project specs and b) specs meant to be global
would not be found.

consequently, we look for a project root when starting qmake and use
only that directory.
if .qmake.cache is found/set, we assume that to be the project root.
otherwise, we search for mkspecs/ the same way we search for the cache -
just to up until we find one or hit the root. if we are shadow-building,
search the build dir as well.

Change-Id: Ie66b189a40c21203d956e681cbef44a89f98cd17
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agofactor out code to install default mkspec
Oswald Buddenhagen [Fri, 24 Feb 2012 19:32:08 +0000 (20:32 +0100)]
factor out code to install default mkspec

Change-Id: I15f371df7bc24cd85c1c0924d1929da4dc3db16d
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoAdd a new qmake feature to support OpenGL ES 1 apps
Jason Barron [Thu, 9 Feb 2012 08:51:24 +0000 (09:51 +0100)]
Add a new qmake feature to support OpenGL ES 1 apps

This is a convenience to make it easy for applications to simply add:
    CONFIG += opengles1
To their .pro file to link against OpenGL ES 1.1 instead of OpenGL ES V2

Change-Id: I48605f5f69f83d99cfb2ad6dbb4b318d41e00128
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoMake the CMake files work with directory overrides.
Stephen Kelly [Mon, 27 Feb 2012 15:45:27 +0000 (16:45 +0100)]
Make the CMake files work with directory overrides.

This allows us to create correct CMake config files when Qt is
configured with directories outside of the prefix (which Qt allows),
and also allows us to use correct values when a 'longer' relative
lib directory is used such as lib/x86_64-linux-gnu.

Change-Id: I6f88255a23752dc5b84cb20ce13fdeeee9d5ad51
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Alexander Neundorf <neundorf@kde.org>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoCompile SHA-2 code on systems without stdint.h
Bradley T. Hughes [Tue, 28 Feb 2012 08:25:20 +0000 (09:25 +0100)]
Compile SHA-2 code on systems without stdint.h

stdint.h is a C99-ism, which isn't available everywhere. The sha.h
header tells us we need 4 typedefs. Add these to qcryptographichash.cpp
before including sha.h and comment out the stdint.h include in sha.h.

Change-Id: I1ede9569fa7eaa84de3befeb3c58cc6a05aa522c
Reviewed-by: Oliver Wolff <oliver.wolff@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoSkip QLocale test on Windows, improve process handling.
Friedemann Kleint [Tue, 28 Feb 2012 11:35:48 +0000 (12:35 +0100)]
Skip QLocale test on Windows, improve process handling.

- Skip the failing windowsDefaultLocale() test.
- Improve the handling of the subprocess, locate
  the binary in initTestCase instead of repeatedly searching it.
- Make all applications console/non-app bundles.

Task-number: QTBUG-24543

Change-Id: I79dfaa3320cd5698f02e74a3fe53477d4a79d4fb
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoRename remaining references to QInputPanel
Pekka Vuorela [Thu, 23 Feb 2012 15:27:53 +0000 (17:27 +0200)]
Rename remaining references to QInputPanel

Change-Id: I747d37d10c78af6ad00322d5bd8d29c6b343828c
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoFix QLibrary autotest for Windows
Miikka Heikkinen [Tue, 28 Feb 2012 10:58:02 +0000 (12:58 +0200)]
Fix QLibrary autotest for Windows

The libraries were built into wrong directory in Windows. Fixed it so
that the libraries are built into debug and release directories like
the test executable.

Also fixed QMAKE_CLEAN statement, which was using incorrect separator.

Task-number: QTBUG-24151
Change-Id: Iade656af5f83ef2b79c2b9c4177df4a16b2f6821
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoInitial import of the Blackberry QPA plugin for Qt5
Sean Harmer [Thu, 19 Jan 2012 20:10:43 +0000 (20:10 +0000)]
Initial import of the Blackberry QPA plugin for Qt5

This is dependent upon the following Change Id's:

I5ebcffb7153f4216d69921d4818051e6b3d14d8a
Iec065f528f5edd848be580807a607488dc2e401f

Change-Id: I234e3c4272d7474d8f8e20fc4fea20d95c829cb5
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agosimplify loop over modules
Oswald Buddenhagen [Fri, 24 Feb 2012 18:20:00 +0000 (19:20 +0100)]
simplify loop over modules

the earlier done topological sort already removes duplicates and only
works with lower-cased names anyway, so we can remove the overhead here.

Change-Id: I44fc39af9e94662717e1c8cfb0ddb87d2f597935
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomoc: Only generate IndexOfMethod for signals.
Olivier Goffart [Sat, 25 Feb 2012 19:48:56 +0000 (20:48 +0100)]
moc: Only generate IndexOfMethod for signals.

moc is currently generating code to convert from a pointer to member
function of a slot or signal to its index.

The idea was that it could be usefull for slots to have the new syntax
do the same as the old one (connecting signal index to slot index). But
in practice, the new syntax do not use the IndexOfMethod for slots.

Also, it does not work for all the slots (no Q_PRIVATE_SLOT,
no static slots)

So since it is not used, and that it would take room in the binaries to
generate all the code to get the index of slots, we remove it.

If ever we need it, we can still add it later.

Change-Id: Ia417e3e524d7915ca86433ea86c66ac2b299c81a
Reviewed-by: Kent Hansen <kent.hansen@nokia.com>
12 years agoconfigure: fixed qconfig.h symlink warnings
Rohan McGovern [Tue, 28 Feb 2012 05:02:01 +0000 (15:02 +1000)]
configure: fixed qconfig.h symlink warnings

configure was unconditionally attempting to create two symlinks to
qconfig.h: include/Qt/qconfig.h, and include/QtCore/qconfig.h.

include/Qt doesn't exist any more, so this would always cause a
"No such file or directory" warning.  Remove that one.

include/QtCore/qconfig.h is usually created by syncqt now, so this would
cause a "File exists" warning.  Make that one conditional.

Change-Id: I8c6244dcbcf9765444f0d5c40c91a0ca192ecbcb
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoQDomNode: don't needlessly call virtual functions
Marc Mutz [Mon, 27 Feb 2012 23:11:28 +0000 (00:11 +0100)]
QDomNode: don't needlessly call virtual functions

Commit 4dabe78387d10495f9f6d0a7395f2ba3c80432bd changed
these functions from virtuals to inlines that check the
return value of the remaining virtual function nodeType().

However, two of the functions call nodeType() more than
once, which we know will return the same result each time,
but requires a compiler with interprocedural optimization
capabilities to figure out by itself.

So instead of repeatedly calling nodeType(), call it once
and store its return value in a temporary, and use the
temp for further comparisions.

Change-Id: Idbeafb7fd93d275d475218c6df2ad7fdc9162cc5
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoRemove stale QWS considerations from configure
Donald Carr [Thu, 23 Feb 2012 19:33:48 +0000 (19:33 +0000)]
Remove stale QWS considerations from configure

Remove all reference to QWS/EMBEDDED in configure script

Remove legacy qws config tests

Change-Id: I09ed3d82bdda0fd0f9da87634d0cd1b7457a782b
Reviewed-by: Donald Carr <donald.carr@nokia.com>
Reviewed-by: Johannes Zellner <johannes.zellner@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoresolve relative spec paths already on the command line
Oswald Buddenhagen [Fri, 24 Feb 2012 11:11:51 +0000 (12:11 +0100)]
resolve relative spec paths already on the command line

this is way more predictable than resolving it later.

Change-Id: I0ce27977b795bde9235e1d51d6f2d0d917f2398c
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomove .qmake.cache search to Option
Oswald Buddenhagen [Thu, 23 Feb 2012 16:05:28 +0000 (17:05 +0100)]
move .qmake.cache search to Option

this is a one-time operation which depends only on the invocation, so
this new home is much more appropriate.

Change-Id: I11ef30a8227afed06e58e64e65809dba25e81567
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agodon't look for features in PrefixPath
Oswald Buddenhagen [Wed, 22 Feb 2012 18:33:53 +0000 (19:33 +0100)]
don't look for features in PrefixPath

it's generally redundant with DataPath which we already look into.
this is consistent with where mkspecs are looked for.
i don't think anyone will notice this "loss" ...

Change-Id: Iab7c35cc22ba53e1005f26b5d85d41cf4dafad07
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoscope context saving more minimally
Oswald Buddenhagen [Fri, 3 Feb 2012 17:28:54 +0000 (18:28 +0100)]
scope context saving more minimally

no point in saving the context when we are not actually modifying the
current context.

Change-Id: Id6f51a163e86bdf402aa0713737b655db68e7ee8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
12 years agoFix QSettings autotest fails under Windows
Debao Zhang [Sat, 25 Feb 2012 02:11:16 +0000 (18:11 -0800)]
Fix QSettings autotest fails under Windows

The Windows registry and INI files use case-insensitive key.

This is a side effect of 1d01bc1e83560cb2fc4f9f7f00762ffa5134448a

Task-number: QTBUG-24145
Change-Id: I862bddae68ef27569e6ffa901f98ca107d3f300b
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoQComboBox: Use platform theme hint to determine popup geometry.
Friedemann Kleint [Mon, 27 Feb 2012 16:09:43 +0000 (17:09 +0100)]
QComboBox: Use platform theme hint to determine popup geometry.

Change-Id: I1f81be1394455715c5dfcd2d426758c4c7cd91fc
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoQSqlTableModel: unify code for cache-clearing before select
Mark Brand [Tue, 14 Feb 2012 21:26:43 +0000 (22:26 +0100)]
QSqlTableModel: unify code for cache-clearing before select

The code in submitAll() had the same goal as the code in select,
so it has been unified. The new code in select() avoids sending lots
of dataChanged() signals for rows that are going to be removed
by QSqlQueryModel anyway.

Change-Id: Ic22e038223720185e47ed0cc573147745ecc8fc9
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agoconfigure: fixed stray output from endian.test when not verbose
Rohan McGovern [Tue, 28 Feb 2012 05:16:09 +0000 (15:16 +1000)]
configure: fixed stray output from endian.test when not verbose

The output of building and running config.tests are generally silent
unless -verbose is passed to configure.

However, there was one place in endian.test where a check for $VERBOSE
was missed, leading to confusing output like:

    Creating qmake. Please wait...
    rm -f endiantest.o
    rm -f *~ core *.core
    rm -f endiantest
    rm -f Makefile
    rm -f endiantest.o
    rm -f *~ core *.core
    rm -f endiantest
    rm -f Makefile

Change-Id: Idabe85f2b188ed9da713392d116d4d2853be2189
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoQSqlTableModel::isDirty(): simplify and improve logic
Mark Brand [Wed, 15 Feb 2012 14:02:05 +0000 (15:02 +0100)]
QSqlTableModel::isDirty(): simplify and improve logic

Change-Id: Ic1332befa9078a94f872e38ff779e5b4cec7c100
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agorestore previously non-working disabled test
Mark Brand [Thu, 16 Feb 2012 12:25:41 +0000 (13:25 +0100)]
restore previously non-working disabled test

Change-Id: I419863a681f7be96cb855a274c68eaea25efebcb
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
12 years agotestlib: Improve the silent logging mode
Jason McDonald [Mon, 27 Feb 2012 06:31:03 +0000 (16:31 +1000)]
testlib: Improve the silent logging mode

Previously the silent logging mode suppressed passes, skips and internal
testlib info messages, but did not suppress debugging output, making it
hard to see the fails in a noisy test.  This commit changes silent mode
so that it suppresses all output except test failures and fatal errors,
making silent mode truly useful for seeing just the important test
output.

This commit also adds a selftest to verify the behaviour of silent mode.

Change-Id: I75420aead03682306210746a87e2a3b608b58fc6
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agotestlib: Remove commented-out code from plain text logger.
Jason McDonald [Mon, 27 Feb 2012 04:01:47 +0000 (14:01 +1000)]
testlib: Remove commented-out code from plain text logger.

Change-Id: Ica2e294d1f08cac4697d037dbc2803012e0ba58a
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
12 years agoMake accessible interfaces private for Qt 5.0
Jan-Arve Saether [Thu, 23 Feb 2012 22:09:06 +0000 (23:09 +0100)]
Make accessible interfaces private for Qt 5.0

Since we're not yet confident if they serve their purpose well enough,
we have decided to make them internal so that we are free to tune them
later

Change-Id: Id79d154e0537aca07303afea5d057cfcb0773384
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoFix divide by zero when glyphWidth is 0
Jiang Jiang [Mon, 27 Feb 2012 08:51:46 +0000 (09:51 +0100)]
Fix divide by zero when glyphWidth is 0

Change-Id: Ic0108b76b8d73cc977f8d64e036a65cb93db4684
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com>
12 years agoPrevent stack corruption when using OpenGL Core Profile
Sean Harmer [Sat, 18 Feb 2012 20:05:53 +0000 (20:05 +0000)]
Prevent stack corruption when using OpenGL Core Profile

When an OpenGL Core Profile context is requested the function
glGetStringi() is used to query the supported extensions as
glGetString(GL_EXTENSIONS) has been removed in the core profile.

The signature for glGetStringi used in Qt missed off the APIENTRY calling
convention. This results in stack corruption on windows each time
glGetStringi() is called leading to a crash.

Change-Id: Iff62c42e2bb5fc4a5c0561fae97ddc5a8ae3a45e
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agodirectfb: Switch to the new style plugins
Holger Hans Peter Freyther [Sat, 25 Feb 2012 11:12:09 +0000 (12:12 +0100)]
directfb: Switch to the new style plugins

The plugin might advertize more keys than supported at runtime. E.g.
the directfbegl key might not be available. I would like to have a
directfb.json.in and then generate the right file or if moc would
pre-process the file...

Change-Id: Ia8ad4e1367c06f5e35d02822d4f830ce1e9dc577
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
12 years agoAdd SHA-224, SHA-256, SHA-384, and SHA-512 support to QCryptographicHash
Bradley T. Hughes [Fri, 3 Feb 2012 11:28:13 +0000 (12:28 +0100)]
Add SHA-224, SHA-256, SHA-384, and SHA-512 support to QCryptographicHash

This adds Sha224, Sha256, Sha384, and Sha512 enum values to
QCryptographicHash::Algorithm. The implementation comes from RFC 6234,
http://tools.ietf.org/html/rfc6234, which is added to
src/3rdparty/rfc6234. Only the headers and SHA-2 code is included in
src/3rdparty/rfc6234 (the SHA1, HMAC, and HKDF code is not included).

Change-Id: I85139fd118291f15efc22899a5ddd1cc83810cfb
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoRemove use of deprecated conversion from QKeySequence
Olivier Goffart [Sun, 26 Feb 2012 09:56:49 +0000 (10:56 +0100)]
Remove use of deprecated conversion from QKeySequence

Note: UNICODE_ACCEL is Qt3 compatibility and is equal to 0

Change-Id: I808a66772abceb3822d515d69386728264eb1b40
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQHeaderView - minor cleanup in viewportEvent
Thorbjørn Lund Martsum [Thu, 23 Feb 2012 07:24:21 +0000 (08:24 +0100)]
QHeaderView - minor cleanup in viewportEvent

This is an improvement to a previous fix with
SHA e62e71162606fec134600955a89b7e0c34a7840b

We actually never want to call resizeSections if the parent is hidden.
Therefore we can both simplify and improve the code with this patch.

When we do show/hide on parent then the visible status is updated
before we get into this code. I have verified the patch on the code
from:

Task-number: QTBUG-14234

Change-Id: If7bfa3b3813c97b4a545e48423526e9cfe118de4
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoDetect QMetaType::QReal from the definition of qreal
Olivier Goffart [Mon, 27 Feb 2012 11:00:07 +0000 (12:00 +0100)]
Detect QMetaType::QReal from the definition of qreal

Instead of relying to complex preprocessor expression that need to be
maintained to be kept the same as in qglobal.h

This aslo fix the case where QT_COORD_TYPE is defined (It is meant to be
defined to float or double, any other type would not make sense)

So now there should hopefully be only one place to change if one need to
adjust the type of qreal

Change-Id: I778312112603173562dbe675ab491b53d6cd2174
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoFix submenu positioning
Miikka Heikkinen [Mon, 27 Feb 2012 11:54:21 +0000 (13:54 +0200)]
Fix submenu positioning

Submenus are now positioned to the correct side of the parent menu
based on layout direction, if there is enough space on screen to fit
the menu. If there is insufficient space, then the menu is positioned
to the other side of the parent menu. In case that also causes submenu
to be partially ofscreen (very wide menu relative to the screen),
then the submenu will be aligned with the screen edge and will overlap
the parent menu. This seems like a lesser evil compared to having
submenu partially offscreen, which could obscure important details
such as checkmarks.

Task-number: QTBUG-23568
Change-Id: I6a9ab2c232713a2ee5a6dde3227c40419d46bd3d
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoMake configure.exe only detect each compiler once
Bradley T. Hughes [Mon, 27 Feb 2012 10:21:10 +0000 (11:21 +0100)]
Make configure.exe only detect each compiler once

After commit e0acf6504356f14a6352b16ffed7b59453914863, configure.exe
built with the x64 compiler could detect the same compiler twice,
breaking the -platform detection even when only one compiler is in the
path. Fix this by taking advantage of the CompilerInfo struct ordering
and ignore detection of the same compiler.

Change-Id: I583230520d2e0859196f9d7c8af31adbb981a6ca
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoremove useless init() function
Oswald Buddenhagen [Thu, 23 Feb 2012 14:26:56 +0000 (15:26 +0100)]
remove useless init() function

it did the same cleanup() did, and they are always called consecutively
anyway (except at start and end where it does not matter).

Change-Id: I4c82024d19d6c670f1f4037d43147a15680614ae
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomove resetEnvironment() call to cleanup()
Oswald Buddenhagen [Thu, 23 Feb 2012 14:39:23 +0000 (15:39 +0100)]
move resetEnvironment() call to cleanup()

we want to call it even if the test fails

Change-Id: Ie8f3f9d2df5d52990d6b9f9a632e49826278175a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agomake qmake test suite a tad more verbose on failure
Oswald Buddenhagen [Thu, 23 Feb 2012 14:38:30 +0000 (15:38 +0100)]
make qmake test suite a tad more verbose on failure

automatically dump the collected output on non-expected return code

Change-Id: Ifda7287869f329c5a6714e6f21aa9c3991e9ee4e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoTestCompiler: split commands from arguments
Oswald Buddenhagen [Thu, 23 Feb 2012 14:35:04 +0000 (15:35 +0100)]
TestCompiler: split commands from arguments

this allows us to temporarily set some extra args without (incorrectly)
instantiating a second TestCompiler (and on the way relying on $PATH for
finding qmake).

Change-Id: Icce5bf7314148ddbe705606f77a26e3362b31f67
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agodon't rely on $PATH for finding rcc
Oswald Buddenhagen [Thu, 23 Feb 2012 13:46:08 +0000 (14:46 +0100)]
don't rely on $PATH for finding rcc

Change-Id: I7e6ffad6d84cca0b548920b3e620375fb5e314e9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoremove over-uses of $$list()
Oswald Buddenhagen [Tue, 21 Feb 2012 20:41:28 +0000 (21:41 +0100)]
remove over-uses of $$list()

not sure why anyone would do *that* ...

Change-Id: Id91e9e8bd602a9d9275ade2ca86aaa4f4698ff72
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoavoid using infile() needlessly
Oswald Buddenhagen [Tue, 21 Feb 2012 20:30:57 +0000 (21:30 +0100)]
avoid using infile() needlessly

it's rather pointless to first query the variable's presence in the
file. instead, just fetch it and see what is in there.

for this to work cleanly we defer the concatenation of the filename.

Change-Id: I322db8ae897272fae049074d8b7676787286aedd
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix tst_qmenu.
Debao Zhang [Fri, 24 Feb 2012 21:46:33 +0000 (13:46 -0800)]
Fix tst_qmenu.

Clear away Q_WS_WIN/Q_WS_X11 from QMenu. Using the hint returned by the
QPlatformTheme.

Task-number: QTBUG-24325
Change-Id: Iaa4da26c74273d7cfc1fbec6519c52d09e10f7bb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoQClipboard: Fix autotest fails
Debao Zhang [Fri, 24 Feb 2012 18:51:18 +0000 (10:51 -0800)]
QClipboard: Fix autotest fails

tst_qclipboard.cpp still has Q_WS_WIN which must be clear away. After
clean up, auto test will fail under windows: When setMimeData() is
called, dataChanged() signal will be emited twice.

The solution for QTBUG-24184 has partially solved the problem, but it
still there. Make sure emitChanged() only called by QPlatformClipboard
will give our more control for this.

Task-number: QTBUG-24484
Change-Id: I23566c6d3b32828b6865234c311af3635fe9e299
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
12 years agodon't generate bogus TARGETs
Oswald Buddenhagen [Fri, 24 Feb 2012 08:10:52 +0000 (09:10 +0100)]
don't generate bogus TARGETs

Change-Id: Ia99cd8862157e5630506d02b3c7e9b35d4bc3302
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agobump version of QMAKE_TARGET_PRODUCT
Oswald Buddenhagen [Fri, 24 Feb 2012 18:08:13 +0000 (19:08 +0100)]
bump version of QMAKE_TARGET_PRODUCT

... whatever that may be good for

Change-Id: I06695a06aae52386236a7a31fe7865cc8389d3b9
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoFix QThreadstorage test.
Friedemann Kleint [Mon, 27 Feb 2012 10:09:27 +0000 (11:09 +0100)]
Fix QThreadstorage test.

- Create subdirectories containing profiles to avoid
  problems with -fast.
- Use QFINDTESTDATA to locate binary.
- Make it a console application, no Mac-bundle.
- Add error messages to the test, give it a longer time-out
  and ensure sub-process is killed if it hangs.

Change-Id: Ibc177b786c4bc8fdbc068a8c45f4801a41c9f660
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
12 years agoFix icon loading in style sheets.
Friedemann Kleint [Mon, 27 Feb 2012 11:38:04 +0000 (12:38 +0100)]
Fix icon loading in style sheets.

QIcon was moved to QtWidgets, while the parser is still in QtGui.
Introduce a QCss::IconValue struct that contains the icon data
and convert to QIcon in widgets.

Change-Id: I09ac8a12a4b02bdca91ee2e8fcc28c86b5a001e7
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
12 years agoQtTest: add missing \since 5.0 to the new macros
David Faure [Fri, 24 Feb 2012 14:17:23 +0000 (15:17 +0100)]
QtTest: add missing \since 5.0 to the new macros

Change-Id: I8f7060c41df1e0bf1a8c35930400a31a4239a3d6
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoFix inconsistent auto test executable names
David Faure [Sun, 26 Feb 2012 09:51:52 +0000 (10:51 +0100)]
Fix inconsistent auto test executable names

Change-Id: I3b6b5b37e32be25d1b9933395c43f6d5aa5b8810
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoQRegExp: fix crash
Giuseppe D'Angelo [Sun, 26 Feb 2012 01:45:53 +0000 (01:45 +0000)]
QRegExp: fix crash

Fixes a crash when invoking various QRegExp methods on an object
*before* doing any match. For instance fixes:
  QRegExp re;
  re.matchedLength(); // crash

Task-number: QTBUG-23352
Change-Id: I9c239ff790a139c7820ef1aeced89d31320ae6b0
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoremove library version matching from qt.conf
Oswald Buddenhagen [Fri, 24 Feb 2012 21:12:18 +0000 (22:12 +0100)]
remove library version matching from qt.conf

this feature was introduced in feb 2005 by Sam with this comment:
> I have implemented a versioning into the keys and do environment
> expansion there as well, these aren't immediately usefull but Marius
> and I agreed that distributors will probably want such features at
> times. The versioning fallbacks will be usefull to us over time no
> doubt.

imo the versioning is a contestant for the most useless feature ever:
- (linux) distributors couldn't care less - they simply configure qtcore
  correctly. additionally, the packaging policies state that no config
  files should live in the binary dir at all, so no qt.conf for them.
- ISVs don't care, because they ship their software with a particular qt
  version anyway.
- SDK distributors don't care, because it doesn't solve any real problem
  for them: a) they will isolate the (qmake) versions and b) a
  distinction based on version number (as opposed to build
  configuration) is utterly useless in the first place.

i left in the variable expansion, as it could at least theoretically be
useful for creating relocatable packages. debatable - the file it easy
enough to modify at installation time.

Change-Id: Ida8a50b16d55d8d8613d1a98a51df56753f6a6e3
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoUse new plugin system in qtbase.
Friedemann Kleint [Thu, 23 Feb 2012 11:26:10 +0000 (12:26 +0100)]
Use new plugin system in qtbase.

- AccessibleWidgets
- Windows printer support
- Examples

Change-Id: Icc162bd7fc284b3c76d9966210f983728085c743
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoSimplify QMetaTypeSwitcher.
Jędrzej Nowacki [Fri, 24 Feb 2012 13:27:01 +0000 (14:27 +0100)]
Simplify QMetaTypeSwitcher.

We do not need to distinguish between different types in the switcher.

Before this patch it was not possible to overload
DelegateObject::delegate with a pointer type. Now it is fixed.

Change-Id: Icd73a53e73e5e66b1b6f6407ba4e0f79e584d930
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoOptimize space for the QEventLoopQuitLocker.
Stephen Kelly [Thu, 23 Feb 2012 11:59:21 +0000 (12:59 +0100)]
Optimize space for the QEventLoopQuitLocker.

Use a union and a type enum instead of three pointers.

Change-Id: I02b11733a4f2e95099064fa9325497d4e04ac615
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoReduce QtCore lib binary size by around ~3KB, by removing template code
Jędrzej Nowacki [Fri, 10 Feb 2012 08:14:41 +0000 (09:14 +0100)]
Reduce QtCore lib binary size by around ~3KB, by removing template code

Reusing a template is much better then creating a new one, even if it
should inline the same code.

For some reason replacing T* by void* force gcc to remove a few bytes
per template instantiation too, it is not really significant, but it
alows us to simplify the code.

Benchmarks don't show any regressions.

Change-Id: I4fdf1e4dc311b23021eb5758605602937d05b183
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoFix selftests while using QStringBuilder
Olivier Goffart [Sat, 25 Feb 2012 16:54:00 +0000 (17:54 +0100)]
Fix selftests while using QStringBuilder

Change-Id: I6dcd830b96023765447c9683fd95209d4312fb1b
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoRemove deprecated usage of QKeySequence from qguivariant
Olivier Goffart [Sat, 25 Feb 2012 10:42:57 +0000 (11:42 +0100)]
Remove deprecated usage of QKeySequence from qguivariant

The implicit conversion operators are deprecated.

Change-Id: I0e94c0671413da1ab58c6c7b8bb31614e2696409
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
12 years agoRemove usage of deprecated QAbstractItemModel::setRoleNames
Olivier Goffart [Sat, 25 Feb 2012 20:27:03 +0000 (21:27 +0100)]
Remove usage of deprecated QAbstractItemModel::setRoleNames

Change-Id: If41bf0d6d50969156269c67a15e006d38edc8e1f
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoDon't use deprecated QAbstractItemModel::reset()
Olivier Goffart [Sun, 26 Feb 2012 09:54:07 +0000 (10:54 +0100)]
Don't use deprecated QAbstractItemModel::reset()

Change-Id: Idf9971668a372a12ba319d954c35e157d8a08bd1
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
12 years agoCleanup usage of QVariant::Type.
Jędrzej Nowacki [Fri, 10 Feb 2012 11:21:25 +0000 (12:21 +0100)]
Cleanup usage of QVariant::Type.

QVariant::Type is marked as obsolete. It is not possible to get rid of
it completely, in a source compatible way, but at least we can remove it
safely from a method arguments list.

Change-Id: I26b58099bfa6d32f3a583a8ae0047f0bb36bcd0d
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoRemove more support for unsupported GCC versions.
Stephen Kelly [Wed, 22 Feb 2012 13:49:13 +0000 (14:49 +0100)]
Remove more support for unsupported GCC versions.

Change-Id: I827c9f982a7d7d20913b99c8fdaf98437a0a73db
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoSkip unstable qlineedit autotest on Ubuntu 11.10.
Toby Tomkins [Mon, 27 Feb 2012 03:26:56 +0000 (13:26 +1000)]
Skip unstable qlineedit autotest on Ubuntu 11.10.

Task-number: QTBUG-24518

Change-Id: Ia271a820613c1f8a885779eddd20e261716afc6d
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoqfiledialog2: Skip test that is passing on CI and failing otherwise.
Toby Tomkins [Fri, 24 Feb 2012 07:16:32 +0000 (17:16 +1000)]
qfiledialog2: Skip test that is passing on CI and failing otherwise.

Task-number: QTBUG-23602

Change-Id: Id5dfb85956048c60849d865161212b0764e8f250
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
12 years agoChanged qnetworkreply unittest to return correct code
Kurt Korbatits [Tue, 21 Feb 2012 03:54:11 +0000 (13:54 +1000)]
Changed qnetworkreply unittest to return correct code

- Changed waitForFinished() to return correct return code

Change-Id: Ic6b0dfa195254783a2106011c4a108d907d73557
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
12 years agoQFlags<>: let the compiler generate copy ctor/op=
Marc Mutz [Fri, 24 Feb 2012 16:33:25 +0000 (17:33 +0100)]
QFlags<>: let the compiler generate copy ctor/op=

The user-defined copy constructor and
copy-assignment operators were 100% equivalent
to the ones the compiler would generate, so
let the compiler generate them (so we reap
move constructors, too, even though they're
not needed on this class).

Change-Id: Iecdd579fa5a819d083ec9b2f25734ddba85515e6
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoremove fallback re-initialization of TARGET after parsing project
Oswald Buddenhagen [Thu, 2 Feb 2012 17:11:16 +0000 (18:11 +0100)]
remove fallback re-initialization of TARGET after parsing project

we already initialize it before parsing a project. if a project is daft
enough to clear TARGET, it does not deserve differently than breaking.

Change-Id: I6c727bc27d72a00e84b676ae3c169024bdb2d929
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
12 years agoRemoveRef should not remove the const
Olivier Goffart [Sat, 25 Feb 2012 09:39:34 +0000 (10:39 +0100)]
RemoveRef should not remove the const

This does not fix anything, because AreArgumentsCompatible already
do all the type checks.
But it make RemoveRef consistant with std::remove_reference

Change-Id: Ic42c872356172d7f5ea10de050254b5d10e50a6e
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQFixed: make constexpr
Marc Mutz [Wed, 22 Feb 2012 14:27:40 +0000 (15:27 +0100)]
QFixed: make constexpr

Make most QFixed{,Size,Point} members constexpr.
See f3141c58badbd2da9eb42021e9704742c3e52a9b for rationale.

Change-Id: I0b44f59bb768e1f79c57e1c9a0dc67afb515e03f
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoQFixed{,Size}: reformulate some functions in a constexpr-friendly way
Marc Mutz [Wed, 22 Feb 2012 14:18:27 +0000 (15:18 +0100)]
QFixed{,Size}: reformulate some functions in a constexpr-friendly way

The main change is the addition of a new constructor
that passes its argument into 'val' verbatim. In order
to disambiguate it from the existing QFixed(int)
constructor, it takes a second 'int' argument. This
is too ugly for public API, so it's private, and only
used by static QFixed fromFixed(int), which is the
existing named constructor with the same semantics.

The rest of the changes simply reformulate their
operations in terms of fromFixed().

This makes them ready to be constexpr'ed.

Change-Id: I2a3813d62bd4124064755de6b00526a60fc82c1d
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agouic: remove unused QRegExp #includes
Giuseppe D'Angelo [Sun, 26 Feb 2012 03:11:19 +0000 (03:11 +0000)]
uic: remove unused QRegExp #includes

QRegExp is not used, so they're unnecessary.

Change-Id: I3480bcbe013a0bf15e2ee4fa30862fe035820eea
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoQPrinterInfo: remove unused variable
Marc Mutz [Tue, 21 Feb 2012 12:41:53 +0000 (13:41 +0100)]
QPrinterInfo: remove unused variable

Change-Id: I1a3db07e7fe25066a6b13ca41854566ccb1298df
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
12 years agoRemove usage of deprecated QRect::unite
Olivier Goffart [Sun, 26 Feb 2012 10:00:44 +0000 (11:00 +0100)]
Remove usage of deprecated QRect::unite

Change-Id: I1920da995fde6ff2a8b2e3facddeee6e3c17b44c
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
12 years agoFix doc according to current method signature
ABBAPOH [Sun, 26 Feb 2012 07:48:53 +0000 (11:48 +0400)]
Fix doc according to current method signature

Change-Id: I23d0f7a88f4c092c1e7cd2742fdf6e6f68ad485a
Reviewed-by: David Faure <faure@kde.org>
12 years agoFix compilation of examples with QStringBuilder
Olivier Goffart [Sat, 25 Feb 2012 18:23:06 +0000 (19:23 +0100)]
Fix compilation of examples with QStringBuilder

In sub-attack an interview, one can't make two implicit conversions at
once, so explicitly convert to the right type.

The change in the torrent example is required because of
https://codereview.qt-project.org/16168 (commit 9491272)
But in that case, using a QByteArray is better anyway.

Change-Id: Ieed22ac7f0d700d5ba5d1e70af3db4dd6c139c8f
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
12 years agoQSslError: fix wrong #endif placement
Marc Mutz [Fri, 24 Feb 2012 18:19:32 +0000 (19:19 +0100)]
QSslError: fix wrong #endif placement

This would break a namespaced Qt when QT_NO_DEBUG_STREAM
was in effect. Unlikely to hit, but nevertheless fixworthy.

Change-Id: Ie2a4cf4334a6a610c84233ab1ca89b928386c91a
Reviewed-by: Richard J. Moore <rich@kde.org>
12 years agoFix MinGW configure bootstrap
Jonathan Liu [Fri, 24 Feb 2012 11:36:59 +0000 (22:36 +1100)]
Fix MinGW configure bootstrap

Makefile.mingw was using the test command which requires sh.exe. This
adds support for bootstrap using cmd.exe instead.

Change-Id: Ieb67843170d2745ce119cc8feaa5433aa82fd7d7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoprocess variable assignments with tabs as well
Oswald Buddenhagen [Sat, 25 Feb 2012 12:48:49 +0000 (13:48 +0100)]
process variable assignments with tabs as well

Change-Id: If3caa4094aa9d8caefc9829bfea44426d59477d1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
12 years agoconfigure - fix detection of MSVC compiler in x64
Shane Kearns [Fri, 24 Feb 2012 14:56:44 +0000 (14:56 +0000)]
configure - fix detection of MSVC compiler in x64

x86 processes get redirected to the 32 bit area of the registry,
while 64 bit processes access the registry in raw form.
Added the registry paths for 64 bit processes to see the 32 bit
registry keys for MS visual studio. (Wow6432Node)

This problem was revealed when we stopped including configure.exe
as a binary checkin to git. Running configure in an x64 compiler
environment results in creating an x64 configure.exe

Change-Id: I5e3e51ddbf20ccc65abf1833bf23ee5670bd973e
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
12 years agoFix a crash in QSystemLocalePrivate::uiLanguages().
Friedemann Kleint [Fri, 24 Feb 2012 14:18:15 +0000 (15:18 +0100)]
Fix a crash in QSystemLocalePrivate::uiLanguages().

Use the correct calling convention. Discovered by the mimetype
test in Qt 5.

Change-Id: I79b97325dd69466885a64c238935107bf14e9a0d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
(cherry picked from commit bc6e35d94325f4b18caec7ce0824c5beab95cdd7)
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
12 years agoFix compilation without QT_DEPRECATED_SINCE
Olivier Goffart [Sat, 25 Feb 2012 10:07:52 +0000 (11:07 +0100)]
Fix compilation without QT_DEPRECATED_SINCE

QAbstractItemModel::reset() is deprecated

Change-Id: I2d9aa9fade1660df14945ca11123341fce504050
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>