6 years agoSwitch back to 4.4.3 alpha4 unstable n0.41
BogDan Vatra [Mon, 17 Sep 2012 19:53:25 +0000 (19:53 +0000)]
Switch back to 4.4.3

6 years agoMerge branch 'unstable' into alpha4
BogDan Vatra [Mon, 17 Sep 2012 19:11:40 +0000 (22:11 +0300)]
Merge branch 'unstable' into alpha4

6 years agoOne more try to move -lgcc first, before any other library.
BogDan Vatra [Mon, 17 Sep 2012 17:56:16 +0000 (20:56 +0300)]
One more try to move -lgcc first, before any other library.

6 years agoFix qmake.exe Windows cmd.exe mkdir slash direction bug
Ray Donnelly [Sun, 16 Sep 2012 01:00:52 +0000 (02:00 +0100)]
Fix qmake.exe Windows cmd.exe mkdir slash direction bug

6 years agoBuild faster
BogDan Vatra [Sat, 15 Sep 2012 09:57:44 +0000 (12:57 +0300)]
Build faster

6 years agoOn Android request software input panel on mouse click
BogDan Vatra [Sat, 15 Sep 2012 09:55:42 +0000 (12:55 +0300)]
On Android request software input panel on mouse click

Possible fix for https://bugs.kde.org/show_bug.cgi?id=305881

BUG: 305881

6 years agoUse __android_log_write insead of __android_log_print
BogDan Vatra [Tue, 11 Sep 2012 18:08:24 +0000 (21:08 +0300)]
Use __android_log_write insead of __android_log_print

CCBUG: 306483

6 years agoPartially fix qDebug() implementation.
BogDan Vatra [Mon, 10 Sep 2012 17:50:57 +0000 (20:50 +0300)]
Partially fix qDebug() implementation.

qDebug()<< "hello %08x %08x %08x %08x ..."; won't crash anymore.

BUG: 306483

6 years agoDefine QMAKE_SYMBOLIC_LINK for Windows as $$QMAKE_COPY
Ray Donnelly [Sun, 9 Sep 2012 16:33:58 +0000 (17:33 +0100)]
Use $(SYMLINK) instead of ln -s in unixmake2.cpp
Fix QMAKE_LIBDIR_QT to have forward slashes

6 years agoAdd libgcc after users libs.
BogDan Vatra [Thu, 6 Sep 2012 20:06:22 +0000 (23:06 +0300)]
Add libgcc after users libs.

6 years agoFix atomics for armv5 thumb architectue, move libgcc first.
BogDan Vatra [Tue, 4 Sep 2012 19:10:54 +0000 (22:10 +0300)]
Fix atomics for armv5 thumb architectue, move libgcc first.

BUG: 306210

6 years agoDon't crash if DISABLE_KEYGUARD permission is not set.
BogDan Vatra [Fri, 31 Aug 2012 17:48:33 +0000 (20:48 +0300)]
Don't crash if DISABLE_KEYGUARD permission is not set.

BUG: 306088
CCBUG: 306088

6 years agoStrip hack was remove by mistake, bringing it back ! n0.4
BogDan Vatra [Sat, 25 Aug 2012 18:55:14 +0000 (18:55 +0000)]
Strip hack was remove by mistake, bringing it back !

6 years agoFix QML demos and examples delpoment on Android
BogDan Vatra [Sat, 25 Aug 2012 14:26:24 +0000 (17:26 +0300)]
Fix QML demos and examples delpoment on Android

6 years agoCache 10 most used paths.
BogDan Vatra [Fri, 24 Aug 2012 18:44:50 +0000 (21:44 +0300)]
Cache 10 most used paths.

6 years agoSwitch back to static stl
BogDan Vatra [Sat, 18 Aug 2012 06:19:11 +0000 (09:19 +0300)]
Switch back to static stl

6 years agoSwitch to shared stl
BogDan Vatra [Sat, 18 Aug 2012 06:21:56 +0000 (09:21 +0300)]
Switch to shared stl

6 years agoExtra protection
BogDan Vatra [Sat, 18 Aug 2012 06:19:11 +0000 (09:19 +0300)]
Extra protection

6 years agoFix platform window leak.
BogDan Vatra [Sat, 18 Aug 2012 06:17:25 +0000 (09:17 +0300)]
Fix platform window leak.

6 years agoIgnore menu separators in Android
BogDan Vatra [Sat, 18 Aug 2012 06:09:04 +0000 (09:09 +0300)]
Ignore menu separators in Android

BUG: 305029
CCBUG: 305029

6 years agoA second instance of the xcopy qmake fix
Ray Donnelly [Fri, 17 Aug 2012 10:57:24 +0000 (11:57 +0100)]
A second instance of the xcopy qmake fix

6 years agoAttempt to fix xcopy issue on Windows
Ray Donnelly [Fri, 17 Aug 2012 06:00:40 +0000 (07:00 +0100)]
Attempt to fix xcopy issue on Windows

6 years agoOn windows replace / with \
BogDan Vatra [Mon, 13 Aug 2012 10:00:54 +0000 (13:00 +0300)]
On windows replace / with \

6 years agoAugment (broken without -win32) call to isWindowsShell() with a check for
Ray Donnelly [Sun, 12 Aug 2012 23:14:55 +0000 (00:14 +0100)]
Augment (broken without -win32) call to isWindowsShell() with a check for
 no QMAKE_SH a check that QMAKE_HOST.os is Windows (needed for Necessitas)

6 years agoWindows qt tools cross compile
BogDan Vatra [Wed, 8 Aug 2012 18:30:48 +0000 (21:30 +0300)]
Windows qt tools cross compile

6 years agoFix qmake being only x86_64 (is now fat i386/x86_64)
Ray Donnelly [Fri, 10 Aug 2012 07:18:24 +0000 (08:18 +0100)]
Fix qmake being only x86_64 (is now fat i386/x86_64)

6 years agoFix sed transform (qmake.conf to shell scipt) for QMAKE_CXX variable
Ray Donnelly [Wed, 1 Aug 2012 01:16:51 +0000 (02:16 +0100)]
Fix sed transform (qmake.conf to shell scipt) for QMAKE_CXX variable

6 years agoGo to market if ministro is too old
BogDan Vatra [Sun, 22 Jul 2012 19:21:39 +0000 (22:21 +0300)]
Go to market if ministro is too old

6 years agoUpdate mkspecs, to build Qt using NDK-r8b
BogDan Vatra [Fri, 20 Jul 2012 19:24:38 +0000 (22:24 +0300)]
Update mkspecs, to build Qt using NDK-r8b

6 years agoFix localPrefix usage
BogDan Vatra [Sat, 7 Jul 2012 11:56:15 +0000 (14:56 +0300)]
Fix localPrefix usage

6 years agoMake armeabi-v7a default platform.
BogDan Vatra [Tue, 3 Jul 2012 08:34:36 +0000 (11:34 +0300)]
Make armeabi-v7a default platform.

6 years agoFix java part
BogDan Vatra [Tue, 3 Jul 2012 08:16:31 +0000 (11:16 +0300)]
Fix java part

6 years agoAdd support for QML debugging.
BogDan Vatra [Tue, 3 Jul 2012 08:04:21 +0000 (11:04 +0300)]
Add support for QML debugging.

Big thanks to Tyler Mandry for this patch.

6 years agoAdd possibility to turn off android style plugin.
BogDan Vatra [Sun, 17 Jun 2012 12:27:49 +0000 (15:27 +0300)]
Add possibility to turn off android style plugin.

6 years agoWarning--
BogDan Vatra [Sat, 16 Jun 2012 14:23:47 +0000 (17:23 +0300)]

6 years agoSMP safe atomics for android
BogDan Vatra [Sat, 16 Jun 2012 14:23:18 +0000 (17:23 +0300)]
SMP safe atomics for android

6 years agoFix tests on Android
BogDan Vatra [Sat, 16 Jun 2012 14:14:58 +0000 (17:14 +0300)]
Fix tests on Android

6 years agoMore work on Android Style
BogDan Vatra [Sat, 9 Jun 2012 17:45:57 +0000 (20:45 +0300)]
More work on Android Style

6 years agoSet the share context on Android.
BogDan Vatra [Sat, 9 Jun 2012 08:43:27 +0000 (11:43 +0300)]
Set the share context on Android.

6 years agoFix QGLContext::areSharing
BogDan Vatra [Sat, 9 Jun 2012 08:41:02 +0000 (11:41 +0300)]
Fix QGLContext::areSharing

QGLContext::areSharing should check if the contexts are using the
same platform context.

6 years agoFix QLineEdit style
BogDan Vatra [Thu, 7 Jun 2012 16:18:44 +0000 (19:18 +0300)]
Fix QLineEdit style

6 years agoFix QCombobox & QListView style
BogDan Vatra [Mon, 4 Jun 2012 19:27:50 +0000 (22:27 +0300)]
Fix QCombobox & QListView style

6 years agoWarnings --
BogDan Vatra [Mon, 4 Jun 2012 13:50:27 +0000 (16:50 +0300)]
Warnings --

6 years agoOn Android pass '/' at the end of the dir.
BogDan Vatra [Mon, 4 Jun 2012 13:49:08 +0000 (16:49 +0300)]
On Android pass '/' at the end of the dir.

6 years agoFix compilation
BogDan Vatra [Sat, 2 Jun 2012 19:31:43 +0000 (22:31 +0300)]
Fix compilation

Add libsupc++ to QMAKE_LIBS, is needed for exceptions and/or rtti
LIBS_PRIVATE must come first in order to compile QtCore.

6 years agoAdd whole gnu stl library to QtCore
BogDan Vatra [Sat, 2 Jun 2012 17:48:27 +0000 (20:48 +0300)]
Add whole gnu stl library to QtCore

6 years agoFix Qt installation
BogDan Vatra [Tue, 29 May 2012 18:31:13 +0000 (21:31 +0300)]
Fix Qt installation

6 years agoSwitch to internal qt webkit
BogDan Vatra [Tue, 29 May 2012 14:18:39 +0000 (17:18 +0300)]
Switch to internal qt webkit

6 years agoMerge remote-tracking branch 'upstream/tags/v4.8.2' into alpha4
BogDan Vatra [Mon, 28 May 2012 18:21:38 +0000 (21:21 +0300)]
Merge remote-tracking branch 'upstream/tags/v4.8.2' into alpha4

Qt 4.8.2 Release.


6 years agoAdd Android native look&feel plugin
BogDan Vatra [Sun, 27 May 2012 18:50:09 +0000 (21:50 +0300)]
Add Android native look&feel plugin

This QStyle plugin uses the data extracted by Ministro on every device,
we can't hardcode any attributes(colors, fonnts, images, etc.) because
evey OEM, device, android version uses a different theme.

Currently the plugin supports only the most immportant controls.


6 years agoFix debugging
BogDan Vatra [Sun, 27 May 2012 10:45:57 +0000 (13:45 +0300)]
Fix debugging

6 years agoPrevent QEventLoop to go to sleep if events are in the queue
BogDan Vatra [Sat, 26 May 2012 17:21:08 +0000 (20:21 +0300)]
Prevent QEventLoop to go to sleep if events are in the queue

Fix qeventloop test.

BUG: 295278
FIXED-IN: alpha4
CCBUG: 295278

6 years agoNecessitasQtSDK -> necessitas
BogDan Vatra [Sat, 26 May 2012 13:09:53 +0000 (16:09 +0300)]
NecessitasQtSDK -> necessitas

6 years agoQt Android BroadcastReceiver wapper.
BogDan Vatra [Thu, 24 May 2012 10:00:00 +0000 (13:00 +0300)]
Qt Android BroadcastReceiver wapper.

Android BroadcastReceiver Java class into main Jar file to be loaded by Ministro.

Although it is very generic, C++ implementation is currently in Connectivity
module until a good way of making it public in main Qt repository is found.

I moved this file to mobility package, because I'm planning to split the
mobility and main packages into separate .jar files, and because this is used
only by mobility.

Many thanks to Lauri Laanmets <lauri.laanmets@proekspert.ee> for this work

6 years agoAccess android assets using "assets:/" schema.
BogDan Vatra [Wed, 23 May 2012 13:05:16 +0000 (16:05 +0300)]
Access android assets using "assets:/" schema.

6 years agoFix imsi function.
BogDan Vatra [Wed, 23 May 2012 09:37:27 +0000 (12:37 +0300)]
Fix imsi function.

Fix: https://sourceforge.net/p/necessitas/tickets/91/

6 years agoAllow user Java/C++ interaction
BogDan Vatra [Wed, 16 May 2012 06:11:31 +0000 (09:11 +0300)]
Allow user Java/C++ interaction

This removes everything in src/android/cpp. qtmain_android.cpp is no more
and is now integrated into src/plugins/platforms/android/src/androidjnimain.cpp.
It seemed fitting to integrate startQtApp() into the same file as
pauseQtApp() and resumeQtApp(). (Additionally this removes redundant copied
code, and simplifies how necessitas projects work and are built.)

This doesn't support using JNI with bundled libs. We have to be careful to
load certain bundled libs (maybe only the plugin .so) in the delegate class loader,
so I could break certain apps by making such a switch. Need a way to categorize
the type of bundled lib, in order to decide which class loader to use.

Fix https://sourceforge.net/p/necessitas/tickets/140/

Many thanks to Tyler Mandry <tmandry@gmail.com> for this patch.

6 years agoAssets virtual filesystem do not handle directories correctly
BogDan Vatra [Tue, 15 May 2012 11:45:21 +0000 (14:45 +0300)]
Assets virtual filesystem do not handle directories correctly

For now on android assets will be handled as any qt resources,
so the filename must starts with ":/" or "qrc:/".

Fix: https://sourceforge.net/p/necessitas/tickets/120
This change should be fully backward compatible.

6 years agodocs: more tweaks to offline style
Daniel Molkentin [Wed, 25 Apr 2012 15:13:21 +0000 (17:13 +0200)]
docs: more tweaks to offline style

Change-Id: I50a51da61379a57e0b22785caf11874752ec3bf8
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agodoc: use hooks introduced to qdoc for correct prev/next disambiguation.
Daniel Molkentin [Wed, 25 Apr 2012 15:03:06 +0000 (17:03 +0200)]
doc: use hooks introduced to qdoc for correct prev/next disambiguation.

Change-Id: I076839b146e2c3f92c884fc932f0ace54d5b3545
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agoqdoc: Disambiguate prev and next links in html source
Daniel Molkentin [Wed, 25 Apr 2012 14:48:29 +0000 (16:48 +0200)]
qdoc: Disambiguate prev and next links in html source

Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agoAdd icons for previous and next page.
Daniel Molkentin [Wed, 25 Apr 2012 12:22:37 +0000 (14:22 +0200)]
Add icons for previous and next page.

Change-Id: I3b16c70b4742a942ceec2035c46618ebc63b697f
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agodocs: fix conflicting resource file names
Daniel Molkentin [Wed, 25 Apr 2012 12:21:51 +0000 (14:21 +0200)]
docs: fix conflicting resource file names

Change-Id: I10bd6abe214507f663cc7c6a0b3a6f3c69668360
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agoQDoc: Remove the text around previous and next page links.
Casper van Donderen [Thu, 19 Apr 2012 19:34:42 +0000 (21:34 +0200)]
QDoc: Remove the text around previous and next page links.

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

Change-Id: I7bf46623b3bce6b02067127338a1235861449e64
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agoImproved detection of libcrypto and libssl.
Niels Weber [Fri, 20 Apr 2012 12:31:34 +0000 (14:31 +0200)]
Improved detection of libcrypto and libssl.

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

Task-number: QTBUG-25398
Change-Id: I37164638890586947d07670d8a59fc53a84f9c42
(cherry-picked from commit 8643e1992f6c62983345f89d793742b3449a69ea)
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoAdd out-of-memory checks to QImage
Pauli Jarvinen [Wed, 25 Apr 2012 12:02:51 +0000 (15:02 +0300)]
Add out-of-memory checks to QImage

Some of the methods of QImage crashed on out-of-memory situation as
they referred to null pointer if creation of a new QImage instance had
failed. Many cases like this were already fixed by commit
a041e4eca3467c1baa6245b6fb47def127f30f41 which was a fix for
QTBUG-1985, but few cases still remained. Now, all the lines creating a
new QImage instance in qimage.cpp have been gone through and sanity
checks have been added where it was necessary to avoid immediate

Task-number: ou1cimx1#994957
Change-Id: I1f07e8890bc91de18af075be73b1a06c667f3776
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
6 years agoOff-by-one-line error in QVGPaintEngine::drawImage
Murray Read [Mon, 23 Apr 2012 11:27:35 +0000 (12:27 +0100)]
Off-by-one-line error in QVGPaintEngine::drawImage

QVGPaintEngine::drawImage(const QPointF &pos, const QImage &image) uses
vgWritePixels if possible, and when the QImage is loaded from some file
types, its lines are inverted, stored from bottom to top in memory.

For inverted images, the image data pointer passed to vgWritePixels
should be pointing at the start of the last line. However drawImage was
actually passing a pointer to after the last line. This has undefined
results, but in practice you either get the image contents drawn one
line too high with the top line missing and and extra garbage bottom
line, or you can also get a crash if beyond the last line is not
readable memory.

Fixed by correcting the pointer passed to vgWritePixels to point to
the start of the last line for inverted images.

Task-number: ou1cimx1#996894
Change-Id: I1cf5b976acc18adceec1e14633f8779441faa056
Reviewed-by: Jani Hautakangas <jani.hautakangas@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
6 years agoSymbian: fix symbian deffiles
Pasi Pentikainen [Mon, 23 Apr 2012 13:28:32 +0000 (16:28 +0300)]
Symbian: fix symbian deffiles

Absent removed and freeze added exports caused by change
If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2 "Moved qmljs_debug_arguments
to QCoreApplication" (commit 8599a0e6397391634ee52197e164f6b7121f9a4d).

Change-Id: I6974d1f38c233b2143fe2e4e59b730b2bab475dc
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoFix QThread start failure due to bad thread name on Symbian
Juha Kukkonen [Fri, 20 Apr 2012 12:20:39 +0000 (15:20 +0300)]
Fix QThread start failure due to bad thread name on Symbian

RThread::Create() deems a thread name to be invalid, if it contains
any of the characters: "*", "?", ":" or character is outside
0x20 - 0x7e range. This matches to the logic in User::ValidateName()
that is used by RThread::Create() to validate thread name.
In addition, maximum thread name length is 80 character on Symbian.

It was possible that thread name contained e.g. colon that caused
RThread::Create() to fail with KErrBadName (-28).

Fix ensures that thread name contains only allowed characters.

Task-number: ou1cimx1#996187
Change-Id: Ie6dd8c60bfed4e2f6cc48607ff0ff940d9cdae8a
Reviewed-by: Murray Read <ext-murray.2.read@nokia.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
6 years agoIntegrate Blackberry Platform Services (BPS) with Qt event loop.
Jeff Kehres [Fri, 23 Mar 2012 14:43:44 +0000 (10:43 -0400)]
Integrate Blackberry Platform Services (BPS) with Qt event loop.

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

Backport of qtbase 0723e14699704c35d5d61fa7f5e9f3bdbb378afa

Change-Id: Ie0d66e7f9b9984ad3acff61f01665a2b90ef40db
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
6 years agoWindows - "bypass proxy for local..." also affects IP addresses
Shane Kearns [Fri, 20 Apr 2012 14:04:29 +0000 (15:04 +0100)]
Windows - "bypass proxy for local..." also affects IP addresses

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

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

Change-Id: I0842732832a7795112be029d923ed168edc008d6
(modified version of fffc900f78a191970c4eebced9c1af016a9ea6f4 in QtBase)
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoQSqlQueryModel::fetchMore() documentation fix
Mark Brand [Sun, 22 Apr 2012 21:17:33 +0000 (23:17 +0200)]
QSqlQueryModel::fetchMore() documentation fix

Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
cherry-picked from qt5/qtbase: 508a90302b5bd2a1b228c62d1a1b24a3e66d24a9
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
6 years agoDo not force OpenGL sample buffers on in the qnx qpa plugin
Sean Harmer [Mon, 23 Apr 2012 14:44:06 +0000 (15:44 +0100)]
Do not force OpenGL sample buffers on in the qnx qpa plugin

Backport of 4c0289c337f7793ec2f6b65bb3493f7299f8e4ef from qtbase

Change-Id: I871629356adf081197bc89e9f28801e5da517c5e
Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com>
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
6 years agoQHttpNetworkConnectionChannel: Warn if bytesAvailable and no reply
Martin Petersson [Mon, 23 Apr 2012 10:12:18 +0000 (12:12 +0200)]
QHttpNetworkConnectionChannel: Warn if bytesAvailable and no reply

If there are no bytesAvailable and no reply then the channel
can be closed without any need for this warning.

Task-number: QTBUG-9315

Change-Id: Idd461a38ea932305cc227dbd68b9af61b7e855d2
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoFix IPv6 address returned from QUrl::host
Shane Kearns [Fri, 20 Apr 2012 16:34:34 +0000 (17:34 +0100)]
Fix IPv6 address returned from QUrl::host

When passing an IPv6 address through QNetworkProxyQuery, it
is stored in a QUrl internally.
There was a bug in QUrl where it strips the [] surrounding an
IPv6 address only if they were present in the input, otherwise
it added them.
Now the behaviour is the same as Qt5 ([] are always stripped).

Change-Id: I42e020ce30d18a4108f1dd4428809fed07991680
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoUpdate QSettings and Mac OS X documentation with App Store information
Pasi Matilainen [Tue, 17 Apr 2012 12:58:20 +0000 (15:58 +0300)]
Update QSettings and Mac OS X documentation with App Store information

Add information about changing the location of global Qt settings to
QSettings documentation, and general information about submitting Qt
apps to the Mac App Store to the "Qt for Mac OS X - Specific Issues"

Task-number: QTBUG-16549
Change-Id: Ic0210e8f4d3c3f6369032abd5c1e214b4200b179
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
6 years agoFix annotation processing for qtTypeName
Martin Gräßlin [Sun, 22 Apr 2012 08:21:30 +0000 (10:21 +0200)]
Fix annotation processing for qtTypeName

An old annotation was incorrectly ignored and not recognized
as the deprecated annotation causing the tool to exit instead
of printing out a warning and returning the type name.

Change-Id: I703933f1f75ca37e908b095a2bde803226fd01a7
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
6 years agoUpdate com.trolltech -> org.qtproject in the bootstrapped tools
Thiago Macieira [Thu, 29 Mar 2012 14:14:12 +0000 (11:14 -0300)]
Update com.trolltech -> org.qtproject in the bootstrapped tools

The tools will now generate the new org.qtproject annotations only,
matching the XML generator in the library. They accept both types of
annotations as input though -- and will generate a warning about the
older one.

This commit should be backported to Qt 4, so XML files can start to be

Task-number: QTBUG-23274
Change-Id: If298c342ab4774cbca1be1898a01af8b46e80446
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
(cherry-picked from commit f18a6c5fb569ab93e86ca4b75301a7495ba17768)

6 years agoFinish cleaning up com.trolltech -> org.qtproject in QtDBus
Thiago Macieira [Thu, 29 Mar 2012 14:11:03 +0000 (11:11 -0300)]
Finish cleaning up com.trolltech -> org.qtproject in QtDBus

Lots of uses of the annotations and error names, plus a bunch of local
unit test names (including one file that had to be renamed).

The meta object generator is updated to support both the old and new
names. That means some references to com.trolltech *must* remain in the
source code.

Task-number: QTBUG-23274
Change-Id: Icc38ae040232f07c437e7546ee744a4703f41726
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Lorn Potter <lorn.potter@nokia.com>
(cherry-picked from commit e02a144a3c8e7858d879ac2d0038bc7d00906ae6)

6 years agoMoved qmljs_debug_arguments to QCoreApplication
Rafael Roquetto [Mon, 26 Mar 2012 18:55:58 +0000 (11:55 -0700)]
Moved qmljs_debug_arguments to QCoreApplication

Enable the use of the QML debugger without QtGUI
Based on Qt5's 9a096d9e.

Change-Id: If97502bc5367e0faadfaf3bbe70b0c89ef2c75c2
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
6 years agoReduce virtual address space use by JavaScriptCore on Symbian
Murray Read [Tue, 17 Apr 2012 15:35:49 +0000 (16:35 +0100)]
Reduce virtual address space use by JavaScriptCore on Symbian

JavaScriptCore is reserving 128MB address space for each instance
of JSGlobalData that is created in an app. Eg there is one per
QDeclarativeView, via QDeclarativeEngine, via QScriptEngine.
This can contribute to the app running out
of address space and then crashing.

The AlignedBlockAllocator is modified to be a process singleton so that
all JSGlobalData objects share the same instance.
Now there is only one 128MB address space reservation.

Task-number: ou1cimx1#993804
Change-Id: I9e8702810541905d5e9be197a5f6a9fe8e9bd0c5
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
Reviewed-by: Pasi Pentikäinen <ext-pasi.a.pentikainen@nokia.com>
6 years agofix static library names when generating .pc files for pkgconfig
Mark Brand [Thu, 19 Apr 2012 12:48:34 +0000 (14:48 +0200)]
fix static library names when generating .pc files for pkgconfig

c354d16cc64cf516a0b5149cdc9ef74de096a998 added the version extension
which only occurs on the DLL import library.

cherry-picked from qt5/qtbase 8e053a5dfc9b4c8f100b1e77335439774f52fc61
Change-Id: Ie913adf039d7f3a9aadf43f4af014289a8aeacbe
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
6 years agoFix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()
Yan Shapochnik [Wed, 11 Apr 2012 15:29:43 +0000 (11:29 -0400)]
Fix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()

Windows API call to SQLGetStmtAttr() attempts to place an 8 byte value
into the isScrollable variable which of type SQLINTEGER which is a long
and is 32 bit on Windows even when the driver is compiled for 64 bit.
Changing the isScrollable to and 8 byte SQLULEN type.

Task-number: QTBUG-25256
Change-Id: I1aae0b306e8d1ff5fc3b293b3e9ddd40546b85ad
Reviewed-by: Andy Shaw <andy.shaw@digia.com>
Reviewed-by: Janne Anttila <janne.anttila@digia.com>
Reviewed-by: Honglei Zhang <honglei.zhang@nokia.com>
6 years agoFix build with QT_NO_WARNING_OUTPUT
Andy Shaw [Tue, 17 Apr 2012 21:20:59 +0000 (23:20 +0200)]

When defining QT_NO_WARNING_OUTPUT then qWarning() is not available so
it should be defined in the same manner as qDebug() in this context
which is as QNoDebug.

The cases in QtNetwork are changed to use qWarning("....") to avoid
having to add in an extra include of QDebug just so that qWarning() is
declared in the QT_NO_WARNING_OUTPUT case.

Task-number: QTBUG-25308
Change-Id: I4960d8943e805697d4c05cc6988306e5c25fc2bb
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
6 years agoFixed networkproxy build under WinCE
Bjoern Breitmeyer [Mon, 16 Apr 2012 12:40:44 +0000 (14:40 +0200)]
Fixed networkproxy build under WinCE

The used functionality is partially not available under WinCE.
qnetworkfunctions_wince.h encapsulates the needed extra symbols.
It only needs to compile as the functions are loaded dynamically.

Change-Id: Ieb9010d4f6c7f94d39918b869ac503976e094e49
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
(cherry picked from commit 0e317af13f24d88a88c41f5efbd3fe9180ec6bee)
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
6 years agomkspecs: Rename freebsd-g++40 to freebsd-g++46.
Raphael Kubo da Costa [Tue, 17 Apr 2012 17:53:37 +0000 (14:53 -0300)]
mkspecs: Rename freebsd-g++40 to freebsd-g++46.

lang/gcc40 was removed from FreeBSD's ports tree in 2007, and the
lang/gcc port, which provides a stable GCC version newer than the one in
the base system, is currently pointing to the 4.6 series.

Cherry-picked from c7b52e2a2a46047b7b6bca74a39c81cf43f1c864 to

Change-Id: I085e8495d449f47c1cfcf74e7f6511b2a8e3caa1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agodirectfb: Use QPlatformPixmap::fromFile for Qt resources
Holger Hans Peter Freyther [Mon, 23 Jan 2012 12:49:35 +0000 (13:49 +0100)]
directfb: Use QPlatformPixmap::fromFile for Qt resources

Move to fromFile to load Qt resources for two reasons. The
first is that ::fromData creates a QBuffer on our raw data
and is passing that to the QImageReaders. Right now we there
is a QFile -> QByteArray -> QBuffer transition that wastes
cycles. The other reason is that QPlatformPixmap::fromData
did/does not check if the decoded image is null and might
cause a crash because of that.

Change-Id: I800bfe4cd9b5d6a0d3531ed33f4228770703e94f
Original-Id: I7cb92d84874323e7205ab28883cc0fe9ecca1e27
Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
6 years agoBump Qt version to 4.8.2
aksalova [Tue, 17 Apr 2012 13:42:49 +0000 (16:42 +0300)]
Bump Qt version to 4.8.2

Change-Id: Iecae324b1ae00c0d6fb6ed36a8f4a27f51a31d07
Reviewed-by: Jason McDonald <jason.mcdonald@nokia.com>
Reviewed-by: Simo Fält <simo.falt@nokia.com>
Reviewed-by: Juha Kukkonen <ext-juha.kukkonen@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
6 years agoSymbian: absent changed exports in symbian def-files
Pasi Pentikainen [Tue, 17 Apr 2012 08:04:09 +0000 (11:04 +0300)]
Symbian: absent changed exports in symbian def-files

Absent the exports changed by b84e033f2e77d108da413c00ee3d9f1636e8ad5b
to enable symbian building.

Change-Id: Ie3d715eea5ec2e955633ecfe019cb7fcaed9377d
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoSymbian: absent changed exports in symbian def-files
Pasi Pentikainen [Tue, 17 Apr 2012 09:30:52 +0000 (12:30 +0300)]
Symbian: absent changed exports in symbian def-files

Absent the exports deprecated by ed881474111d635bb90d3e08e9fb70c06d19d48b
to enable symbian building.

Change-Id: I775d0159743d7d61866d910eefa9a0f807c7feff
Reviewed-by: Jaakko Helanti <ext-jaakko.helanti@nokia.com>
Reviewed-by: Shane Kearns <shane.kearns@accenture.com>
6 years agoqmake vc(x)proj generator: don't create bogus directories
Joerg Bornemann [Mon, 16 Apr 2012 14:09:18 +0000 (16:09 +0200)]
qmake vc(x)proj generator: don't create bogus directories

When creating the temporary project object,
Option::output_dir must be adjusted temporarily.

Task-number: QTBUG-22788
Change-Id: Ibf8897a46b63f48b9e33d7e2168b09e559cecec7
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ac7dd2782f078e66c5240a07fff5a25cdf5ba61b)

6 years agoqmake/Win: fix incomplete generated version resource
Joerg Bornemann [Mon, 16 Apr 2012 09:11:19 +0000 (11:11 +0200)]
qmake/Win: fix incomplete generated version resource

Since Windows Vista the resource language must be included to
make the version information visible in Windows Explorer.

Two new variables have been introduced:
RC_LANG (default: 1033) - resource language
RC_CODEPAGE (default: 1200) - resource codepage

Task-number: QTBUG-23218
Change-Id: I29e102d19501e3b7a43d5096fc4806bc38a4d846
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 8987e5d2cb7b7816fd0002fd9ad939ab4f08971b)

6 years agoqmake vcxproj generator: fix handling of /MANIFEST:NO linker option
Joerg Bornemann [Mon, 16 Apr 2012 08:27:10 +0000 (10:27 +0200)]
qmake vcxproj generator: fix handling of /MANIFEST:NO linker option

Task-number: QTBUG-23513

Change-Id: I5dd6fb6fd7910e43acd28057133a3ad6613cfc1a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
(cherry picked from commit 31cfe5ca1b5006566051942254d977581a769e3e)

6 years agoqmake: QMakeProject::intValue added
Joerg Bornemann [Mon, 16 Apr 2012 09:07:02 +0000 (11:07 +0200)]
qmake: QMakeProject::intValue added

For variables that are supposed to contain a single int,
this method returns the numeric value.
Only the first value of the variable is taken into account.

Change-Id: Ifa11ba5ac044e0a4703a387a9bcf02043e4681d8
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit ee4d723ecc24e6be33b4c30f9693b7fdce79c767)

6 years agoqmake vcproj generator: unused variable removed
Joerg Bornemann [Mon, 16 Apr 2012 07:38:21 +0000 (09:38 +0200)]
qmake vcproj generator: unused variable removed

Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
(cherry picked from commit 65425be8fef69733fb1613e1487f3f6b4fb2d472)

6 years agomkspecs: Sync freebsd-g++40 and freebsd-g++.
Raphael Kubo da Costa [Mon, 16 Apr 2012 20:19:14 +0000 (17:19 -0300)]
mkspecs: Sync freebsd-g++40 and freebsd-g++.

Make freebsd-g++40 include gcc-base-unix.conf and g++-unix.conf and
eliminate a lot of duplicate definitions.

Cherry picked from 996672933a61016fdc0ec6d42d536986c5080ac5 to

Change-Id: Iae42f48b4f43e92567b30f340a25f0bd86c43463
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoDo not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.
Raphael Kubo da Costa [Mon, 16 Apr 2012 20:03:09 +0000 (17:03 -0300)]
Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.

According to FreeBSD svn r52802 from 1999 the -aout compiler option and
the QT_AOUT_UNDERSCORE trick were already obsolete.

Since the FreeBSD project itself only supports versions 7 and above
these days, the definition can be safely removed.

Cherry-picked from 874ebef4535e5ae43d917595f00edd365150cfd9 to

Change-Id: I93717e7c937f05b36580914608a3d2d1177ef7d6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoRemove the freebsd-g++34 mkspec.
Raphael Kubo da Costa [Tue, 17 Apr 2012 17:58:59 +0000 (14:58 -0300)]
Remove the freebsd-g++34 mkspec.

GCC 3.4 is older than the 4.2.1 in the base system, and should be
removed from the ports tree.

Besides, nobody in their sane mind would want to build Qt with such an
old compiler.

Cherry-picked from 0e8aabadf947926b78de140fabf8be789c96a9ac to

Change-Id: Ie739d839f1b621aeda693ae6f6a78909a557f3dd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoDo not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.
Raphael Kubo da Costa [Mon, 16 Apr 2012 19:53:52 +0000 (16:53 -0300)]
Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.

QT_SOCKLEN_T was being redefined depending on whether FreeBSD was < or
>= 4, branched in early 1999.

FreeBSD < 7 is not supported by the upstream project anymore, so we
can simplify the code and rely on the QT_SOCKLEN_T definition in
common/posix/qplatformdefs.h instead.

Cherry-picked from 1afad60e6030064fee772c37e2647ae8c891ac2f to

Change-Id: I9883755070d2731b12b1113def17ca217d510d6a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
6 years agoRefactor navigator event handling
Kevin Krammer [Thu, 12 Apr 2012 16:23:12 +0000 (18:23 +0200)]
Refactor navigator event handling

Separate PPS based navigator event notification handling and implementation
of the actual event handling.

Like the similar refactoring for screen events, this will allow to reuse the
same event handler class for BPS driven event processing.

Backport of 4fac40f8b0e7b2a6f5f41eb82196e8b197bc851a

Change-Id: I388c2fc503db0fb4be7b80f82e280cf2c8b73015
Reviewed-by: Robin Burchell <robin+qt@viroteck.net>