summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docs: more tweaks to offline stylev4.8.2Daniel Molkentin2012-04-261-2/+3
| | | | | Change-Id: I50a51da61379a57e0b22785caf11874752ec3bf8 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* doc: use hooks introduced to qdoc for correct prev/next disambiguation.Daniel Molkentin2012-04-262-6/+10
| | | | | Change-Id: I076839b146e2c3f92c884fc932f0ace54d5b3545 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* qdoc: Disambiguate prev and next links in html sourceDaniel Molkentin2012-04-261-2/+2
| | | | | Change-Id: I46d9bc685c00bb1fc1d79f75eaf8e1f56e57d744 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Add icons for previous and next page.Daniel Molkentin2012-04-265-22/+47
| | | | | Change-Id: I3b16c70b4742a942ceec2035c46618ebc63b697f Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* docs: fix conflicting resource file namesDaniel Molkentin2012-04-262-1/+1
| | | | | Change-Id: I10bd6abe214507f663cc7c6a0b3a6f3c69668360 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* QDoc: Remove the text around previous and next page links.Casper van Donderen2012-04-261-4/+4
| | | | | | | | | 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>
* Improved detection of libcrypto and libssl.Niels Weber2012-04-251-12/+51
| | | | | | | | | | | | 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>
* Add out-of-memory checks to QImagePauli Jarvinen2012-04-251-0/+11
| | | | | | | | | | | | | | | | 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 crashing. 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>
* Off-by-one-line error in QVGPaintEngine::drawImageMurray Read2012-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | 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>
* Symbian: fix symbian deffilesPasi Pentikainen2012-04-254-5/+8
| | | | | | | | | | | 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>
* Fix QThread start failure due to bad thread name on SymbianJuha Kukkonen2012-04-252-1/+156
| | | | | | | | | | | | | | | | | | 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>
* Integrate Blackberry Platform Services (BPS) with Qt event loop.Jeff Kehres2012-04-255-7/+388
| | | | | | | | | | | | | 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>
* Windows - "bypass proxy for local..." also affects IP addressesShane Kearns2012-04-252-2/+23
| | | | | | | | | | | | | | | | | 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>
* QSqlQueryModel::fetchMore() documentation fixMark Brand2012-04-241-1/+1
| | | | | | | Change-Id: If046e674abad9c2dcff934a2fdd80d4133e1f4ad Reviewed-by: Andy Shaw <andy.shaw@digia.com> cherry-picked from qt5/qtbase: 508a90302b5bd2a1b228c62d1a1b24a3e66d24a9 Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Do not force OpenGL sample buffers on in the qnx qpa pluginSean Harmer2012-04-231-1/+0
| | | | | | | | Backport of 4c0289c337f7793ec2f6b65bb3493f7299f8e4ef from qtbase Change-Id: I871629356adf081197bc89e9f28801e5da517c5e Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* QHttpNetworkConnectionChannel: Warn if bytesAvailable and no replyMartin Petersson2012-04-231-3/+4
| | | | | | | | | | 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>
* Fix IPv6 address returned from QUrl::hostShane Kearns2012-04-231-5/+4
| | | | | | | | | | | | 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>
* Update QSettings and Mac OS X documentation with App Store informationPasi Matilainen2012-04-233-0/+74
| | | | | | | | | | | 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" document. Task-number: QTBUG-16549 Change-Id: Ic0210e8f4d3c3f6369032abd5c1e214b4200b179 Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
* Fix annotation processing for qtTypeNameMartin Gräßlin2012-04-221-1/+1
| | | | | | | | | 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>
* Update com.trolltech -> org.qtproject in the bootstrapped toolsThiago Macieira2012-04-201-13/+40
| | | | | | | | | | | | | | | | 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 ported. 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)
* Finish cleaning up com.trolltech -> org.qtproject in QtDBusThiago Macieira2012-04-205-10/+20
| | | | | | | | | | | | | | | 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)
* Moved qmljs_debug_arguments to QCoreApplicationRafael Roquetto2012-04-206-23/+55
| | | | | | | | | 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>
* Reduce virtual address space use by JavaScriptCore on SymbianMurray Read2012-04-204-40/+88
| | | | | | | | | | | | | | | | | 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>
* fix static library names when generating .pc files for pkgconfigMark Brand2012-04-201-1/+2
| | | | | | | | | | 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>
* Fix for memory leak in 64 bit ODBC driver's call to SQLGetStmtAttr()Yan Shapochnik2012-04-201-1/+2
| | | | | | | | | | | | | 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>
* Fix build with QT_NO_WARNING_OUTPUTAndy Shaw2012-04-193-3/+7
| | | | | | | | | | | | | | 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>
* Fixed networkproxy build under WinCEBjoern Breitmeyer2012-04-192-0/+89
| | | | | | | | | | | | 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>
* mkspecs: Rename freebsd-g++40 to freebsd-g++46.Raphael Kubo da Costa2012-04-192-3/+3
| | | | | | | | | | | | 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 qt5/qtbase. Change-Id: I085e8495d449f47c1cfcf74e7f6511b2a8e3caa1 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* directfb: Use QPlatformPixmap::fromFile for Qt resourcesHolger Hans Peter Freyther2012-04-191-8/+2
| | | | | | | | | | | | | | 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>
* Bump Qt version to 4.8.2aksalova2012-04-1820-41/+120
| | | | | | | | 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>
* Symbian: absent changed exports in symbian def-filesPasi Pentikainen2012-04-182-2/+2
| | | | | | | | | 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>
* Symbian: absent changed exports in symbian def-filesPasi Pentikainen2012-04-181-227/+227
| | | | | | | | | 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>
* qmake vc(x)proj generator: don't create bogus directoriesJoerg Bornemann2012-04-171-0/+3
| | | | | | | | | | 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)
* qmake/Win: fix incomplete generated version resourceJoerg Bornemann2012-04-171-1/+11
| | | | | | | | | | | | | | | 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)
* qmake vcxproj generator: fix handling of /MANIFEST:NO linker optionJoerg Bornemann2012-04-171-0/+7
| | | | | | | | | 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)
* qmake: QMakeProject::intValue addedJoerg Bornemann2012-04-171-0/+13
| | | | | | | | | | 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)
* qmake vcproj generator: unused variable removedJoerg Bornemann2012-04-171-1/+0
| | | | | | Change-Id: Iaf8bb1772846001297e1a421c3860f5e4d090a35 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 65425be8fef69733fb1613e1487f3f6b4fb2d472)
* mkspecs: Sync freebsd-g++40 and freebsd-g++.Raphael Kubo da Costa2012-04-171-35/+6
| | | | | | | | | | | 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 qt5/qtbase. Change-Id: Iae42f48b4f43e92567b30f340a25f0bd86c43463 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not define QT_AOUT_UNDERSCORE in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-11/+0
| | | | | | | | | | | | | | 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 qt5/qtbase. Change-Id: I93717e7c937f05b36580914608a3d2d1177ef7d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Remove the freebsd-g++34 mkspec.Raphael Kubo da Costa2012-04-172-129/+0
| | | | | | | | | | | | | | 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 qt5/qtbase. Change-Id: Ie739d839f1b621aeda693ae6f6a78909a557f3dd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Do not redefine QT_SOCKLEN_T in freebsd-g++'s mkspec.Raphael Kubo da Costa2012-04-171-9/+0
| | | | | | | | | | | | | | | 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 qt5/qtbase. Change-Id: I9883755070d2731b12b1113def17ca217d510d6a Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* Refactor navigator event handlingKevin Krammer2012-04-170-0/+0
| | | | | | | | | | | | | 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>
* widgets/qpa: Fix painting to a fully transparent top level widgetHolger Hans Peter Freyther2012-04-161-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | QWS used to have a line to change the composite mode from SourceOver to Source for the top level widget. This wasn't used with QPA and I removed the internal DontSetCompositionMode in qtbase. It turns out that the QWS way is the most efficient one to initialize the background of the widget. The alternative is to have the QPlatformBackingStore::beginPaint always clear the entire to be painted area and then paint the background of the widget. The difference of painting each pixel once or twice is noticable on embedded platforms and in the range of one to two fps. This does come from Qt5. The change removes the hasFeature test as CompositionMode_Source is available for all backends. Reproduce the issue with: echo "QWidget {background: transparent}" > style.css ./examples/widgets/wiggly/wiggly -stylesheet style.css Task-number: QTBUG-24526 Change-Id: I3e3f8a263cd3cf9dec8628ca8a3bb28c70572121 Original-Id: Ica4c980bb3bf6eb87ddb5b510ac7493292d01543 Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com> Reviewed-by: Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com>
* qmake vc(x)project generator: fix VC++ Express detectionJoerg Bornemann2012-04-161-1/+3
| | | | | | | | | | | | | If VC++ 2010 Express and VC# 2010 Express are installed, then the installation path is written in two places into the registry. We're now filtering detected installations with the same installation path. Task-number: QTBUG-24956 Change-Id: I401430e7aa81d96c523d8172d2a2e9d40ebdb3ce Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> (cherry picked from commit 99a207436924aa1339f48ababa1490675c6a00d3)
* Fix symbol visibility warnings when building uic3Andy Shaw2012-04-161-0/+1
| | | | | | | | | When building statically we need to hide the symbols that would otherwise be exported so we add hide_symbols to the CONFIG Task-number: QTBUG-23035 Change-Id: I29245a6650fa81186085484d7b2b9150b89a1729 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
* Refactor navigator event handlingKevin Krammer2012-04-167-207/+348
| | | | | | | | | | | | | | | 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: I6896645aedd20e96fdabc7c49c7bd1d762de788f Reviewed-by: Sean Harmer <sean.harmer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
* Fix out of bounds use of QVector API.Stephen Kelly2012-04-133-6/+17
| | | | | | | | | | This is a regression introduced by commit d63910575949106f84dacf04abaa14fc866aa66b. Task-number: QTBUG-24965 Task-number: QTBUG-25140 Change-Id: Ice9d90ebb81dcc3c0bc166eeb8f77a0ad9d99476 Reviewed-by: David Faure <faure@kde.org>
* Fix crashes in QAccessibleTree::navigateFrederik Gladhorn2012-04-131-1/+7
| | | | | | | | It's a best practice to return 0 when the iface is invalid. Change-Id: I6dd70b53b975b10b75c246e6f8f7681da2bcb785 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>
* Accessible interface for QPlainTextEditJosé Millán Soto2012-04-133-8/+83
| | | | | | | Added QAccessiblePlainTextEdit, as an accessible interface for QPlainTextEdit Change-Id: If0269a49b9fcd1b3e9fcfd32fac912560df28f21 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
* Use parentheses in statement with && and ||.Frederik Gladhorn2012-04-131-1/+1
| | | | | Change-Id: I4f968559a7371b87343cb5825eb83b0099364cf2 Reviewed-by: Jan-Arve Sæther <jan-arve.saether@nokia.com>