5 years agoAdd support for using AnimatedTiles as a standalone widget.
Ian Dean [Mon, 13 May 2013 08:28:34 +0000 (10:28 +0200)]
Add support for using AnimatedTiles as a standalone widget.

5 years agoUpdate configure scripts.
Ian Dean [Mon, 13 May 2013 08:12:18 +0000 (10:12 +0200)]
Update configure scripts.

5 years agoRemove FFMpeg and ImageMagick detection for iOS.
Ian Dean [Mon, 13 May 2013 08:02:04 +0000 (10:02 +0200)]
Remove FFMpeg and ImageMagick detection for iOS.

5 years agoFix support for building Qt as dynamic libraries.
Ian Dean [Mon, 13 May 2013 07:59:24 +0000 (09:59 +0200)]
Fix support for building Qt as dynamic libraries.

5 years agoFix error message text.
Ian Dean [Mon, 13 May 2013 07:58:40 +0000 (09:58 +0200)]
Fix error message text.

5 years agoAdd support for building Pixman NEON codepaths with Clang compiler.
Ian Dean [Mon, 13 May 2013 07:56:45 +0000 (09:56 +0200)]
Add support for building Pixman NEON codepaths with Clang compiler.

5 years agoAdd support for latest Xcode and iOS SDK versions
Ian Dean [Mon, 13 May 2013 07:51:42 +0000 (09:51 +0200)]
Add support for latest Xcode and iOS SDK versions

5 years agoMerge git://gitorious.org/qt/qt into 4.8
Ian Dean [Fri, 22 Feb 2013 11:01:25 +0000 (13:01 +0200)]
Merge git://gitorious.org/qt/qt into 4.8

5 years agoFix multiselection by CTRL-click in QFileDialog/KDE.
Friedemann Kleint [Fri, 15 Feb 2013 10:28:28 +0000 (11:28 +0100)]
Fix multiselection by CTRL-click in QFileDialog/KDE.

Task-number: QTBUG-29257

Change-Id: Idfac80e855455a4537dd38a23136762cd9398e15
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com>
(cherry picked from qtbase/b6ccdfa4823d4608f5cb94797b48fc82b8833581)

5 years agoFix path separators in archives created by QZipWriter
Pavel Mogilevskiy [Sat, 9 Feb 2013 11:56:58 +0000 (13:56 +0200)]
Fix path separators in archives created by QZipWriter

It was not possible to extract data from the archive on OSX
which was created on the Windows platform because of wrong
separators. Archive was created on Windows via QZipWriter and
opened on OSX with QZipReader. It consisted of a lots directories
and subdirectories with files. The solution is to use '/' separator
for internal representation.

Cherry picked from qtbase eff6dbb306956f099374e5a0c5942b9e91a81e71

Change-Id: I2180282d235dc998309fc4f7b67f5c0181b78dda
Reviewed-by: Vasiliy Sorokin <sorokin.vasiliy@gmail.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoFix text issue with Hiragana characters when stylesheet is applied.
Mitch Curtis [Fri, 1 Feb 2013 11:41:39 +0000 (12:41 +0100)]
Fix text issue with Hiragana characters when stylesheet is applied.

When typing into a QTextEdit or QLineEdit with a Japanese IME on
Windows, some characters have both a black foreground and background
and hence cannot be seen. This patch fixes the issue by setting the
appropriate colors for the text in these scenarios.

The change also fixes a similar situation with QSyntaxHighlighter and
Hiragana, where the background and foreground colors were the same.
Now it will use underlining to highlight the text (like WordPad does,
for example).

Task-number: QTBUG-29442
Change-Id: I364d327a8f6573a73b227b79cc5f570cd02611c9
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Titta Heikkala <titta.heikkala@digia.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
5 years agoTake fontconfig font width into account
Bernd Weimer [Thu, 21 Feb 2013 08:58:56 +0000 (09:58 +0100)]
Take fontconfig font width into account

For fonts provided by fontconfig the FC_WIDTH will be mapped to
QFont::Stretch to achieve a more accurate font matching.
In Qt5 the font style is considered instead. This cannot be used
without breaking binary compatibility.

Change-Id: Ia519c2b70eb9f03ba0971fd6e8dd575169c7b72a
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
5 years agoQStackedLayout: Fix crash when focus widget is destroyed in hide()
Jan Arve Saether [Tue, 19 Feb 2013 14:02:24 +0000 (15:02 +0100)]
QStackedLayout: Fix crash when focus widget is destroyed in hide()

We also have to make sure that when moving back to a page
that has a focusWidget(), the focus should go to the focusWidget()

Task-number: QTBUG-18242

Change-Id: Ibfa7d6361c1a456480b2f1584a88ef4c4f405709
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/18f9eb797bffe8626f1edeca3c88f80dae0da8d7)

5 years agoClean whitespace
Jan Arve Saether [Tue, 19 Feb 2013 13:58:51 +0000 (14:58 +0100)]
Clean whitespace

Change-Id: Iec1950a0f4053cd71633162f0cb50efc9d4d493f
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
(cherry picked from qtbase/64106705e7ca6132b1de15529c6206ebb0c58dfa)

5 years agoFix QDeclarativeListView currentSection property update
Nils Jeisecke [Fri, 15 Feb 2013 17:00:15 +0000 (18:00 +0100)]
Fix QDeclarativeListView currentSection property update

Model modifications that did not trigger the refill logic caused
the view's currentSection property to contain an outdated value.

A new autotest has been added to catch the bug.

Task-number: QTBUG-29712
Change-Id: I88cf1295ac55dad7596b6ba1fe475ebf98a31026
Reviewed-by: Alan Alpert <aalpert@rim.com>
(cherry picked from qtquick1/d31f965b72a1bb8aba0b846471780e90fcc895ba)

5 years agoupdate ofono API
Lorn Potter [Tue, 19 Feb 2013 19:16:20 +0000 (05:16 +1000)]
update ofono API

back ported from sha 539a024819a5f696b8afe899108b409f2b77549c

Change-Id: I3b4eac82c8d16076dc1987780512dcd93925e0b4
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years ago fix connman bearer for new API.
Lorn Potter [Wed, 5 Dec 2012 06:08:11 +0000 (16:08 +1000)]
 fix connman bearer for new API.

back ported from qt5 sha 2efccfeeef70ebd8a2db2ebccb3c63722ae76e1f

Change-Id: Ib9cdbb6e4bdfed8420cdc2364503445924c8c57c
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoFixed some issues in QFontconfigDatabase::fallbacksForFamily
Bernd Weimer [Thu, 14 Feb 2013 09:38:37 +0000 (10:38 +0100)]
Fixed some issues in QFontconfigDatabase::fallbacksForFamily

In FcFontSort() the result parameter is not set in older fontconfig versions
(<=2.9.0), so this parameter is ignored. Some fontconfig objects are destroyed
after usage to avoid memory leaks. This is basically a backport from Qt5.

Change-Id: I557dbd5d7303cbd98becf169ebaa754e5d99c281
Reviewed-by: Wolfgang Bremer <wbremer@rim.com>
Reviewed-by: Jiang Jiang <gzjjgod@gmail.com>
5 years agoQThread documentation: do not discourage the reimplementation of QThread
Sze Howe Koh [Tue, 19 Feb 2013 12:19:25 +0000 (20:19 +0800)]
QThread documentation: do not discourage the reimplementation of QThread

The new QThread documentation now really discourage to reimplement
QThread. But in fact, there are many cases where it is perfectly fine.
And the example given is even a case where using worker object is wrong.
The examle even contains a leak since the thread will never stop and
will even leak.

This changes put back some sentences from before commit

The sample code has been re-writen. Notice how reimpementing run takes
less lines of code, less runtime overhead, no leaks, and also is more
complete than the previous example.

This is a modified backport of
qtbase commit 91e12dca757a8ef5c4691b70eb80db61a9d47e83

Change-Id: I4932aef00307a6cf91d57d632a02b8a85e5e8845
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoAdd a method that allows registration of files to types
Alan Alpert [Wed, 5 Dec 2012 19:09:54 +0000 (11:09 -0800)]
Add a method that allows registration of files to types

There is currently no way in C++ to duplicate the functionality of a qmldir
file in mapping QML files to versioned types in a module. This functionality
would be useful both in cases where a separate qmldir file would be overkill,
and for cases where the type mapping should be generated dynamically.

Since public API is frozen for 4.8, this is being added as private API
for those who need some measure of compatibility with qtquick1 in Qt5.

Change-Id: I28d7898122c5556fcd7cf3476795bcf4bb288ea6
Manual cherry pick of qtquick1/9995a2910d8a5f0317fe3adeb54f838b99ab31a8
Reviewed-by: Matthew Vogt <matthew.vogt@qinetic.com.au>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoqpa: Fix crash when requesting QApplication::platformNativeInterface()
Julien Brianceau [Tue, 19 Feb 2013 09:53:52 +0000 (10:53 +0100)]
qpa: Fix crash when requesting QApplication::platformNativeInterface()

If QApplication has not been instantiated, this function would
crash. Change it to return NULL pointer instead.

cherry-picked from qt5/qtbase 3ee48926e6584b4afeda1fc406d19d7b1a8d6f20
original patch from Miikka Heikkinen <miikka.heikkinen@digia.com>

Change-Id: Ic9aae241f9c424fb371ae1774da6a3cb28c31883
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
Reviewed-by: Jørgen Lind <jorgen.lind@gmail.com>
5 years agoAdd missing Objective-C namespace prefixes
Halewijn Geerts [Wed, 2 Jan 2013 13:51:39 +0000 (14:51 +0100)]
Add missing Objective-C namespace prefixes

Change-Id: I5d62fcf0880776e290ae739ece81b685bb7af194
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
5 years agoEnsure the native filedialog starts up with the right directory
Andy Shaw [Sat, 8 Dec 2012 00:55:11 +0000 (01:55 +0100)]
Ensure the native filedialog starts up with the right directory

On Mac it was not starting the dialog with the specified directory when
one was present. If a filename was given as well then it would start up

Task-number: QTBUG-28161
Change-Id: I7cce0d065dd57e6433ce62380d4263d6e20b6e7c
Reviewed-by: Liang Qi <liang.qi@digia.com>
(cherry picked from commit d75d86190bca85841db2040d50184f4c6886ef89)
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
5 years agoFix call to QMetaObject::metaCall from updateProperty
David E. Narváez [Wed, 30 Jan 2013 11:13:00 +0000 (06:13 -0500)]
Fix call to QMetaObject::metaCall from updateProperty

Create an array of arguments in the same way
QMetaObject::write does

cherry-picked from f0221d359499f675115da1f47dd3669a4383653d

Task-Number: QTBUG-29082
Change-Id: Ia2772bce409876861b7004320641b0c4e8996fa8
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoQLocale: Update tamil's AM/PM text
El Mehdi Fekari [Wed, 13 Feb 2013 16:52:45 +0000 (17:52 +0100)]
QLocale: Update tamil's AM/PM text

Change-Id: I355d24fcaaf2c76b8bdbc51f71f931118f5cb3cd
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
5 years agoEnsure that pixels is only freed if there was no CGImage for it
Andy Shaw [Thu, 31 Jan 2013 09:18:59 +0000 (10:18 +0100)]
Ensure that pixels is only freed if there was no CGImage for it

If there was a CGImage that was using the same pixel data then when it
is released it will also free the pixel data. So don't release it a
second time in that case.

Change-Id: I7d0f3fcbaeb137328acc71783be4e4cee33ce001
Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
5 years agoDoc: Edited Qt Help page and clarified .qhp file location.
Jerome Pasion [Tue, 12 Feb 2013 16:18:59 +0000 (17:18 +0100)]
Doc: Edited Qt Help page and clarified .qhp file location.

-replaced "html" with "HTML"
-noted that the .qhp files are in the HTML directories

Task-number: QTBUG-29576
Change-Id: I6c6925465ae370d6796657057eb3c4bf7bf5ab47
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Gatis Paeglis <gatis.paeglis@digia.com>
5 years agoFixed checking HOME variable return value using isEmpty()
Pasi Petäjäjärvi [Mon, 11 Feb 2013 12:08:34 +0000 (14:08 +0200)]
Fixed checking HOME variable return value using isEmpty()

Return value of the QFile::decodeName(qgetenv("HOME")); is never null
if HOME environment variable is not set. So need to check the return
value using isEmpty() instead.

Task-number: QTBUG-28912

Change-Id: I7875520965bf2c0c7311fb051c1f5177e9c3685b
(cherry picked from qtbase/05b4000e01ff5785739617c3069fbe0b0d36a606)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoCreate default install prefix location for QtEmbedded with VxWorks
Pasi Petäjäjärvi [Mon, 11 Feb 2013 15:16:18 +0000 (17:16 +0200)]
Create default install prefix location for QtEmbedded with VxWorks

VxWorks has two different targets (modes) for which Qt can be build.
DKM mode is static build and RTP is using shared libraries. Distinguish
these two if we are creating default install prefix. Not applicable to
Qt5 as it does not anymore make separation for QtEmbedded build.

Change-Id: Icaff82a1d3078e8882ae5dbe9b2e60bc4a419b66
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoStrip prepending <hostname>: string from currentPath() for VxSim
Pasi Petäjäjärvi [Mon, 11 Feb 2013 12:27:01 +0000 (14:27 +0200)]
Strip prepending <hostname>: string from currentPath() for VxSim

VxWorks simulator (VxSim) maps SDK rootdir usable as normal directory.
Mapped directory name is either host: or <hostname>: and can be used
without prepending prefix containing colon. Strip prepending string and
colon to get valid native path to host SDK rootdir running VxSim.

Change-Id: I15f4bf4d9eb2cea87268bad9b1a95973962cb2c8
(cherry picked from qtbase/cd5a4279f38ac6cca8ff8da4d75c2577d9b0bbcd)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoCocoa: Do not use NSOpenGLPFAAccelerated flag for GL context
Jonathan Liu [Tue, 12 Feb 2013 10:34:21 +0000 (21:34 +1100)]
Cocoa: Do not use NSOpenGLPFAAccelerated flag for GL context

The NSOpenGLPFAAccelerated flag indicates that only hardware-accelerated
renderers are considered. It is used when direct rendering is enabled in
QGLFormat. As direct rendering is enabled by default in QGLFormat, this
prevents software rendering fallback if no hardware acceleration is

Task-number: QTBUG-29641
Change-Id: I438bd5ce4e803962fd68c7e9d79f40840760e2d5
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoQLocale: Update the Japanese and Czech locale
El Mehdi Fekari [Mon, 11 Feb 2013 10:55:44 +0000 (11:55 +0100)]
QLocale: Update the Japanese and Czech locale

- Japanese locale: Year should be displayed in 4 digits instead of 2 in short format
- Czech locale: monthName should be displayed in lower case

N.B: The changes above are already fixed on Qt 5 that uses an updated version (v22.1) of CLDR

Change-Id: I40535ea60b1f6abdd3717a28adbcddaa63b39997
Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoEnable autodetection of VxWorks fb driver for available qt-gfx list
Pasi Petäjäjärvi [Mon, 11 Feb 2013 14:50:48 +0000 (16:50 +0200)]
Enable autodetection of VxWorks fb driver for available qt-gfx list

If the VxWorks drivers are in the source tree, show them as available.
Not applicable to Qt5 as it does not have anymore QWS.

Change-Id: I0005f9d67922679a102b5b69f4c7051afef60ba2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoBB10 systemProxyForQuery: query system proxy also for non-URL requests
Peter Hartmann [Thu, 7 Feb 2013 16:02:48 +0000 (17:02 +0100)]
BB10 systemProxyForQuery: query system proxy also for non-URL requests

... like e.g. in QAbstractSocket::connectToHost().
We can set the scheme on the query URL based on well-known ports; even
if the port is not well-known, we can just query the URL anyhow and let
the netstatus API resolve the right proxy for us.

In addition, return early for local schemes like "file" and "qrc".

Task-number: QTBUG-29425
(cherry picked from commit 28d526db74c50977215133159e565e7c15fd18e3)

Change-Id: I40a4865aa7765aad9145e956c0069e78c54670e7
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
5 years agoqmake ExtraCompilerTargets: deal with file name which contains space
Debao Zhang [Thu, 18 Oct 2012 14:42:15 +0000 (22:42 +0800)]
qmake ExtraCompilerTargets: deal with file name which contains space

Task-number: QTBUG-27629
Change-Id: I6d6c3345cc1bb0a866524df3a1534ed50fc00f3e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/b340e40f9185d2f4ec59ce3313447419580fe6ee)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoQProcessEnvironment: Permit magic cmd variables
Daniel Teske [Fri, 8 Feb 2013 11:32:14 +0000 (12:32 +0100)]
QProcessEnvironment: Permit magic cmd variables

The cmd shell inserts magic variables starting with a = into the

Task-number: QTCREATORBUG-8716
Change-Id: I2f140032aea4fb1d77633c6baf90d7b536e2812a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qtbase/e7a242b27b961c64613542c75c69954d1c7bd315)

5 years agoQNX: Don't let eglMakeCurrent() fail when using two contexts.
Sergio Martins [Thu, 7 Feb 2013 19:59:11 +0000 (19:59 +0000)]
QNX: Don't let eglMakeCurrent() fail when using two contexts.

When calling eglMakeCurrent(), egl config and window format
must match, otherwise it fails with EGL_BAD_MATCH.

egl config and window format were static variables, this could lead
to a context setting the window format in the ctor but, at the
time of creating a surface, another context had changed the window

elg config and window format are now member variables. This is the
same approach taken in Qt5.

Change-Id: I4fa0bc59273b856c1eaf43fafd15b551363f2fe2
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
5 years agoFixed crash in image reader when reading certain BMP files.
Samuel Rødal [Tue, 5 Feb 2013 08:44:26 +0000 (09:44 +0100)]
Fixed crash in image reader when reading certain BMP files.

If the high bit in a mask is set, for instance if the mask is
0xff000000, and we shift it to the right by 24 positions, since the mask
was not declared as unsigned we ended up with a mask value of
0xffffffff. We then add 1 to this value and divide by the result,
causing a division by zero crash.

The masks need to be declared unsigned to prevent sign bit extension
when shifting right.

Task-number: QTBUG-29194
Change-Id: I1003d546a70d540b5c135b6b75dee9b4962a7210
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from qtbase, af84313c622af880e95d461ea8b7dbca58d2dffa)

5 years agodo not parse MSVC option /Gs as /GS
Joerg Bornemann [Mon, 4 Feb 2013 11:02:13 +0000 (12:02 +0100)]
do not parse MSVC option /Gs as /GS

/Gs[size] will be added as additional option as there is no XML element
for this option.

Task-number: QTBUG-29329

Change-Id: I1f09bfdac90f9c5f2333dc03e6e4e6a206b4f6d0
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
(cherry picked from commit 9c1628aae3d3a7a5f935caa10f838ca24832c5f5)

5 years agoqmake/MSVC: do not disable buffer security check per default
Joerg Bornemann [Mon, 4 Feb 2013 10:31:00 +0000 (11:31 +0100)]
qmake/MSVC: do not disable buffer security check per default

The default must be "unset" to let the user's MSVC settings decide
what the default value is.

Task-number: QTBUG-29329

Change-Id: I6015202c123dbb7304941b0d24557a26a1e3236c
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 4fe029963d375675d3d4ddaea7e1767486228a73)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoqmake/MSVC: fix parsing of the /openmp option
Joerg Bornemann [Mon, 4 Feb 2013 11:26:28 +0000 (12:26 +0100)]
qmake/MSVC: fix parsing of the /openmp option

Task-number: QTBUG-29143

Change-Id: I6b1ce0babf51701fa404b821b22060a87c4f46b2
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit be8c47b1404257e33d6b7866101167726a3d1c30)
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
5 years agoFix TIFFTAG_RESOLUTIONUNIT handling.
Leonard Lee [Wed, 6 Feb 2013 09:40:51 +0000 (10:40 +0100)]

If there is no TIFFTAG_RESOLUTIONUNIT record, the value of resUnit
should be RESUNIT_INCH and not RESUNIT_NONE.

Task-number: QTBUG-22322
Change-Id: Iedc3120d331308cea9f743de2e4d61cb52cb14c3
(Cherry picked from commit
Reviewed-by: aavit <eirik.aavitsland@digia.com>
5 years agoActually use EGLint - EGLconst does not exist.
Milian Wolff [Thu, 31 Jan 2013 10:52:18 +0000 (11:52 +0100)]
Actually use EGLint - EGLconst does not exist.

This fixes a build error introduced by commit with change id:
I3ace17447aa9a83655b6fa6b4246a6a16592936c and git hash

Change-Id: I548866c1e0958811f66bc4b5d7f048822e59274c
Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
Reviewed-by: Pasi Petäjäjärvi <pasi.petajajarvi@digia.com>
5 years agoremove misleading statement from ~QSqlDatabase()
Mark Brand [Tue, 5 Feb 2013 08:07:07 +0000 (09:07 +0100)]
remove misleading statement from ~QSqlDatabase()

The presence of the sentence "If this is the last QSqlDatabase object
that uses a certain database connection, the database connection is
automatically closed" is misleading, whether or not the statement is
true. It is about an internal detail of QSqlDatabase's implementation.
As such it is not appropriate for user documentation. The user should be
focused on how to use addDatabase(), cloneDatabase() and removeDatabase()

Task-number: QTBUG-29481
Change-Id: I0c39584be260e13340834c34098368fcce4a7419
Reviewed-by: Florian Paul Schmidt <mista.tapas@gmx.net>
Reviewed-by: Sune Vuorela <sune@vuorela.dk>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
(cherry picked from qtbase/0b8065b5819efd8ba3741ea5703d5b95954b16c2)

5 years agoRemove duplicated 'the' word.
Leonard Lee [Tue, 5 Feb 2013 16:05:28 +0000 (17:05 +0100)]
Remove duplicated 'the' word.

The qtbase/examples/widgets/doc/src/boxes.qdoc does not have
duplicated 'the' word. This task is not needed by Qt 5.

Change-Id: I0bcc6fabe3cb819f6e9c5386973e594427a2cddf
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoBlackBerry bearer plugin: check whether device is online several times
Peter Hartmann [Fri, 25 Jan 2013 08:38:47 +0000 (09:38 +0100)]
BlackBerry bearer plugin: check whether device is online several times

This is supposed to workaround a race condition in the underlying
netstatus API: Sometimes we get an event that the Wifi interface
changed, but it is not up, e.g. no gateway (yet). In that case we need
to check back (currently: 300 ms) whether the interface has come
up or not.
This commit can be reverted again once the race condition in the
netstatus API has been resolved.

Task-number: QTBUG-29421
(cherry picked from commit 3dc47622a469ded1c99397fdedc2053b73d57189)

Change-Id: I252c39411340fe3f6af8440a8f21482ca9b6e62d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
5 years agoupdate of Slovak translation
Zdenko Podobný [Thu, 31 Jan 2013 21:48:54 +0000 (22:48 +0100)]
update of Slovak translation

Change-Id: I7cc7d9e34ea36c83e22b2eb29f300d3132c5f18e
Reviewed-by: Roman Paholík <wizzardsk@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoBlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX
Samuli Piippo [Fri, 25 Jan 2013 11:18:08 +0000 (13:18 +0200)]
BlackBerry: The MeasurementSystem port was for BlackBerry OS not QNX

(cherry picked from qtbase/18260ed21240fe4c2d1892def80353448096e54c)

Change-Id: I4de18389fc3ad7743d80b3f72b44083708d72e77
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Kalle Viironen <kalle.viironen@digia.com>
Reviewed-by: Mehdi Fekari <mfekari@rim.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
5 years agoEnsure QDeclarativeTextLayout uses the correct pen
Chris Adams [Mon, 19 Nov 2012 04:05:16 +0000 (14:05 +1000)]
Ensure QDeclarativeTextLayout uses the correct pen

Backport of commit: 3a0cec6525be6bf843c597c19693785e2c893ee9
with change id: I6bcc43fbcf7fb2c680959d27b1422364ebb473ae
from qt5/qtquick1 to qt4.

Task-number: QTBUG-28135
Change-Id: I0d84dcb87b03d7b64797c4d633ae0ae8e6bfcb1e
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agodoc: Remove Symbian from supported platforms
Sergio Ahumada [Wed, 30 Jan 2013 23:11:29 +0000 (00:11 +0100)]
doc: Remove Symbian from supported platforms

Symbian is not a supported platform since Qt 4.8.5

Task-number: QTBUG-28490
Change-Id: Ic6b4bd504f439965cb7a755d42298ca36256028b
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Liang Qi <liang.qi@digia.com>
5 years agoOnly allow one dir to be selected for getExistingDirectory() on Win
Andy Shaw [Wed, 30 Jan 2013 14:50:39 +0000 (15:50 +0100)]
Only allow one dir to be selected for getExistingDirectory() on Win

Task-number: QTBUG-21372

Change-Id: Ifcb625a0c974c5ee51fb42736bd3b309bd017296
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
5 years agoMake compile with QT_NO_FILESYSTEMITERATOR
Thomas Zander [Wed, 23 Jan 2013 09:08:27 +0000 (10:08 +0100)]

Change-Id: Ie79dda5a48288a1d9cd4b7e0a7934ee9db48c953
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Thomas Zander <zander@kde.org>
Reviewed-by: João Abecasis <joao@abecasis.name>
5 years agoMake sure the correct name filter is selected in the Mac file dialog
Andy Shaw [Fri, 11 Jan 2013 07:34:20 +0000 (08:34 +0100)]
Make sure the correct name filter is selected in the Mac file dialog

Since we have to add the filters one by one to the Mac file dialog it
was finding the one that would match the filter by comparing the start
of the filter string.  However it would continue to check the start of
other filters even if it had already found the one it should be using.

Now it uses either an exact match or the first one that it matches the
start of.

Change-Id: Ie6441acd48e45ec9c712afc12a2ea47755835bb3
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
(cherry picked from commit d6506c129d698c677f2d7418759b147007ca15a2)

5 years agoAdd a means to specify that the VM_POOL_SIZE can be 1gb and not 2gb
Andy Shaw [Fri, 11 Jan 2013 08:06:26 +0000 (09:06 +0100)]
Add a means to specify that the VM_POOL_SIZE can be 1gb and not 2gb

Due to a reported problem where the reserving of 2gb was too big under
certain circumstances then in order to provide a means for people who
hit this problem a define is added so that the VM_POOL_SIZE is set to be
1gb instead. This is an optional define and the default is for the size
to be 2gb which keeps it to current behavior.

Change-Id: I73200e1bcfcf7b37c6ba62f8b7bcf217f239dfcb
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
(cherry picked from commit f32c98f4876fd6f4d28d710d6ee1d59707b2ac62)

5 years agoObserve GL context loss in ShaderEffectItem
Chris Adams [Fri, 2 Nov 2012 03:50:58 +0000 (13:50 +1000)]
Observe GL context loss in ShaderEffectItem

This is a backport of commit: 01928c91ff0ae76cdb02f50af3c62368e28cafb6
with change id: I8281e77f7285ea0046bdf092ab827cae3b00a6d2
from qt5/qtquick1 to qt4.

Task-number: QTBUG-28136
Change-Id: Idbeffce919d85f55df5184f8a8c9a89649687f93
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoMake sure QGraphicsItem notifies changes to focusScopeItem.
Andreas Aardal Hanssen [Mon, 28 Jan 2013 19:31:59 +0000 (20:31 +0100)]
Make sure QGraphicsItem notifies changes to focusScopeItem.

A glitch in QGraphicsItem's logic made it update the focusScopeItem
pointer, but fail to notify the change to QDeclarativeItem through the
d_ptr->focusScopeItemChange() virtual function, hindering
QDeclarativeItem from emitting focusChanged() correctly for focus
scopes that do not have focus.

Two lines were moved, and a comment updated to reflect the reason
why the "return" is needed at this point. It's clear that the
calls to focusScopeItemChange() are unrelated to the return.

Task-number: QTBUG-29260
Change-Id: I12ba9161b16d34c3689401a92c86d2047989f7bd
(cherry picked from qtbase/6476d6728eb3cde8e4a5fd0eb607b92977932296)
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
Reviewed-by: Alan Alpert <aalpert@rim.com>
5 years agoQSslSocket tests: use qt-project as test server instd of qt.nokia.com
Peter Hartmann [Tue, 29 Jan 2013 09:37:52 +0000 (10:37 +0100)]
QSslSocket tests: use qt-project as test server instd of qt.nokia.com

Change-Id: I3210f60d2076f31f8b1d3316d1f11707e542813e
(backport of commit 7d757fc8feb5090b464f65fe243b6a88eb1f8f3e)
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
5 years agodon't prematurely reduce LIBS when adding sql link lists
Mark Brand [Sun, 27 Jan 2013 13:03:16 +0000 (14:03 +0100)]
don't prematurely reduce LIBS when adding sql link lists

It's possible that different database libraries share dependencies.
We need to keep their link lists intact here so that QtSql's .prl and
.pc files will have them in the right order. Particularly important
when building the drivers into QtSql and using static linking.

Change-Id: Id371b127099f2790fe7cccd0c7059607600f447d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from qt5/qtbase commit 9ef48277f959ff759bd9fba36c907ef5ed67f5b1)

5 years agoChange Nokia -> Digia in supported platforms page
Sergio Ahumada [Tue, 29 Jan 2013 10:55:58 +0000 (11:55 +0100)]
Change Nokia -> Digia in supported platforms page

Change-Id: I012819c918a929656a4c282607d1695c857c2c1a
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Tuukka Turunen <tuukka.turunen@digia.com>
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoCall endSheet when the QFileDialog was shown as a sheet on Mac
Andy Shaw [Mon, 14 Jan 2013 12:39:28 +0000 (13:39 +0100)]
Call endSheet when the QFileDialog was shown as a sheet on Mac

If the sheet is not ended then subseqent calls to show a sheet will not
work correctly.

Change-Id: Ib8a43a1c96a3dadff196c433e822f7579ad87b8b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
(cherry picked from commit 7024bc70917b6837e2d1e37b1d52350a28d978c5)
Reviewed-by: Laszlo Papp <lpapp@kde.org>
5 years agoTry harder in matching the method signature
Dirk Mueller [Fri, 4 Jan 2013 12:45:24 +0000 (13:45 +0100)]
Try harder in matching the method signature

In cases where the Propertiesdialog has no specific Implementation
for a dbus data type, it creates a regular QLineEdit. In such cases,
qdbusviewer then tried to call the method with the arg set to a string
instead of the real datatype (for example uint64), which usually does not work.

We can be more clever and try to implicitely convert the user input
to the right datatype, which makes the invocation succeed.

Change-Id: I9e16be6e7c5209745f2fa0c32acf08a3c42178f1
(cherry-pick of qttools/0c22eb9d9d1a0b72622fdf16ebf60712336b449e)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoFix typo in qmake warning
Kai Koehne [Mon, 28 Jan 2013 13:57:29 +0000 (14:57 +0100)]
Fix typo in qmake warning

Has been fixed in Qt 5 with
0e78e5080262b8f - port qmake to qt creator's qmake language evaluator

Change-Id: I598989f7f4e18a37355ee07c83911f8571059614
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoUse path() as we need the path without the filename
Andy Shaw [Thu, 24 Jan 2013 20:03:13 +0000 (21:03 +0100)]
Use path() as we need the path without the filename

On Windows, filePath() was used for a function that was supposed to get
the bin directory for Qt. However path() should be used instead as this
will remove the filename from the originally obtained string.

Change-Id: I16f8bda91fe9666c935318f8d73c715d2ea908f5
Reviewed-by: Laszlo Papp <lpapp@kde.org>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
(cherry picked from commit 05dab891649b76fe7351d51950edf3caba2bfece)

5 years agoUse correct variable type EGLint for EGL attributes
Pasi Petäjäjärvi [Tue, 15 Jan 2013 13:06:42 +0000 (15:06 +0200)]
Use correct variable type EGLint for EGL attributes

EGL property is type EGLint and is defined in eglplatform.h header as
typedef khronos_int32_t EGLint;

Change-Id: I3ace17447aa9a83655b6fa6b4246a6a16592936c
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoVxWorks process (RTP) mode does not have taskLock/taskUnlock functions
Pasi Petäjäjärvi [Mon, 11 Jun 2012 13:14:06 +0000 (16:14 +0300)]
VxWorks process (RTP) mode does not have taskLock/taskUnlock functions

VxWorks does not support to globally lock and unlock the scheduler from
process. In kernel mode (DKM) above functions disable preemption from
requested task and such functionality does not exist for process.

Change-Id: Id41eab4c1973e4181e82539d08707659e0780f99
(cherry picked from qtbase/49b8e21429c7ab785fb11e8ef84bd7e65c943861)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoAdd support getting memory page size to RTP mode on VxWorks.
Pasi Petäjäjärvi [Wed, 13 Jun 2012 11:47:40 +0000 (14:47 +0300)]
Add support getting memory page size to RTP mode on VxWorks.

Change-Id: Id71bf7fd8e7371284076247558cba7edb0307e13
(cherry picked from qtbase/00faa09aadfc6c6db9da639ba6b7866c72447e39)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse Qt defined gettimeofday for VxWorks and no fallback to X11 version
Pasi Petäjäjärvi [Fri, 15 Jun 2012 10:33:58 +0000 (13:33 +0300)]
Use Qt defined gettimeofday for VxWorks and no fallback to X11 version

VxWorks don't have gettimeofday function so we always use the one
implemented in Qt. VxWorks DIAB compiler is not supported building Qt
for VxWorks 6.9.2. Anyone using older VxWorks should also not be
affected so use new defines VXWORKS_DKM and VXWORKS_RTP for VxWorks
version 6.9.2 onward.

Change-Id: I2e9546a101256ea0557b65163b40cd0f28be8519
(cherry picked from qtbase/7e3d5a720752900b1ccbb3d8dcbf12cc02b01b63)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoVxWorks header only available in DKM mode and not in RTP mode.
Pasi Petäjäjärvi [Fri, 15 Jun 2012 10:55:08 +0000 (13:55 +0300)]
VxWorks header only available in DKM mode and not in RTP mode.

Check if _WRS_KERNEL is defined so we are compiling for DKM mode.

Change-Id: I15801b0575d3fe6e543f81a177fd01d015d9085f
(cherry picked from qtbase/baad50e97946c4b99998f215aa5c023c17be29ea)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse taskIdSelf() function instead of taskIdCurrent global variable
Pasi Petäjäjärvi [Fri, 15 Jun 2012 11:30:15 +0000 (14:30 +0300)]
Use taskIdSelf() function instead of taskIdCurrent global variable

The uniprocessor taskIdCurrent global variable (declared in taskLib.h)
does not exist in VxWorks SMP, because of concurrent execution on
multiple CPUs. Any uniprocessor code that reads taskIdCurrent should
make calls to taskIdSelf() instead.

Change-Id: I4e0efef32297f339d6121c7d4bca3820e0fc9294
(cherry picked from qtbase/608cd1ad84484448ac9b0b8b4d88e0e8ff4a9cf1)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse stub functions getpwuid and getgrgid for VxWorks
Pasi Petäjäjärvi [Thu, 3 Jan 2013 14:11:40 +0000 (16:11 +0200)]
Use stub functions getpwuid and getgrgid for VxWorks

VxWorks has no concepts of users and groups, therefore no such functions
exists on VxWorks. Use stub functions from qfunctions_vxworks.h for
those, so we don't need to make major source code changes.

Change-Id: Iaad80ec18441e3d3e9c0f96e92ccc3766b27d976
(cherry picked from qtbase/ae229b91929955e7418da938bace6d0cc6a2cde5)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoDo not define QT_NO_DYNAMIC_LIBRARY for VxWorks process (RTP)
Pasi Petäjäjärvi [Thu, 3 Jan 2013 13:39:53 +0000 (15:39 +0200)]
Do not define QT_NO_DYNAMIC_LIBRARY for VxWorks process (RTP)

Shared libraries cannot be used in kernel mode (DKM), only at process
mode (RTP).

Change-Id: I8cecc12461aa4417b16577db3bc9cd85a1aa7efa
(cherry picked from qtbase/2d44f879a2af258ce5bba75ab3a478e2066f3c10)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse sched_get_priority_* functions only for SCHED_RR and SCHED_FIFO
Pasi Petäjäjärvi [Wed, 9 Jan 2013 11:12:50 +0000 (13:12 +0200)]
Use sched_get_priority_* functions only for SCHED_RR and SCHED_FIFO

In VxWorks set default values for scheduling priority to use
SCHED_FIFO_HIGH_PRI and SCHED_FIFO_LOW_PRI defines for other scheduling
policies than SCHED_RR or SCHED_FIFO.

Change-Id: If78b84cd9ef94d7712206e9442e96cdba727610f
(cherry picked from qtbase/eae8faabed151fd32219f2f333fb632c104c73a7)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix comments to use pre C99 standard style instead
Pasi Petäjäjärvi [Wed, 9 Jan 2013 12:49:09 +0000 (14:49 +0200)]
Fix comments to use pre C99 standard style instead

VxWorks compiler fails to compile *.c file with C99 style comments on it

Change-Id: Ib5c5ff14006c17f9392b77363232b8b7cc112d34
(cherry picked from qtbase/2aaffe1800db0d8a170b278ac9a43f2e00ef0e8f)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUndefine overlapping variable names defined in VxWorks headers
Pasi Petäjäjärvi [Thu, 17 Jan 2013 15:24:21 +0000 (17:24 +0200)]
Undefine overlapping variable names defined in VxWorks headers

VxWorks has defined variables with same name as in Qt's headers.
Undefine those variables to avoid naming conflict.

Change-Id: Ia8ca04a66acece683cd6c7f71df7e5a2800ec98d
(cherry picked from qtbase/f7bd8652caab2f53ced739ce90c640924d4962dc)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse stub function gettimeofday for VxWorks
Pasi Petäjäjärvi [Thu, 24 Jan 2013 11:50:34 +0000 (13:50 +0200)]
Use stub function gettimeofday for VxWorks

Vxworks does not have gettimeofday function, use function
implementation from qfunctions_vxworks.h/cpp instead.

Change-Id: Iad0b811049b974c555febe1e47398b7df9ddda34
(cherry picked from qtbase/1309d9a9d68af902821d0ba5f76aa6e994aa6963)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse QDir::homePath() for tilde expansion
Pasi Petäjäjärvi [Thu, 24 Jan 2013 11:53:58 +0000 (13:53 +0200)]
Use QDir::homePath() for tilde expansion

VxWorks does not have concept of users and therefore has no function
getpwnam. Use QDir::homePath() which returns actually QDir::rootPath()
if there is no HOME env variable set.

Change-Id: I0786ace2c05a14380dd725384972a19ccc07d916
(cherry picked from qtbase/2d8a4c2d3f86e3ae40b4a388de57021b98b9778d)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoUse time.h related includes from qfunctions_vxworks.h file.
Pasi Petäjäjärvi [Thu, 24 Jan 2013 11:55:49 +0000 (13:55 +0200)]
Use time.h related includes from qfunctions_vxworks.h file.

In VxWorks qfunctions_vxworks.h file includes correct time
related headers and it is included already at file
qplatformdefs.h for all mkspecs targets.

Change-Id: Icf970e28bf6deba9201fa33d7f728cc2251f7e5c
(cherry picked from qtbase/2d2da44f6381fdeaa195319c0dc66e3909c2ca7b)
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoOnly send the enter/leave event when it makes sense to do so
Andy Shaw [Wed, 23 Jan 2013 13:29:02 +0000 (14:29 +0100)]
Only send the enter/leave event when it makes sense to do so

When show/hide is called on a widget on Mac then it needs to send an
enter/leave event. But it should only do that if the widget under the
mouse is actually the one that is being shown/hidden.

Change-Id: I53c782f5deee740cbc34e1fcc7b551a108230081
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
5 years agoDoc: add missing LayoutMirroring to QML Elements
Tasuku Suzuki [Sun, 25 Nov 2012 06:51:37 +0000 (15:51 +0900)]
Doc: add missing LayoutMirroring to QML Elements

Change-Id: Id088effb7b38353c05b4f0baba89ddaa637aa016
Reviewed-by: Casper van Donderen <casper.vandonderen@gmail.com>
Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
5 years agoFix postgres notification support in the QPSQLDriver.
Matt Newell [Thu, 22 Mar 2012 17:42:56 +0000 (10:42 -0700)]
Fix postgres notification support in the QPSQLDriver.

This patch fixes a critical bug in the qsqlpsql driver where
notifications aren't delivered when received. Any blocking libpq
function(specifically PQexec) will read all the incoming data
from the socket, including any pending notifications. This would
cause the socket notifier to never be fired for incoming
notifications that are already queued inside libpq. The qsqldriver
test case was skipping the postgres notification test because of
this bug, now its enabled and passing. In order to fix this
bug I made a wrapper function for PQexec in QPSQLDriverPrivate
that calls _q_handleNotification via QMetaObject::callMethod
QueuedConnection in order to deliver pending notifications
when control returns to the event loop. I also added a flag
to ensure only one call is made each time the event loop is

This backport omits the changes to the NotificationSource version
of the "notification" signal that were included in the original
commit, since NotificationSource itself has not yet been introduced
into Qt4.

(Backport of qtbase aea684506945a12312fc05fb3bb4f549da93f7f5)

Change-Id: I19f5297094ae7ae46bfb0717e4fca744d69f7b92
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
5 years agoqkeymapper_win.cpp: Define missing constant for MinGW.
Friedemann Kleint [Fri, 25 Jan 2013 16:12:22 +0000 (17:12 +0100)]
qkeymapper_win.cpp: Define missing constant for MinGW.

Fix MinGW compile breakage introduced by
68331c5436506b6f9b4c2a49692a09020e4eef27 .

Task-number: QTBUG-8764
Task-number: QTBUG-10032

Change-Id: I26bcefc382010eee7d79b806b3d9f08b6cb2ff8d
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
5 years agoset pkg-config *_location directly to install dir
Oswald Buddenhagen [Tue, 8 Jan 2013 15:34:26 +0000 (16:34 +0100)]
set pkg-config *_location directly to install dir

qmake tries to replace all occurrences of the install prefix with a
literal ${prefix}. of course this would mess up build paths which happen
to live under the prefix (this is untypical, but still), which would
break the sed magic in the subsequent install step. as qmake itself has
no use for the .pc files, it's ok to target them directly for the
install dir. we do the same with the include and lib dirs already.

qt5 is already doing the right thing.

Task-number: QTBUG-28807
Change-Id: I82c17284d1dbac4a96845db2ddec9680e251e7a5
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
5 years agoUpdate Traditional Chinese translation
You-Ruei Tzeng [Wed, 16 Jan 2013 16:22:34 +0000 (00:22 +0800)]
Update Traditional Chinese translation

Change-Id: I7119ddfd8fb135adc7561451d5b5a25f3f4f7d4c
Reviewed-by: Franklin Weng <franklin@goodhorse.idv.tw>
Reviewed-by: Liang Qi <liang.qi@digia.com>
5 years agoFix checking QT_NO_QWS_MULTIPROCESS before using QWSSharedMemSurface
Pasi Petäjäjärvi [Fri, 18 Jan 2013 09:43:30 +0000 (11:43 +0200)]
Fix checking QT_NO_QWS_MULTIPROCESS before using QWSSharedMemSurface

QWSSharedMemSurface is not available if we don't have multiprocess QWS,
which requires QSharedMemory support. On VxWorks DKM mode, we don't
support QSharedMemory and there no multiprocess QWS.

Change-Id: I647a576ee4d718b3dcddb0dc4d629ffcd2e163f2
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix TextInput test failures.
Andrew den Exter [Mon, 5 Sep 2011 07:42:08 +0000 (17:42 +1000)]
Fix TextInput test failures.

emitCursorPositionChanged won't emit cursorPositionChanged if the
cursor position hasn't changed but that doesn't mean the micro focus
hasn't changed, so emit updateMicroFocus changed when
cursorPositionChanged isn't.

Task-number: QTBUG-21017
Task-number: QTBUG-21011
Task-number: QTBUG-20719
Reviewed-by: Joona Petrell <joona.t.petrell@nokia.com>
(cherry picked from commit 6e0e834e0398192a6da11d1e1bca6b74769fb75d)

Change-Id: Ia0d244eea051f2a870a084742c4c22f5a45a87bc
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
5 years agoDoc: Updated HTML copyright year to 2013.
Jerome Pasion [Tue, 22 Jan 2013 13:18:54 +0000 (14:18 +0100)]
Doc: Updated HTML copyright year to 2013.

Change-Id: I62fa2443cc7cfd187458eb99d370472d553600f8
Reviewed-by: Sergio Ahumada <sergio.ahumada@digia.com>
Reviewed-by: Johanna Äijälä <johanna.aijala@digia.com>
5 years agoDon't update the input method if the im hints haven't changed.
Andrew den Exter [Mon, 21 Jan 2013 01:08:47 +0000 (11:08 +1000)]
Don't update the input method if the im hints haven't changed.

Depending on the implementation updating an input method can be
expensive and various widgets will at times call setInputMethodHints
with unchanged hints.  QGraphicsView being a notable offender due to
the complexity of the circumstances in which the hints can change.

Skipping the update here ensures the input method isn't updated
unnecessarily for all widgets.

Task-number: QTBUG-19854
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
(cherry picked from commit 40e6b1d0b8c1804dfb33032fa70b6604b91f6f90)

Change-Id: I36ae35585ee20a4e01ca0d62c71e896dbdb51a3f
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
5 years agoFix glitch on MNG animation Loops when QMovie caching is enabled
Davy Durham [Tue, 1 Jan 2013 23:21:37 +0000 (17:21 -0600)]
Fix glitch on MNG animation Loops when QMovie caching is enabled

libmng delivers the last animation frame with a 1ms delay, and delivers
an extra blank frame after that with the proper delay time, but this
confuses QMovie when QMovie::cacheMode() == QMovie::CacheAll.

This was commited as 313d60c107d9659efd5e93ba5a036054f6b1ebba in qt5

Task-Number: QTBUG-28894
Change-Id: I1dd585cd6f0ced8c777bd1f15ac2c9f36ca63f41
Reviewed-by: aavit <eirik.aavitsland@digia.com>
5 years agoRemoved unused include headers <time.h> and <sys/time.h>
Pasi Petäjäjärvi [Tue, 8 Jan 2013 10:49:08 +0000 (12:49 +0200)]
Removed unused include headers <time.h> and <sys/time.h>

Nothing is used from the above header files so these dead includes can
be removed.

Change-Id: I381ea62e5a0bc623bb984c764be55c7a2f2ee317
Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
5 years agoFix temporary file leak in tst_qfileinfo.
Friedemann Kleint [Mon, 21 Jan 2013 09:28:41 +0000 (10:28 +0100)]
Fix temporary file leak in tst_qfileinfo.

Change-Id: I0d679638d5a9564f612ae5e70717f164b74aefb0
Reviewed-by: David Faure (KDE) <faure@kde.org>
(cherry picked from qtbase/52e14e05fa83f19f64cedda2291b3a055bdead06)

5 years agoQt Designer: Use multiline validation for dynamic string properties.
Friedemann Kleint [Fri, 18 Jan 2013 15:39:33 +0000 (16:39 +0100)]
Qt Designer: Use multiline validation for dynamic string properties.

Task-number: QTBUG-26394

Change-Id: Idbaa4bad71125b74d8407bb56ee9fdbf83831fe0
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/a7d61534acdb90b925d7f250665dcd30c3f37668)

5 years agoActiveQt Designer plugin: Load control string correctly.
Friedemann Kleint [Mon, 21 Jan 2013 12:41:56 +0000 (13:41 +0100)]
ActiveQt Designer plugin: Load control string correctly.

Task-number: QTBUG-29234

Change-Id: I5762c75efc24bf5322ff767a9dbecfdfc02c3377
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
(cherry picked from qttools/8695c1753964eeb06b5d9306010b56be5fc151c0)

5 years agoTo support QT_NO_IM on Linux/Windows/Mac
Jing Bai [Tue, 15 Jan 2013 18:04:10 +0000 (19:04 +0100)]
To support QT_NO_IM on Linux/Windows/Mac

Fix compilation issue when QT_NO_IM is defined.
Also fixed references in tests. But fixing
plugins/examples seem not necessary at this point.

Task-number: QTBUG-26109
Change-Id: I2067051951616012117efa6716640cbf198fdb2a
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
5 years agofix illegal reference to a destroyed variable
Gatis Paeglis [Fri, 11 Jan 2013 16:47:58 +0000 (17:47 +0100)]
fix illegal reference to a destroyed variable

The char array 'dash_o' is an automatic variable. The string "-o" is copied into this array.
Later the address of the array dash_o is assigned twice to lpargs[++i].
After leaving the block, the array dash_o is gone and lpargs[...] contains an illegal reference.

This was discovered in a release mode when compiled with gcc version 4.7.2

Patch doesn't apply for Qt5 where 'lpr' support has been removed.

Change-Id: I4f99badfa380ad3b29893a350f0d699bfb934c68
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
5 years agoFix a -Wunused-private-field] warning
Jan Kundrát [Thu, 17 Jan 2013 11:38:59 +0000 (12:38 +0100)]
Fix a -Wunused-private-field] warning

ABI compatibility dictates that these members cannot go. On the other hand, new
Clang warns about these being unused.

Konstantin Tokarev suggested adding Q_UNUSED to any method; this one looks as
good as the other one.

Change-Id: Icfb47bff7662d1f31f191a702416983776ce42e3
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Jason McDonald <macadder1@gmail.com>
5 years agoFix crashes in tst_qthreadpool on Windows.
Friedemann Kleint [Thu, 17 Jan 2013 16:12:59 +0000 (17:12 +0100)]
Fix crashes in tst_qthreadpool on Windows.

Qt 4.8 shows frequent crashes in runMultiple apparently caused
by the QMutex construction in the free functions by different
threads. Use a common QMutex class member instead.

Change-Id: I851d4e2d3637a7b4f404ed843f5360c10caa21f5
Reviewed-by: Mitch Curtis <mitch.curtis@digia.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from qtbase/ced523af7a3559b0f30dd2a4406e05418ff7ec89)

5 years agoUpdate the Indonisian and Catalan locales in CLDR data:
Mehdi Fekari [Mon, 14 Jan 2013 20:38:12 +0000 (15:38 -0500)]
Update the Indonisian and Catalan locales in CLDR data:

- Indonisian locale (in.xml): to return correct AM/PM text and correct time Fomat
- Catalan locale (ca.xml): to return correct time Format

Change-Id: I65bbabdc6311dc3c958605cbc04e7a034243e9db
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoQTBUG-15319: fix shortcuts with secondary Xkb layout.
Aurelien Lourot [Thu, 10 Jan 2013 21:28:37 +0000 (22:28 +0100)]
QTBUG-15319: fix shortcuts with secondary Xkb layout.

Change-Id: Iadb89137ec017b9dcd4d1588fd582ea46a9d7cc1
Reviewed-by: Aurelien <aurelien.lourot@gmail.com>
Reviewed-by: David Faure (KDE) <faure@kde.org>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
5 years agoQtDBus: Garbage collect deleted objects now and then.
David Faure [Tue, 15 Jan 2013 17:41:27 +0000 (18:41 +0100)]
QtDBus: Garbage collect deleted objects now and then.

Fixes performance issues in apps which register and deregister objects
very frequently (like nepomukstorage).

Change-Id: Id7d6ef508336758c55fa894868241f143b3e30e0
Backport-Of: ac9ab9703ff299c94dca7585d5a12ecde28931bb
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
5 years agoChange all shmget calls to user-only memory
Thiago Macieira [Sat, 22 Dec 2012 16:32:12 +0000 (08:32 -0800)]
Change all shmget calls to user-only memory

Drop the read and write permissions for group and other users in the

Change-Id: I8fc753f09126651af3fb82df3049050f0b14e876
(cherry-picked from Qt 5 commit 856f209fb63ae336bfb389a12d2a75fa886dc1c5)
Reviewed-by: Richard J. Moore <rich@kde.org>