summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Fix radial gradient shader compilation for OpenGL ES 2.0.Carsten Munk2013-12-052-4/+4
| | | | | | | | | Change highp to mediump. This qualifier is ignored on desktop, and mediump should be sufficient elsewhere. Task-number: QTBUG-35353 Change-Id: I79f0ed88717d45dada5dcb781e75b10e72db4bd0 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Doc: Fixed broken link to General Qt RequirementsNico Vertriest2013-12-051-1/+1
| | | | | | | | Link fixed for OpenSSL Task-number: QTBUG-34749 Change-Id: Ic72858c730400124fb3f09d887c827d93500338f Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix compilation for embedded Androidaavit2013-12-051-4/+4
| | | | | Change-Id: If42fd83a68543d59b5a3a6b89e2c402aa452b251 Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* qtbase: Fix build error on 64bit BigEndian platformsVicente Olivert Riera2013-12-051-2/+2
| | | | | | | | | | | | | | The functions fromBytesToWord() and fromWordToBytes() are called when building on 64bit BigEndian platforms. It fails because those functions are disabled on the source code. Enabling those functions for 64bit BigEndian platforms fixes the problem. Task-number: QTBUG-35228 Change-Id: I5ccacd4fb5051df05f67c8da879b3a9e49953861 Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Richard J. Moore <rich@kde.org>
* Prevent recursive resize events in QAbstractScrollAreaTor Arne Vestbø2013-12-052-2/+7
| | | | | | | | | | | | | During show() of a QAbstractScrollArea we might get resize events, which results in laying out the children of the scroll area. One of these children are the scrollbars, and raising them to the top means creating them, which in turn means creating all parents, including the abstract scroll area itself. Creating the abstract scroll area means creating a platform window, which might send synchronous resize events as a result of creating the window, and we end up recursing. Change-Id: I1a2813f03091d6c42e51834315835551cb2fd621 Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fixed a bug where toolbars sometimes could not be docked.Jan Arve Saether2013-12-051-2/+5
| | | | | | | Task-number: QTBUG-33839 Change-Id: I542fb894c31ce38509a70a71bd0ea1bc84bb2a03 Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
* iOS: Apply default geometry to platform window if not set on QWindowTor Arne Vestbø2013-12-051-1/+9
| | | | | | | | | | | | | | | | | If a platform window is created from a QWindow without setting a valid size or position on the QWindow, the platform window is expected to apply sane defaults. We use the baseclass initialGeometry() function for this, similar to other platform plugins. The default geometry unless otherwise set and/or calculated based on size hints is that of the screen's available geometry. An improvement to this is to detect whenever we apply the screen geometry, and also apply the appropriate window state, but that needs more testing. Change-Id: I02b12064ce6d55c04fe0cc2cd1d2816ca1113f40 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* iOS: Don't claim that windows with zero width and/or height are exposedTor Arne Vestbø2013-12-052-0/+7
| | | | | | | | | | | When sending expose events to Qt, Qt will ask us if we're exposed, and we need to tell it that we're not, so that clients will not try to makeCurrent on a CA layer that has a zero width and/or height. Note that this only works because we flush expose events. Change-Id: Idfbe03a2f35681084061376a3c650a8da027fda4 Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* Clear QCocoaGLContext's m_currentWindow when window is hidden.Gunnar Sletta2013-12-053-0/+14
| | | | | | Task-number: QTBUG-35363 Change-Id: I1b3d883ed10200af8a2d4188fb1725b36eb78022 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
* Doc: Add QJsonObject::const_iterator() to correct groupTopi Reinio2013-12-051-0/+2
| | | | | | | | | | | Make QJsonObject::const_iterator() part of the same doc group as the non-const variant. Also add a \since command with the correct value. Task-number: QTBUG-33052 Change-Id: I97fa2cc44dae93decf2b99a1384e37579b7dac46 Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Android: use binary name when using loadClass.BogDan Vatra2013-12-052-3/+3
| | | | | | | | QtAndroid::findClass uses loadClass methods to find Qt's java classes. The documentation says that we should use a binary name. Change-Id: I2146789235435b7052827cde58b7719b7d62dc1d Reviewed-by: Christian Stromme <christian.stromme@digia.com>
* Doc: Corrected link to Graphicsview ExamplesNico Vertriest2013-12-041-1/+2
| | | | | | Task-number: QTBUG-34749 Change-Id: I66251e4b40e2930b08ed4bd932aef60aae7ebaa4 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* QBBSystemLocale: Do not set fixed buffer size when reading pps objectsEl Mehdi Fekari2013-12-041-4/+19
| | | | | | | | | Set dynamically the buffer size when reading pps objects since a pps file size is not always fix. Change-Id: I48f80389161bfbce3342e53ceec0b13bb7df0e4c Reviewed-by: Tony Van Eerd <tvaneerd@blackberry.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Minimal plugin: Use a dummy font database for command line tools.Friedemann Kleint2013-12-045-8/+70
| | | | | | | | | | | | | | | | | Suppress warnings like: QFontDatabase: Cannot find font directory '...' - is Qt installed correctly? occurring for example when using qmlplugindump. Add option flags (similar to Windows plugin) to the integration class to be used for QT_DEBUG_BACKINGSTORE and other functionality. Add a dummy font database with empty populate() function to be used unless the debug flag for the backing store is used. Task-number: QTBUG-33674 Task-number: QTCREATORBUG-10685 Change-Id: I7eaff3025de12e6b0471a3430f986b0cd810e22c Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Report hardware acceleration in default manifestEskil Abrahamsen Blomfeldt2013-12-041-1/+1
| | | | | | | | | | | | | | | Qt applications require the "hardwareAccelerated" flag set on some devices or Android versions. The symptoms that this was missing was problems when handling orientation changes. When the target SDK version is >= 14, it is true by default, but for lower versions it is not. There is no reason to set this to false for a Qt application, since we don't use any of the unsupported 2D drawing operations in the documentation, so lets just set it to true for all applications. Task-number: QTBUG-35293 Change-Id: Ie131a52a2a3fc5a520d0c5dd5d64f79269e9b6b5 Reviewed-by: BogDan Vatra <bogdan@kde.org>
* Repack structs with more than one padding holeThiago Macieira2013-12-0311-63/+72
| | | | | | | | | | | | | | | | | | | | | | | | Sizes gained (measured on 64-bit systems) BezierEase: shrunk 8 bytes QRegExpCharClass: shrunk 8 bytes QRegularExpressionPrivate: shrunk 8 bytes QTimeLinePrivate: shrunk 8 bytes QUtcTimeZonePrivate: shrunk 8 bytes QTextStreamPrivate: shrunk 8 bytes QDirPrivate: shrunk 8 bytes QFileDevicePrivate: shrunk 8 bytes Not done: QRegExpEngine: 18 bytes in 6 holes (you deserve high memory usage if you're still using QRegExp) QTextBoundaryFinder: 8 bytes in 2 holes (public class) QIODevicePrivate: 6 bytes in 2 holes, but there's no gain in packing QProcessPrivate: too complex and my copy is modified QThreadData: awaiting change from Marc Change-Id: I2a388b5ce17dec0dafcef18ed2e80d0379aa7d1e Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* xcb qpa: initialize EGL for non-XLib buildsAndrew Knight2013-12-031-7/+8
| | | | | | | | Move the EGL initialization code outside of the XLib ifdefs, so it can be enabled for non-XLib builds as well Change-Id: Ie025551e4e99bb0b365f025356bd9725f4283b82 Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Effects also need to markDirtyOnScreen for native widgetsGunnar Sletta2013-12-031-2/+8
| | | | | | Task-number: QTBUG-33244 Change-Id: I95427b1fd6edaafe99738acfec28f6fd37b70cde Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* Use case insensitive comparison when checking platform plugin keys.Friedemann Kleint2013-12-0313-14/+13
| | | | | | Change-Id: Iff44698dcc941ca244b476f0e6c6a993f2ad75f3 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* Doc: invalid reference to Qt for Linux/X11Nico Vertriest2013-12-031-9/+7
| | | | | | | Task-number: QTBUG-34749 Change-Id: I8274e41bc4c29650b22bb6ca5da264687aa70e4a Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: fixed invalid referenceNico Vertriest2013-12-032-2/+2
| | | | | | | | | | Link to "Getting started with qmake" was invalid Task-number: QTBUG-34749 Change-Id: I782dc99f5182f2fe7661377eb82f35ebb50a46cf Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Respect the custom paper size settings on MacAndy Shaw2013-12-032-25/+53
| | | | | | | | | | | | | When the user added a custom paper size then it would be silently ignored when printing on Mac. This now ensures that it is respected when appropriate. [ChangeLog][Platform Specific Changes][OS X][QtPrintSupport] Respect the custom paper size settings when printing. Task-number: QTBUG-34700 Change-Id: I08afe24e0e67a50e9301abf4642c6f65bb0df1fe Reviewed-by: John Layt <jlayt@kde.org>
* Clear isOpenError flag on successful open callTobias Koenig2013-12-021-0/+1
| | | | | | | | | | | Clear the isOpenError flag in IBase driver if the QIBaseDriver::open() call was successful, otherwise a previous, unsuccessful open() call would block any further QSqlQuery::exec() calls on this database connection. Task-number: QTBUG-13435 Change-Id: Idc64e28cd63805a13f208702ec87dc1bf6b98798 [ChangeLog][QtSql][QIBASE] Fixed the internal state of IBase driver after a failed open call Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Support custom port number in IBASE SQL driverTobias Koenig2013-12-011-2/+6
| | | | | | | | | | Let the IBASE SQL driver use the custom port number that is set via QSqlDatabase::setPort(). Task-number: QTBUG-33345 Change-Id: Ib55b32c8a318d82038d66e8645b416e36dad3edf [ChangeLog][QtSql][QIBASE] Support custom port number Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix compilation of OCI driverTobias Koenig2013-12-011-0/+1
| | | | | | | | | | | Add missing feature enum in switch statement to avoid warning that would lead to compilation error when compiled with -Wall. Task-number: QTBUG-34794 Change-Id: Ia2f70f27ecbb7a7dfc9d36d261103ff49b6c5e4b [ChangeLog][QtSql][QOCI] Fix compilation Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Fix evaluation of SQLite driver optionsTobias Koenig2013-12-011-10/+18
| | | | | | | | | | | | | | Ensure that the options, which are passed to the SQLite driver, are evaluated in the correct order and do not overwrite each other. According to http://www.sqlite.org/c3ref/open.html the SQLITE_OPEN_READONLY and (SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE) are mutual exclusive, but SQLITE_OPEN_URI can be combined with both of them. Task-number: QTBUG-35186 [ChangeLog][QtSql][QSQLITE] Fixed evaluation of driver options Change-Id: I8e74fe1ce43b9118b15f7b13fc71670bdcd73f68 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* Detect posix_fallocate at configure timeFatih Aşıcı2013-12-011-0/+1
| | | | | | | | | | Testing feature macros is not enough for uclibc. Fixes build of the built-in sqlite3 with uclibc <= 0.9.33.2. Later versions will have posix_fallocate(). Change-Id: I918a52777ac63624635802221effc6b86fa2269c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
* BlackBerry: properly clean up QFileDialog filesRafael Roquetto2013-12-011-0/+3
| | | | | | | Task-number: QTBUG-34983 Change-Id: I1af5c6a9c43eba77394b11d31d1d223af8bc221f Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* BlackBerry: remove unused variableRafael Roquetto2013-12-012-3/+2
| | | | | | | | | m_result is not used by qqnxfiledialoghelper_bb10.cpp, only by its playbook counterpart. Change-Id: I4fae924283560703393c5313527c5c9c2005d35b Reviewed-by: Tobias Koenig <tobias.koenig.qnx@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* BlackBerry: Fix QFileDialog show()/hide()Rafael Roquetto2013-12-012-5/+12
| | | | | | | | | QFileDialog::show() no longer worked after the dialog had already been shown and hidden before. Task-number: QTBUG-34983 Change-Id: I7300374b74805308e0966db7b3545e5fd8470465 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* qdbusxml2cpp: Use the mtime on the input XML to avoid needless source changes.Robin Burchell2013-11-301-3/+8
| | | | | | | | These can cause rebuilds unnecessarily when repeatedly running qdbusxml2cpp. Change-Id: I902954d4bed6fe68802183e51d82700fe30af437 Reviewed-by: Mathias Hasselmann <mathias.hasselmann@kdab.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* QPrinter - Simplify setting manual propertiesJohn Layt2013-11-292-59/+33
| | | | | | | | Change from a list to a set and define a utility method to both set the property and store that we have set it. Change-Id: I0cf13f1b0e90942424744316d0d3f699b9ead144 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* QPrinter - Fix OutputFormat when no printersJohn Layt2013-11-292-72/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | Currently the QPrinter constructor, setOutputFormat() and setPrinterName() make bad assumptions about the availability of printers when configuring NativeFormat which can lead to inconsistent print engine set-ups leading to crashes in the print dialog, especially on Windows where a valid DEVMODE is needed. This change cleans up the init and methods to ensure NativeFormat can only ever be set if we have both a valid plugin and a valid printer, if not the PdfFormat is used. One side-effect of this is that it is now impossible to set an invalid printer name via QPrinter (but still able to be done via QPrintEngine if really needed). Also if no default printer is set then use the first available one. This also fixes a bug where setting a new printer name on Windows reset all the saved settings. [ChangeLog][Important Behavior Changes] QPrinter no longer allows you to set an invalid printer name. Task-number: QTBUG-34345 Task-number: QTBUG-26008 Task-number: QTBUG-26430 Change-Id: I19737e4209d8c8df5817ea83246b3dd0c483ee85 Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Lars Knoll2013-11-297-10/+80
|\ | | | | | | refs/staging/stable
| * Merge remote-tracking branch 'origin/release' into stableSimon Hausmann2013-11-297-10/+80
| |\ | | | | | | | | | Change-Id: I2e2bf789b0fe8442ed623bc0c8aef591235cdabe
| | * Docs: add important QWheelEvent::phase() related notesJ-P Nurmi2013-11-291-0/+15
| | | | | | | | | | | | | | | | | | | | | Change-Id: I4901b96b44b7c1179e678689af5962cb4570d50d Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | * Doc: corrected invalid ref. to output iteratorsNico Vertriest2013-11-291-4/+4
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-34749 Change-Id: I7abd504b6081e84a8e67c7957e13d402999e9d38 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| | * iOS: Update screen properties when we trigger statusbar changes on iOS7Tor Arne Vestbø2013-11-291-5/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | Ideally we'd have a callback from iOS when this happens, so we can also react to changes done outside of Qt, but willChangeStatusBarFrame and friends do not seem to give us what we want. Change-Id: I686ce7950395a83c4257372363c773a95c3935ed Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * iOS: Forward [UIApplicationDelegate handleOpenURL:] to QDesktopServicesTor Arne Vestbø2013-11-293-0/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The user may use QDesktopServices::setUrlHandler() in combination with the appropriate Info.plist keys (CFBundleURLTypes, CFBundleURLSchemes) to react to URL requests from other applications. This is among other things useful for handling OAuth authentication from applications such as Dropbox. See: https://www.dropbox.com/developers/core/start/ios We protect against recursive URL opening, but an application may still redirect a request to open a URL by opening another URL, eg a website. Task-number: QTBUG-35201 Change-Id: I9f1d246206c5594b1b65bb11fa98c6bcdefc443e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
| | * Fix invalid memory read when shutting down QML applicationsSimon Hausmann2013-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As the last line in the QObject destructor, we call setParentHelper(0) to remove ourselves from the parent. In the process of that we also initiate the QML parentChanged callback. The first thing that parentChanged callback used to do (but now does it too late, after 26350b5ceafa0ade1328037f6234a7d288eb8f48 in qtdeclarative) is to check if the object was deleted and then return. We could re-introduce the check there, but I think it's cleaner to not bother calling the callback on a dead object in the first place. Change-Id: Ia4d43b65a9b3744a451b4c312a2d6f9c0e3b67dc Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | | Cocoa: avoid a crash in QCocoaDragLiang Qi2013-11-292-1/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | NSEvent needs to be copied. Reference: http://lists.apple.com/archives/cocoa-dev/2007/Dec/msg00678.html Task-number: QTBUG-33533 Change-Id: I73709545573e59aab6875a8c3dd903cb171e858f Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* | QSystemSemaphore: Clear error after successful operationKonstantin Ritt2013-11-284-2/+8
| | | | | | | | | | | | Change-Id: I5c1021b2329439e3aefaa1c0d9c0b8a298d285de Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* | Streamline font match() function.Friedemann Kleint2013-11-281-10/+6
| | | | | | | | | | | | | | Determine writing system before executing the loop. Change-Id: I6c462bdef4d70860e76c7cc9d939e3e92983b173 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Remove unused variable in font match() function.Friedemann Kleint2013-11-281-3/+0
| | | | | | | | | | Change-Id: I0752901556a44c3b7fb4440e3ba0ca88559c1fe2 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com>
* | Move the glxfbconfig configtest to qpa and rename it to glxJorgen Lind2013-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | We require glx version 1.3 which is where fbconfig is first defined. Also make use of the configure test and report the glx status. GLX support should always take precedence when compiling the xcb backend Change-Id: Ie46834210bf5cd2ac4006ff08379e0d3434ffa2b Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
* | Add new configure parameter for Xcb-XlibAndrew Knight2013-11-281-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | This adds a new configuration parameter, xcb-xlib, which allows overriding the configure test for that existing configuration option. The use of xcb-xlib in the xcb platform plugin becomes the preferred path for non-OpenGL ES 2 builds, while the EGL codepath is used otherwise. This has the advantage that EGL can be used with Desktop OpenGL if Qt is configured with -no-xcb-xlib. Change-Id: I5018e31fe0399b94f020c671eff9414d00431c44 Reviewed-by: Jørgen Lind <jorgen.lind@digia.com>
* | Remove stale xcb_dri2 code in QXcbNativeInterfaceJorgen Lind2013-11-282-3/+1
| | | | | | | | | | Change-Id: Ifc8dc8d84fc60b70f8a49282dfe32cd248bef9ba Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* | Merge "Merge remote-tracking branch 'origin/release' into stable" into ↵Frederik Gladhorn2013-11-289-16/+20
|\ \ | | | | | | | | | refs/staging/stable
| * | Merge remote-tracking branch 'origin/release' into stableSimon Hausmann2013-11-289-16/+20
| |\| | | | | | | | | | Change-Id: I860404a1ef18c88a968a9eded405bb67967047b9
| | * Revert "Store the font's scalability in QFontEngine."Yoann Lopes2013-11-273-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 65b12fbdb13d34c61bcadd5cc8fd6ee28a8dfafd. QFontEngine is not always loaded from QFontDatabase, resulting in the flag not being set. Change-Id: I39bc5bd4a8dea153d191cfc55f4324195f75f64c Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 06:13:16 +0000