summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Windows: Fix compilation after f5bdd92e5d0217bf3eec13395e4baa95bd8fda37.Friedemann Kleint2015-06-121-2/+16
| | | | | | | | | Bring back static versions of the constrained scaling functions. To be squashed with dbe2dd295cce19680f8ba7a7cca65150701051e2 . Change-Id: Id05b8085ab56dd777ce1ab3b7da3ce47c01dcb00 Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
* Add QPlatformWindow::windowClosestAcceptableGeometry().Friedemann Kleint2015-06-103-2/+17
| | | | | | | | | | Add a function to determine the closest acceptable geometry (height-for-width) to QPlatformWindow similar to the existing QPlatformWindow::windowMinimumSize(), windowMaximumSize()... Clean up the hack in the Windows platform plugin accordingly. Change-Id: I96e943cfdbafdd0ff444e0d53ee0bdf8603d33df Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Make testInputEvents not use QWindowSystemInterfaceMorten Johan Sørvig2015-06-091-5/+2
| | | | | | | | Use QTestLib instead, which will handle the QHighDpi coordinate scaling. Change-Id: Ib2ab9c6edfa6ffbf594ab6251c4b0b83f9581d6c Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
* Simplify tst_qwindow::positioning()Morten Johan Sørvig2015-06-091-2/+2
| | | | | | | | | | | | platformScreenForWindow() is currently implemented as: return window->screen()->handle(); Use window.screen() directly and avoid the QHighDpi conversion call. Change-Id: I0f6487efc4d1494813179665b21150f3ca7a8666 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
* Merge remote-tracking branch 'qt/dev' into dev-highdpiPaul Olav Tvete2015-06-09841-7038/+15167
|\ | | | | | | | | | | | | | | | | | | Conflicts: src/gui/kernel/qsimpledrag.cpp src/gui/kernel/qwindowsysteminterface.cpp src/gui/kernel/qwindowsysteminterface_p.h src/plugins/platforms/xcb/qxcbwindow.cpp Change-Id: Icd887552ade61d6a2b2527383970f7145aa00faf
| * Testlib: Export blacklist functionsCaroline Chao2015-06-081-3/+4
| | | | | | | | | | | | | | So they can be used in QtQuickTest. Change-Id: I64925feb243fb27234951276d81119bc1f6d5a56 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * itemsviews: Add 15 QList::reserve() callsSérgio Martins2015-06-085-11/+37
| | | | | | | | | | | | Change-Id: I4ed8872ecd560d51c00cb3d2b93e082c5abdd8dc Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
| * make the enums of QProcess known to the meta object systemJoerg Bornemann2015-06-081-0/+11
| | | | | | | | | | | | | | | | | | | | This enables users to construct enum values from strings and provides useful qDebug operators. Task-number: QTBUG-10777 Change-Id: Ia3592f00d559b980b4875ee8fb5e8ffb4328d464 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| * Export class QAccessible::ActivationObserver.Friedemann Kleint2015-06-081-1/+1
| | | | | | | | | | | | | | | | Change a21dfab54ed518266c42d3e87e02bd991de8486e de-inlined its destructor, so, the class needs to be exported. Change-Id: I32d21622a944a93718f549060e5e5f7e71fd2646 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix incorrect expression in directfb keyboard codeHolger Hans Peter Freyther2015-06-081-1/+1
| | | | | | | | | | | | | | | | | | | | Add missing equal sign to have the result of the OR stored inside the modifiers variable. Fixes Coverity CID#89071. Change-Id: I0ee1a080f5f6757ae7646733aa3bb5cf8c6cdeed Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Remove bogus call and comment from addressbookHolger Hans Peter Freyther2015-06-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | QMap::empty() does not empty the list but is the STL version to ask if the map is empty. Remove the comment and code as operator>> of QDataStream will clear the map. Fixes Coverity CID#89073 Change-Id: I259e518b44afd42b698368b42aedcc3b84240aca Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Remove exec bits from files that should not be executableDmitry Shachnev2015-06-07106-0/+0
| | | | | | | | | | | | | | Change-Id: I66f49c6db82eadc3b11cc9b1cf01375e9596a8e6 Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Fix WEC2013 build of sqlite3.Bjoern Breitmeyer2015-06-071-0/+2
| | | | | | | | | | | | Change-Id: Iaa953df941d888b8ae1a590dd728a1d819d7e604 Reviewed-by: Konstantin Ritt <ritt.ks@gmail.com> Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| * Make the test pass on high res mac displaysLars Knoll2015-06-061-2/+2
| | | | | | | | | | Change-Id: I05f156faae85abe11edc954dd358ddfcfd320c74 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Wait for the window being active before sending it eventsLars Knoll2015-06-061-0/+1
| | | | | | | | | | Change-Id: I2f5d6e37e630d70c4ba3ae81e807a89c447c8b26 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix the autotest on MacLars Knoll2015-06-061-1/+1
| | | | | | | | | | | | | | Don't hit the scrollbar with the mouse click Change-Id: Ie82d8c5c058df9a482e7d5de2fe40681572f19ad Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Fix qgraphicswidget::initStyleOption autotestLars Knoll2015-06-062-14/+6
| | | | | | | | | | | | | | make sure it'll work with the new mouse handling as well. Change-Id: Ia2d567e618b77b0fa3532ee6c335cbdf5e496241 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Clean up the qgraphicsscene autotestLars Knoll2015-06-061-22/+5
| | | | | | | | | | Change-Id: I8950a3eb9792dff90ed64cd3bf1d572745b05886 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * Manual touch test: Add gestures.Friedemann Kleint2015-06-061-13/+236
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add command line options for - Grabbing gestures - Suppressing mouse and touch events Add gesture events to the log. Add a hierarchy of gesture classes storing the parameters of finished gestures with drawing functionality and implement for pan and swipe. Task-number: QTBUG-46195 Change-Id: I019fe5b60116316a54e11b2c30e1d34f5e72bcf0 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * doc: Added Q_NEVER_INLINE to ignored tokensMartin Smith2015-06-051-0/+1
| | | | | | | | | | | | | | | | This helps qdoc's parser. Change-Id: I4c7f2dff348b87659c93ddb14d012d5bf2e626f2 Task-number: QTBUG-46498 Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
| * Keep the mouse timestamp for tests closer to the actual timeUlf Hermann2015-06-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass on the requested delay into the mouse events. We don't care about single msecs as the surrounding code also takes time that we don't consider and whenever we generate a release we add 500ms of time skew anyway. The initial press of a double click has to increment the timestamp, just like all other mouse events do. Change-Id: Ifb94830f9f878ce87d92bfd86c72a16b55052f3b Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| * qdoc: fix invalid memory access in HtmlGeneratorMartin Smith2015-06-051-1/+2
| | | | | | | | | | | | | | | | | | | | HtmlGenerator::highlightedCode() contained a potential out-of-range- memory reference, which is prevented by this fix. Change-Id: I3bc87a8287e1d51c2786f5ec42384dbac04c9636 Task-number: QTBUG-45643 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * qdoc: Just reformatting and removing dead codeMartin Smith2015-06-052-50/+6
| | | | | | | | | | | | | | Whitespace only. Change-Id: I6e4b55ad55e22da4150530457202f144fcc7f416 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * doc: Remove uses of \returnsMartin Smith2015-06-051-2/+2
| | | | | | | | | | | | | | | | | | It is a doxygen command that is not recognized by qdoc. Change-Id: I26b0c54a1aa715fc9d8b70e411502f46fc6bc0f1 Task-number: QTBUG-46495 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * doc: Remove uses of \mainclassMartin Smith2015-06-054-4/+0
| | | | | | | | | | | | | | | | This qdoc command is deprecated. Task-number: QTBUG-46476 Change-Id: Iee36f91bdcf500c2e88022a5f8a9c3accc6048c2 Reviewed-by: Martin Smith <martin.smith@digia.com>
| * Move the function helper to its own fileJorgen Lind2015-06-056-14/+20
| | | | | | | | | | | | | | | | Also make it a class so a forward header is generated by syncqt Change-Id: Ibab6b925dc6e9dab1b617b9b4027a4144e4a3773 Reviewed-by: Timur Pocheptsov <Timur.Pocheptsov@digia.com> Reviewed-by: Laszlo Agocs <laszlo.agocs@theqtcompany.com>
| * Fix crash in tst_qfiledialog on OS XSimon Hausmann2015-06-042-4/+14
| | | | | | | | | | | | | | | | | | | | The test aggressively shows and hides dialogs and popups, and we would end up installing this global event monitor frequently. However we never cleaned up properly, for example if the window didn't get hidden properly or if the monitor was already installed for some reason. Change-Id: I6fa28eaeb03e089ced735912dbe29b0b8ad75d58 Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com>
| * Fix tst_qglobalstatic on OS XSimon Hausmann2015-06-041-0/+21
| | | | | | | | | | | | | | | | | | | | OS X has an unreasonably low default for the maximum number of open file descriptors (256). The unit test creates about 200 threads and each thread in Qt creates at least two file descriptors (pipe), so the test cannot execute. Change-Id: I656367bca6d0a40fb1edb8c72914304db0f429ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
| * Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/devSimon Hausmann2015-06-04530-5850/+11954
| |\
| | * Merge remote-tracking branch 'origin/5.5' into devSimon Hausmann2015-06-03530-5850/+11954
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/corelib/global/qnamespace.qdoc src/corelib/io/qwindowspipereader.cpp src/corelib/io/qwindowspipereader_p.h src/corelib/statemachine/qstatemachine.cpp src/corelib/statemachine/qstatemachine_p.h src/plugins/platforms/xcb/qxcbconnection.h tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp tests/auto/tools/qmake/tst_qmake.cpp tests/manual/touch/main.cpp Change-Id: I917d694890e79ee3da7d65134b5b085e23e0dd62
| | | * Merge "Merge remote-tracking branch 'origin/5.5.0' into 5.5" into ↵Liang Qi2015-06-0231-251/+491
| | | |\ | | | | | | | | | | | | | | | refs/staging/5.5
| | | | * Merge remote-tracking branch 'origin/5.5.0' into 5.5Liang Qi2015-06-0231-251/+491
| | | | |\ | | | | | | | | | | | | | | | | | | Change-Id: I060b0e10e55487a4a4a101f77ad7c8dc8cf0f553
| | | | | * Merge "Merge remote-tracking branch 'origin/5.4' into 5.5" into ↵Jani Heikkinen2015-06-0226-241/+405
| | | | | |\ | | | | | | | | | | | | | | | | | | | | | refs/staging/5.5.0
| | | | | | * Merge remote-tracking branch 'origin/5.4' into 5.5Liang Qi2015-06-0126-241/+405
| | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: qmake/generators/mac/pbuilder_pbx.cpp src/corelib/global/qglobal.h Change-Id: I2c0f7544bf194f2d0f59218fd583c822901487b0
| | | | | | | * Merge "Merge remote-tracking branch 'origin/5.4.2' into 5.4" into ↵Liang Qi2015-05-297-17/+33
| | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | refs/staging/5.4
| | | | | | | | * Merge remote-tracking branch 'origin/5.4.2' into 5.4Liang Qi2015-05-297-17/+33
| | | | | | | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ied2a227a25859163a924c7b5717492a1f974c5ca
| | | | | | | | | * Revert some changes in light of GCC 4 -fPIE reversalv5.4.2Stephen Kelly2015-05-296-12/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The -fPIE option is now accepted when using GCC 4, which means it is available for backward compatibility for clients using CMake 2.8.11 or older which makes use of the POSITION_INDEPENDENT_CODE feature. Conditionally use that feature for old versions of cmake with GCC 4. Restore the tests for those versions, and clarify the situation in the ChangeLog. Change-Id: I5a06b155dda7db559d86841a2b34fd8ed95acbd0 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
| | | | | | | | | * Make qglobal.h only complain for GCC >= 5 about -fPIEThiago Macieira2015-05-291-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 3eca75de67b3fd2c890715b30c7899cebc096fe9 introduced the #error nagging about use of -fPIE, but it makes the transition quite difficult for people using other buildsystems. So let's give people a grace period and enforce only for GCC >= 5. Clang is affected, but differently. The problem only happens with -flto -- that is, it happens when the linker detects that it's creating a final executable. Maybe -Wl,-pie would fix it. Change-Id: If4d5ac8db0ed4a84a3eaffff13e275edc29a72b7 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com> Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
| | | | | | | | | * Mention cmake changes in ChangeLog for -fPIE -> -fPIC changesSimon Hausmann2015-05-281-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow-up change to commit 3eca75de67b3fd2c890715b30c7899cebc096fe9 to mention changes required to CMakeLists.txt for users of Qt. Change-Id: I1c9ed162427cdc620f998ccf266d59886901c28d Reviewed-by: Lars Knoll <lars.knoll@digia.com>
| | | | | | | | | * Fix cmake auto tests failing with cmake 2.8.11Simon Hausmann2015-05-283-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After commit 3eca75de67b3fd2c890715b30c7899cebc096fe9 the use of <Module>_EXECUTABLE_COMPILE_FLAGS becomes mandatory for 2.8.11 or older. Therefore use it in test_use_modules - that's supposed to work with all cmake versions it seems - and bump test_interface to require 2.8.12. Change-Id: I7cfb6c6f1e8a97be916d372b9d9148490926693c Reviewed-by: Lisandro Damián Nicanor Pérez Meyer <perezmeyer@gmail.com> Reviewed-by: Stephen Kelly <steveire@gmail.com>
| | | | | | | | | * Only add -fPIC flags for compilers known to require it.Stephen Kelly2015-05-272-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 083c9269 (Try to ensure that -fPIC is used in CMake builds, 2015-05-11) added a raw -fPIC to the INTERFACE_COMPILE_OPTIONS of Qt5::Core, which affects all consuming compilers. Use the qmake variable $$QMAKE_CXXFLAGS_APP instead, which at least currently contains only the -fPIC variable or harmlessly expands to nothing. If the content of that qmake variable changes in the future, a $$QMAKE_CXXFLAGS_APP_PIC variable should be extracted in qmake and used here. Don't use the POSITION_INDEPENDENT_CODE feature of CMake. That adds the -fPIE flag for executables, which is explicitly what qglobal.h forbids since commit 3eca75de (Make qglobal.h complain if you use -fPIE, 2015-05-11). The current behavior of that CMake feature is tracked here: http://public.kitware.com/Bug/view.php?id=15570 Change-Id: I5c5bcc40fe4b310b55a681a3505f45c50adfa054 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| | | | | | | | | * Avoid false positives from google by storing OpenSSL version as Unicode.Richard J. Moore2015-05-251-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Google scan play store apps for the openssl version string which leads to false positives since we record the version we were compiled against even though we don't link it directly. Task-number: QTBUG-46265 Change-Id: Iefd0e0954149c17350d49f57f9f374938124d7b8 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
| | | | | | | | | * Do not modify decoder when determining image-formatAllan Sandfeld Jensen2015-05-211-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We should not configure the decoder when just determining the image- format. Doing so can cause all versions of libpng to print a warning, and some versions to fail to decode. The code appears to be a leftover from when the image-format logic was copied out of the introduction of the decoding method, where the proper settings are still applied. Task-number: QTBUG-46233 Change-Id: I6619728804f040ae6c9d637c7298a8586e22499e Reviewed-by: Andy Shaw <andy.shaw@theqtcompany.com> Reviewed-by: aavit <eirik.aavitsland@theqtcompany.com>
| | | | | | | | | * Workaround for Samsung keyboard bugPaul Olav Tvete2015-05-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return null string instead of empty string when the selection is empty. It looks like Samsung just tests for selection == null when doing backspace. Task-number: QTBUG-45785 Change-Id: Iaa006a8ffe52b2704c7348646dde9ca4e1f78c5c Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@theqtcompany.com>
| | | | | | | * | | Fix no bearermanagement buildLorn Potter2015-05-292-20/+24
| | | | | | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As pointed out in the bug, it also fixes API use when configured with no bearermanagement. Task-number: QTBUG-46239 Change-Id: Ief8df85ad6acf61e8d5bb3eed54e7d6ecb84c1a0 Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
| | | | | | | * | Doc: Added the missing \brief and \image for example docsVenugopal Shivashankar2015-05-275-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Qt TestLib examples are just tutorials so updated the qdocconf to use the default thumbnail in the Qt Creator welcome screen. Task-number: QTBUG-41996 Change-Id: Ia04a42a92e414c97a426b6095a62621a348e7de0 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
| | | | | | | * | Fix documentation of obsoleted functions to show the right replacementAndy Shaw2015-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib008a5544d68d93e1f96ff6b7504e9a7ea4bb192 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | | | | | | * | Use the new non-obsoleted functions for getting the paper detailsAndy Shaw2015-05-261-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a problem with the margins not being correctly respected as the functions introduced previously would set a different property to what was being queried in this case. Change-Id: I3458c8e46239276a296d17aa80da7330c85fcf0a Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
| | | | | | | * | Ensure the same behavior on Win as Unix re the host in isApparentlyStaleAndy Shaw2015-05-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the hostname is empty then it is assumed that the lock file is from the same host as the one running the application. Change-Id: Iba8aefc171a209294371dc2022d93ede3035b242 Reviewed-by: Will Wagner <willw@carallon.com> Reviewed-by: David Faure <david.faure@kdab.com>
| | | | | | | * | Doc: Excluded qdoc files that caused unnecessary Qt Creator warnings.Venugopal Shivashankar2015-05-201-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The customcompleter and textcodes are widget examples, but they end up in the Qt Core exampledirs boundary because of a reference to the plugandpaint example in the docs. This resulted in a couple of wrong entries being written into the examples-manifest.xml, which is used by Qt Creator. This change explicitly exludes the qdoc pages for the two examples so that qdoc doesn't add the corresponding entries into examples-manifest.xml. Task-number: QTBUG-41996 Change-Id: I0e95b6d4d93e0ce18f5b34e5034b279598b4924f Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 09:24:51 +0000