summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* QNativeSocketEngine: allocate more space for the ancillary dataAlex Trotsenko2015-10-211-1/+5
| | | | | | | | | | As a corner case on BSD systems, we use IP_RECVIF control message to retrieve an interface index of the received datagram. Take care about sockaddr_dl structure, while calculating a size of the ancillary data buffer. Change-Id: I1c113d390a4929489c4c5858847b6262f1baa204 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Improve file handling in test of QSettings.Friedemann Kleint2015-10-211-64/+29
| | | | | | | | | | | | | | | | - Avoid duplication of slashes and use static variable for the const part in settingsPath(). - Do not run expensive cleanup twice in init()/cleanup() as was before by moving the code into a separate cleanupTestData() function called from cleanup() and initTestCase(). - Use QDir::removeRecursively() (which should be able to deal with readonly files, etc after 26bcc0565f49c731a4f288f93f04056ca20136a5 ) instead of system calls or the special removePath() function for CE/RT. - Switch QStandardPaths into test mode. Change-Id: Idcde2d17020eae1ea43e448266e3940c06f174ef Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* Add support for TEXTURE_EXTERNAL_OES in the internal texture blitterLaszlo Agocs2015-10-213-93/+175
| | | | | | | | | | Assuming that the target is always GL_TEXTURE_2D is not going to be sufficient when working with EGLStreams for example where GL_TEXTURE_EXTERNAL_OES is a must. The blitter is now changed to support multiple programs so other targets can easily be added as well in the future, if necessary. Change-Id: I247d30600222fb5af6305ed5d9740baa5e43e83e Reviewed-by: Louai Al-Khanji <louai.al-khanji@theqtcompany.com>
* Several cases of s/decelerating from/decelerating to/.Edward Welbourne2015-10-212-13/+13
| | | | | | | | | The relevant easing curves all start out fast and end stationery; so it's at the *end* that they attain zero "velocity", so they're decelerating *to* zero, not from it. Change-Id: I69874c46c8d42f185ff815295c4470a195cc43ae Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* WinRT: Fix InputPanel on Windows 10Maurice Kalinowski2015-10-212-17/+13
| | | | | | | | | | Check for MSVC2015 to enable usage of IInputPane(2). Move object construction to the XAML Thread, otherwise instantiation will fail when running on desktop. Task-number: QTBUG-44494 Change-Id: I816230cc5b0def796e86e6c6bb05a552a4e59d1b Reviewed-by: Andrew Knight <andrew.knight@intopalo.com>
* qdoc: Minor optimizationsTopi Reinio2015-10-212-62/+22
| | | | | | | | | Remove unnecessary type casts in qdocindexfiles.cpp, and reduce the amount of duplicate string literals used for generating QML documentation. Change-Id: Ia6d68a44fad14bd7414c0106e8752999830c93e8 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Doc: Update examplesinstallpath to include the repository nameTopi Reinio2015-10-2113-13/+13
| | | | | | | | | | | | The examplesinstallpath variable in .qdocconf files defines the path under QT_INSTALL_EXAMPLES where examples are found. To match the way examples are packaged in Qt 5.6, prefix each install path with the repository name. Task-number: QTBUG-48736 Change-Id: I6a35c94fdacaad21cd044411aba02027b9019300 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* Doc: Improve selection of offline template typeTopi Reinio2015-10-213-13/+7
| | | | | | | | | | | | | | | Qt 5.6 now includes a version of the offline documentation template with simplified CSS suited for rendering HTML with a QTextBrowser backend. Select the template in qt-html-templates-offline.qdocconf, instead of the higher-level qt-module-defaults-offline.qdocconf. This is better because many projects external to qt5 (including Qt Creator) do not use qt-module-* includes. This way, we can control the template selection for all projects from a config file. Change-Id: I766af422d829f3c9519c5a45093473175363d600 Reviewed-by: Martin Smith <martin.smith@digia.com>
* Place classes from private headers in the Qt_5_PRIVATE_API ELF versionThiago Macieira2015-10-202-1/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | This way, it's possible to tell which applications and libraries depend on the Qt private API and of which Qt library. Linux distributions can use this information to decide which applications need to be recompiled every time Qt itself is rebuilt. This is done by scanning all class and struct definitions in the private headers (we've already got the list from syncqt). I opted to add a new script instead of modifying syncqt because then this can run in parallel with the rest of the compilation, as opposed to during qmake time. Another advantage is that it catches modifications to the headers in between qmake executions. Since this is already Unix specific, it should be no problem to use Perl. This solution is limited to use of non-inline symbols of classes declared in private headers. It will not catch free variables (such as qsimd_p.h's qt_cpu_features), use of inlined functions or just plain use of a class/struct for accessing its data members. However, this is already better than nothing and should help Linux distributions quite a lot. And there's no way to catch the latter issue anyway. Change-Id: I049a653beeb5454c9539ffff13e3fff36400ebbd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* don't try to use relative rpaths on platforms that don't support itOswald Buddenhagen2015-10-201-1/+1
| | | | | Change-Id: I8224d429d71ccc829beb1addf592806d2edaa87b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* support relative paths in QMAKE_RPATHDIROswald Buddenhagen2015-10-205-10/+46
| | | | | | | | | | | | | | | | ... and make use of it in qt.prf. [ChangeLog][qmake][Unix] Added support for relative paths in QMAKE_RPATHDIR. Note that this technically breaks backwards compatibility, as relative paths were previously silently resolved against $$_PRO_FILE_PWD_. This was not documented and seems rather useless, so i'm not worried. Change-Id: I855042a8962ab34ad4617899a5b9825af0087f8a Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com> Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
* Add an automatic use of the ELF-versioned QtCore symbolThiago Macieira2015-10-203-1/+89
| | | | | | | | | | | | | | | | | | | | | | See the comment in the header for an explanation of what it does. This trick is enabled for every single .o that is compiled, unless QT_NO_VERSION_TAGGING is defined. The assembly expands to a COMDAT section, which is mergeable by the linker, so only one copy of the output is present in the ELF module. This is enabled only for Linux and x86 / x86-64 / x32 due to the requirement of writing assembly and relocations, so it needs to be tested on each platform, which I have not done. It might work on Solaris/x86, but again it requires testing. Support for other architectures requires different assembly output and relocations and can be added as needed, but they are not as important since this trick is has most value on desktop systems. Change-Id: I049a653beeb5454c9539ffff13e3ff5782a8cb86 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Rex Dieter <rdieter@gmail.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Update qversiontagging.cpp not to use too much assembler magicThiago Macieira2015-10-203-59/+56
| | | | | | | | | | | | | | | The only reason I had used them in the first place was because C preprocessor macros cannot call themselves recursively. But the magic was too magic and caused issues with some builds, so let's choose the safer option. Anyway, this solution now works for all ELF architectures, independent of the processor, whereas previously it was restricted to x86 and Linux/ FreeBSD. However, this does not apply to the assembly in qversiontagging.h. Change-Id: I42e7ef1a481840699a8dffff1404f032fc5cacb8 Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
* winrt: Avoid empty <Dependencies> section in manifest filesOliver Wolff2015-10-203-4/+6
| | | | | | | | | | If that section is there but empty, the manifest cannot be loaded using the App Manifest Designer in Visual Studio. Task-number: QTBUG-48648 Change-Id: I529eb2f2a690bececcf5c385b8f96e84ece363d6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* winrt: use correct winapi family defines in mkspecs and system detectionAndrew Knight2015-10-206-6/+6
| | | | | | | | WINAPI_FAMILY_APP is deprecated, so use WINAPI_FAMILY_PC_APP instead. Also, open up the phone partition for use on MSVC2015. Change-Id: I7476d71c31395b2914f5a1439e8088341976bf2f Reviewed-by: Maurice Kalinowski <maurice.kalinowski@theqtcompany.com>
* QLatin1String: add some nothrowMarc Mutz2015-10-201-24/+24
| | | | | Change-Id: I488fe7c4122febf46caa6487d92f61391edd41a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* msvc2015: Align compiler flags with rest of Qt buildMaurice Kalinowski2015-10-202-2/+2
| | | | | | | | msvc-desktop.conf does disable the exception warning for building all modules, so use the same set of compiler flags for building qmake. Change-Id: I97026f3cb78e656e8de76e1c8afe19cec6501499 Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
* [docs] QLatin1String: add some guidance as to when to use itMarc Mutz2015-10-201-0/+7
| | | | | | | Change-Id: I391be8bda3a5cb4873b89b437d2b76b1cd88261f Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Fix GL_VERSION parsing when using WGLLaszlo Agocs2015-10-201-9/+4
| | | | | | | | | | | | | | | | Unlike other platforms and the EGL path, this one tries to parse GL_VERSION on its own. Unfortunately it breaks for certain version strings: we cannot assume more than major.minor in the beginning and so looking for a second dot is wrong. For example, "2.1 Mesa 7.11-devel" is parsed as major "2", minor "1 Mesa 7" (result in 0), leading to a version of 2.0 instead of 2.1. To overcome this, use the common helper function in QPlatformOpenGLContext. Change-Id: I460f4276a3a06659b542e0c076ddc1ada3122907 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Android: Make sure we deliver all queued actions when we resume.BogDan Vatra2015-10-202-28/+29
| | | | | | | | | When the activity is paused, all runOnUi actions are dropped :(, this patch ensures that no action is lost no matter what. Task-number: QTBUG-45526 Change-Id: I61db4f73b0d2da47bf71a1324dc40b90dab01e81 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* Android: Warnings--BogDan Vatra2015-10-201-1/+1
| | | | | Change-Id: I79bef1e5e73fedf2bae61d6cfc9634a14958ba0e Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
* QFileSystemModel: cleanup sortChildren()Maks Naumov2015-10-201-10/+10
| | | | | | | | Second value of QPair is not used. And add reserve for "indexNode->visibleChildren" list before pushing. Change-Id: Ia002130c929f71e0802f73f4c0694fd2887b4c91 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* Fix compilation on OSX when building in a namespace.Erik Verbruggen2015-10-201-0/+3
| | | | | Change-Id: I377d9ffe95b72e098a91e6da564b59a56b34cf4e Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* QLatin1String: add default ctorMarc Mutz2015-10-203-0/+17
| | | | | | | | | | A pending change in uic depends on this. [ChangeLog][QtCore][QLatin1String] Added default constructor. Change-Id: Ie6f5dfc7b38683a488b0ff7f31404800ef5ee188 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Doc: Add the Map Viewer example to the highlighted examples listVenugopal Shivashankar2015-10-201-1/+2
| | | | | | | | | Now that Qt Location is a fully-supported module in 5.6, it is worth highlighting an example that demonstrates the new feature. Change-Id: I70553f84af5587e3604115684ea1ea75203b91ce Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
* Move EGLDevice/Output/Stream resolvers into eglconvenienceLaszlo Agocs2015-10-206-123/+319
| | | | | | | Needed by Qt Wayland as well. Change-Id: Ic349f0a79831e9121cbe9885246897efea2701d5 Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
* Add the proper NOTIFY signal to the primaryScreen propertyLars Knoll2015-10-201-1/+1
| | | | | Change-Id: I1c1fa6c93d9c0284b5a9b790c9066a0c8c722d70 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QFileSystemModelPrivate::name(): avoid the double-lookupMaks Naumov2015-10-201-2/+1
| | | | | Change-Id: I67507248220fbbddc67ab60ecb1933e1fbacf5fd Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* QFileSystemModel: avoid detachingMaks Naumov2015-10-191-6/+6
| | | | | Change-Id: If7e9f11e5514b2f8975e7f83c56b606e67f5952f Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QLatin1String: add testMarc Mutz2015-10-195-5/+127
| | | | | | | | QLatin1String wasn't really tested except as a drive-by. Unearthed a discrepancy with docs. Fixed the docs. Change-Id: I1246bb33888132edbc4e22da792a480a156357bf Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* TextEdit example: fix build when clipboard is disabled.Rafael Roquetto2015-10-192-2/+4
| | | | | Change-Id: Ib25563e3dc299dc2d23bed8b3071af1ba81150e7 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Image viewer example: Fix broken error message formatting.Friedemann Kleint2015-10-191-1/+1
| | | | | | Task-number: QTBUG-48851 Change-Id: Ie86bcc498c9dc1f9754192a256a28fa467f6dbc9 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
* QGestureManager: use qEnvironmentVariableIntValue()Marc Mutz2015-10-191-1/+1
| | | | | | | | | It doesn't allocate memory, so cannot throw and is a lot faster than qgetenv(). Change-Id: I863593166db8eff4c4466996110f5cfdb758ec00 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QMimeBinaryProvider::loadMimeTypePrivate(): avoid an unneeded QStringRef -> ↵Marc Mutz2015-10-191-1/+1
| | | | | | | | QString conversion Change-Id: Id6baae4b710fd9aa8bdc4721dbe64e2d881163bb Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
* QMdiSubWindow: Do not close when doubleclicking on disabled Restore action.Friedemann Kleint2015-10-192-3/+22
| | | | | | | | Check whether the action under the mouse is enabled before closing. Task-number: QTBUG-48493 Change-Id: I2a0669840b9b6c81dacdf179325301c02f1c0c35 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QAbstractItemView::sizeHintForRow()/Column: Check for null delegate.Friedemann Kleint2015-10-192-4/+16
| | | | | | | | The delegate may be null in QHeaderView. Task-number: QTBUG-48543 Change-Id: I4d3ba104b0b57431e8765271dc2dc880be096672 Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* QLineEdit: Unable to drag selected text when aligned right or centerDan Cape2015-10-193-1/+8
| | | | | | | | | | | Created local inSelection function to modify the x value (similar to xToPos()) before sending it to the control. Ran the QLineEdit test and manually tested with AlignLeft, AlignRight and AlignCenter. Change-Id: I088430580dc87f3cfff90c4cd9ff90e6ab215f57 Task-number: QTBUG-48495 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Giuseppe D'Angelo <giuseppe.dangelo@kdab.com>
* Add header template for commercial only modulesJani Heikkinen2015-10-191-0/+20
| | | | | | | | | | | | We need to add header template for commercial only modules in the upstream now when we are using same ci system for building and testing all. Without this tst_licenses.pl will fail in coin for those commercial only modules Change-Id: Ifb8170818b3b730b10e920012757af42442f0edc Reviewed-by: Iikka Eklund <iikka.eklund@theqtcompany.com> Reviewed-by: Sami Makkonen <sami.makkonen@digia.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@theqtcompany.com>
* Polish the complexpingpong exampleAlexander Volkov2015-10-193-10/+10
| | | | | | | | | | - Use QDBusServiceWatcher to detect that pong service became available (QDBusConnectionInterface::serviceOwnerChanged() signal is deprecated). - Use new connection syntax. Task-number: QTBUG-28082 Change-Id: I7b93b961ee6d45aaeefab77fa1d1943e38b4a4c0 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Windows: Open GL blacklist - Disable GMA 3150Friedemann Kleint2015-10-191-1/+13
| | | | | | | | The card cannot handle Desktop GL nor ANGLE. Task-number: QTBUG-43243 Change-Id: I5a349be1b09f1ef2decd36bef87a90b230ca2c04 Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Don't crash when QOpenGLPaintDevice is created without context.Gunnar Sletta2015-10-191-1/+1
| | | | | Change-Id: Ic826158a1570ec49e9847cf040ce897a682048db Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
* Remove webkit-guide from examplesKai Koehne2015-10-19269-9046/+0
| | | | | | | | Qt5WebKit is now deprecated and removed from the packages. Change-Id: I176344cb2a6b43ffc44cc0e7ef1abb4e765a35b4 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Doc: A simplified style for rendering docs with QTextBrowserTopi Reinio2015-10-193-1/+221
| | | | | | | | | | | | | | | Add a new documentation template, with simplified CSS rules that work better when using QTextBrowser as a backend for Qt Assistant or Qt Creator Help. Select this new template by default for offline documentation builds, but keep the old offline template as part of the template files; use JavaScript to switch to the 'standard' CSS when the generated files are viewed with a web browser. Task-number: QTBUG-48322 Change-Id: Ib197896200bb482935f6e9f3a38976133a1e804d Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* qdoc: Conditionally generate the navigation bar items as table cellsTopi Reinio2015-10-193-31/+65
| | | | | | | | | | | | | | | | | | | The new offline template for Qt 5.6, including simplified CSS rules suitable for rendering with a QTextBrowser, requires the navigation bar to be generated as an HTML table instead of the previously-used unordered list. Make QDoc select between the two based on the contents of HTML.postheader .qdocconf variable, which defines the header of the navigation bar. Modify the old offline CSS to look good also when the nav. bar is a table. Task-number: QTBUG-48322 Change-Id: I00e16c24f436e0be049b85d4bcfc916c33ea6b73 Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* qdoc: Warn if a topic command is not allowed in a \qmlpropertygroupTopi Reinio2015-10-191-0/+4
| | | | | Change-Id: Icff1f3a4e85ce1eb2afe0a4d66f0728dc414c6ec Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* uic: updates from running generate_ui (III)Marc Mutz2015-10-191-101/+101
| | | | | | | | | (as of qttools:a7ff0d7d9ac2ff17e540521ef59029bf5cb35e14) Saves almost 10K of text size on optimized GCC 4.9 AMD64 Linux builds. Change-Id: Ib059e8b076362dbf81356861bebaec3810af6dcc Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* uic: updates from running generate_ui (II)Marc Mutz2015-10-191-25/+25
| | | | | | | (as of qttools:1ed9418c0f38190cd839164229eeb7504438f740) Change-Id: I4a30878450218a56fa6af23b6784b314ab499338 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Make sure registered schemes are lower caseLars Knoll2015-10-191-2/+2
| | | | | | | | | QUrl::scheme() already returns the scheme in lowercase, so this should guarantee that the matching works correctly. Task-number: QTBUG-5552 Change-Id: Ie68e01943c8cb105e11e54b348a090d9ffd5e65b Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* The C locale should omit group separators by defaultLars Knoll2015-10-193-13/+16
| | | | | | | | | | | | | Numbers formatted in the C locale should not use group separators by default. [ChangeLog][QtCore][QLocale] The C locale does not use group separators when formatting numbers any more. Task-number: QTBUG-4044 Task-number: QTBUG-3068 Change-Id: Ia647a72efc11fecd66d22f9253562b1d4ef58168 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Fix cocoa plugin build with OS X 10.8 SDKSamuel Gaist2015-10-181-4/+8
| | | | | | | | | | With the 10.8 SDK, NSArray may not respond to firstObject which ends the build with an error. This implementation doesn't use it and also handles the case where no screen is available when calling qt_mac_mainScreenHeight Change-Id: Idce278423c37cc24d8fc31062a386e78d6487492 Reviewed-by: Jake Petroules <jake.petroules@theqtcompany.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-20 02:47:48 +0000