summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixed installation of gui examples' targetsOliver Wolff2012-12-103-0/+9
| | | | | Change-Id: Ie945ffac56ed83d2dc4605a073bcab4ef6f290ac Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Blackberry: Fix crash when opening file dialog without parent.Sergio Martins2012-12-106-23/+25
| | | | | | | | | | | | | If parent is null, we now use qqnxintegration->primaryScreen() This simplifies ctors of QQnxTheme and QQnxFileDialogHelper which now receive a QQnxIntegration pointer instead of receiving a font database and a bps event filter. Change-Id: I3b1ed4d99f738b980a4f19a98618341a14e0c222 Reviewed-by: Kevin Krammer <kevin.krammer@kdab.com> Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com> Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
* QtBase: Doc: Fix Links to designer manual.David Schulz2012-12-104-7/+6
| | | | | Change-Id: I87f68fb70aa773c44b90b58bd56fc5585a7e4107 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* QtBase: Remove linguist example which was already movedDavid Schulz2012-12-1011-261/+0
| | | | | | | ... to QtTools. Change-Id: I707d8debcf35b01046b78718fd4b48c03b1fa6e2 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* support include paths for the Windows resource compilerJoerg Bornemann2012-12-103-5/+37
| | | | | | | | | | | In RC_INCLUDEPATH one can add include paths for the Windows resource compiler. Task-number: QTBUG-13776 Change-Id: If1d9ed44097adb7789df03e4ccd4e3b7df9e8d08 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* qmake: fix extra compilers in vcxprojs for single config modeJoerg Bornemann2012-12-101-0/+10
| | | | | | | | | | | | In single config mode extra compilers were not written to Visual Studio project files, because they were not added to the fake project object we're using to write a single config project. Task-number: QTBUG-27505 Change-Id: Ie57b648861573496252f1383dc77e0729e244947 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Doc: Updated outdated docs to use new macroChristian Stenger2012-12-102-9/+18
| | | | | Change-Id: I9a3528112fba1db988592d9f4f470ec678e81e1a Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Only handle QTPLUGIN when linking against static QtMiikka Heikkinen2012-12-071-1/+2
| | | | | | | | | Usage of QTPLUGIN implies static Qt, so only handle it when that is true so user projects do not need to scope it if they support linking against both static and shared Qt. Change-Id: I011b4672bac122d7d64d8f2fc0e41ca7e5251dfc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix module pri file name for static pluginsMiikka Heikkinen2012-12-071-1/+1
| | | | | | | | | | Since QTPLUGIN variable values are used to locate both the plugin library and the module pri file, those must match. Therefore generate module pri file name using the TARGET of the plugin rather than the pro file name. Change-Id: I9ec6f2a087ba3b3cecf7034c8a28b31df155cd97 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* move cmake template files under features/data/Oswald Buddenhagen2012-12-073-2/+2
| | | | | | | | | there will be more template data, and it wouldn't be too nice to spread it all over mkspecs/. Change-Id: I909c48d26ac34f8c0f66051a65d326366d49c096 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
* simplify code by using new $$absolute_path() functionOswald Buddenhagen2012-12-072-8/+2
| | | | | | Change-Id: Ie8102eea5c2b108154b76ed35bdbc6d8572bd4a5 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* finish the job of removing uic3 supportOswald Buddenhagen2012-12-071-25/+14
| | | | | | | | this should have been in 048b697c07. Change-Id: I8589453ef937db1a9a446b0e5d01bb830b0cf6b0 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* remove another dead assignmentOswald Buddenhagen2012-12-071-1/+0
| | | | | Change-Id: I79ffdba571b48def4494b018b2a2abdee8aab0a8 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Implement Cocoa KeyMapper.Morten Johan Sorvig2012-12-076-2/+604
| | | | | | | | | | Port Qt 4 implementation. Shortcuts such as shift-5 should now work. Change-Id: I1d8c4c6c4a903142361996b558ee31c8549fcef6 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oliver Wolff <oliver.wolff@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* Only generate -fPIE on unix.Stephen Kelly2012-12-071-1/+1
| | | | | | | | This follows the same logic used to set bsymbolic_functions. Change-Id: I9300eab8a1b6673c4409b5dd07b40123fdf00d69 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Topologically sort $${MODULE}.depends when generating cmake files.Stephen Kelly2012-12-071-1/+1
| | | | | | | | | | | | The contents of this eventually go into a CMake target property IMPORTED_LINK_INTERFACE_LIBRARIES, which seems to expect sorted input. Usually the contents is generated by CMake itself, so generating content it expects is reasonable. This fixes the qtactiveqt cmake unit test with MingW on linux. Change-Id: I2a540bea5c3ac214ad4e1dfedfb7cbd2f863472b Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Doc: removed control code+minor rephrasingNico Vertriest2012-12-071-3/+3
| | | | | | | | | QTBUG-28382 Change-Id: Ic166fcb283d3339853c68a71be9aebd6cfed0523 Reviewed-by: Martin Smith <martin.smith@digia.com> Reviewed-by: Mitch Curtis <mitch.curtis@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Set CGImage format when converting from QImage.Morten Johan Sorvig2012-12-071-1/+22
| | | | | | | | | Set the CGImage format based on QImage::format(). Handle8-bit per component (A)RGB. Change-Id: I041b0ee53d3943a0aaf9e813eb0a235c4de619dd Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Use the "copy" blend mode for backingstore drawingMorten Johan Sorvig2012-12-071-0/+1
| | | | | | | | | | The default is a "source over", but we want to completely replace the destination pixels. (Which is slightly faster). Change-Id: I4916765258a2236f70f58a8e20b06f80739183c1 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Avoid backing store color space conversions.Morten Johan Sorvig2012-12-071-1/+15
| | | | | | | | | | | | | | | | | | | | We want the Qt backing store to be in the device color space by default. This will avoid colour space conversions when blitting it to screen, at the cost of a potential loss in color accuracy. As it turns out, CGColorSpaceCreateDeviceRGB no longer crates a device color space but rather a generic color space. (Since 10.4). Create the color space with a system profile instead. Accurate color representation needs to be supported at some point, but this fast path should be the default. Change-Id: I7ebb77b36f81f66119d8c2ef464723401ec1d1e8 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
* Deleted wrong statement about nr Qt JSON classesNico Vertriest2012-12-071-2/+0
| | | | | | Change-Id: I58d8ab73d3018d9712ec9485e0b8e52a5a75da5e Reviewed-by: Robin Burchell <robin+qt@viroteck.net> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Update QNSView geometry on window resize.Morten Johan Sorvig2012-12-072-3/+4
| | | | | | | | | | | | | | | | | Ideally this should not be required since NSWindow should resize the content view automatically. However, in the case of modal QDialogs this does not happen. Add call to updateGeometry in windowDidResize as a workaround, and remove code which called QNSView::setFrameSize with the current size. This will cause duplicate handleGeometryChange calls in the non-qdialog case, add a test to see if the geometry really has changed to prevent that. Change-Id: I29bea23b2ab72f923aeadf8db8cb9131ae177a28 Reviewed-by: Liang Qi <liang.qi@digia.com>
* Compile with QT_NO_CURSOR.Volker Krause2012-12-0714-9/+43
| | | | | | | | | | | | | Mostly straightforward, the a11y changes might look a bit drastic, but the base class QAccessibleTextWidget was already disabled in this case, so we have to obviously take out its sub-classes as well. Change-Id: I682ace20d6938688ddb1da23c3463f3c025fab8e Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Tasuku Suzuki <stasuku@gmail.com> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
* Make the documentation more explicit an talkativeLaszlo Papp2012-12-072-8/+10
| | | | | | Change-Id: Ifa4b7c3c5f8ec384addbb80a9436d55b32d8bc51 Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
* Fix typos and style in QToolBar documentationDavid Gil2012-12-071-15/+15
| | | | | Change-Id: Ic4b4e18746382bae1b6dae009e1e5663c7a21a84 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
* doc: Remove documentation for removed TRUE and FALSE macrosSergio Ahumada2012-12-061-20/+0
| | | | | | | These macros were removed by 158f39ec7870c54ff3a15f72fe151062d6daa172 Change-Id: I2aabef1dd2c9cb3949040c167a4e5cf1a9390ba6 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Removed requestOrientation() API from QWindow.Samuel Rødal2012-12-067-103/+17
| | | | | | | | | | | There are no proper implementations of this API, and as it stands it only acts to confuse anyone who stumbles across it. It will be better to revisit the full cross platform orientation API story for 5.1. Change-Id: Iff7054a32c6e5e4ad0cc0493a5e4ecc35a6ec4f3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
* configure.exe: fix -inotify optionRafael Roquetto2012-12-061-0/+3
| | | | | | Change-Id: Iaa844961b5fdd2056fcc9b008c11a3f3925ca3a4 Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Fix compile with -DQT_NO_SYSTEMTRAYICONMontel Laurent2012-12-063-1/+34
| | | | | Change-Id: Icca0bef7efca77a841b30f40692144663e7ae913 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* Warn when XDG_RUNTIME_DIR isn't set, as per XDG Base Dir SpecDavid Faure2012-12-061-0/+1
| | | | | | | | | | | | http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html says: "If $XDG_RUNTIME_DIR is not set applications should fall back to a replacement directory with similar capabilities and print a warning message." Better warn that not all the guarantees of XDG_RUNTIME_DIR are available, and push unixes who haven't done so yet, to set things up correctly. Change-Id: Ie3998e8c1d14e4fdf8d58dfb2932f0ad708fba50 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* qmake: add ProductVersion to automatically generated resourceJoerg Bornemann2012-12-061-0/+1
| | | | | | | | | | ProductVersion is set to the same value as FileVersion. Task-number: QTBUG-27428 Change-Id: Ia01e14112d3a0e74b9fbe5fc8d9c4f9ae690db34 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* QProcess: Fix compilation with MinGWKai Koehne2012-12-061-1/+2
| | | | | | | | newer mingw-w64 headers do not support swprintf(wchar_t*,wchar_t*, ..) any more. Change-Id: I2fc1fb51ba8d5237149697f77a91abd6469ebb09 Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Don't pass invalid strings to strcmp()Peter Kümmel2012-12-061-1/+1
| | | | | | | The address behind a string doesn't point to a string. Change-Id: Ic54f652ae781fea278f60cc49d219c1c610ba29f Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Mac: Missing update when hovering from one scrollbar to anotherGabriel de Dietrich2012-12-061-3/+3
| | | | | Change-Id: I9837bb72935cb4e3680e4bd23b5535f654b5fde6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Mac: Transient scrollbars should overlap in the corner on 10.8Gabriel de Dietrich2012-12-061-1/+9
| | | | | Change-Id: Ied239d5e3cb05bed6b892607f0344e6daa028918 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* doc: Add changes to dnd docs from qtdoc repositoryEskil Abrahamsen Blomfeldt2012-12-061-13/+24
| | | | | | | | | | Change da54c5e7c9bf7647664a3529a6db487dee94d331 in the qdoc repository was made to the wrong version of this documentation. This change just adds them in qtbase and fixes some of the snippets which were still broken. Change-Id: Ie9ba57b5a2d20a629aa5f0a492daa207d35b2053 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Mac: Animated expanding scrollbars on 10.8Gabriel de Dietrich2012-12-062-29/+76
| | | | | Change-Id: Ib57d0347a7828ac7582b0fa95adf8d437694cd41 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
* Mac: Cleaner transient scrollbar renderingGabriel de Dietrich2012-12-061-14/+7
| | | | | | Change-Id: I617588012aa5166775c3c6301ee70043b22553a3 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Docs: Fix some warningsChristian Stenger2012-12-063-5/+3
| | | | | Change-Id: I3898c89e54aa671ff8cb1b25c49cfe3835ab9384 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Remove obsolete statementChristian Stenger2012-12-061-3/+0
| | | | | Change-Id: Ic7f14dae391684a4870e030ab4549b3a59f1ea5f Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Doc: Fix some enumsChristian Stenger2012-12-061-2/+5
| | | | | Change-Id: I58f2906e9605e8ab09cad29880006ed60cc23e80 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Docs: fix QStyle related warningsJ-P Nurmi2012-12-065-20/+21
| | | | | Change-Id: I4e67e34ecc0fc8050938a681b2c393b8442fce2e Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* QtWidgets docs: use WinVista screenshots instead of obsolescent WinXPJ-P Nurmi2012-12-0621-45/+45
| | | | | Change-Id: Ic7fd291d4ce4468ae12cf5dd102fbcc45387dd87 Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* Adjust qttestlib.qdocconf to create qttestlib/examples-manifest.xmlhjk2012-12-061-18/+18
| | | | | | Change-Id: I6c4c8d9b69f135229bd0bd28e8e57738742f6bd8 Reviewed-by: David Schulz <david.schulz@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* doc: Avoid duplicate widget example entriesEskil Abrahamsen Blomfeldt2012-12-061-2/+1
| | | | | | | | | | | | | | The link to widget examples in QtCore was added in 4519d810d1d2be3af17bdd77edac2361620f9d2d, which made widget examples pop up twice in generated lists (once for qtcore and once for qtwidgets documentation). I'm not sure why it was originally added to that module, but the snippets in the fridgemagnets example (which was the example fixed in the commit) has been verified to still work. Change-Id: I1b349f08349b5499929315d426224ba8638adc8e Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* doc: Add missing images in richtext example docsEskil Abrahamsen Blomfeldt2012-12-063-0/+0
| | | | | | | Copied from Qt 4.8 Change-Id: Ic98a5e87305dbf9bb0df7ae071c42bb42a803b10 Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
* Remove references to pre-build examples from dist/READMEhjk2012-12-061-4/+0
| | | | | | | | We do not want to ship them anymore. Change-Id: I62ac985cdf3f6d13327d1fd88262cc60efc4a230 Reviewed-by: Hanne Linaae <hanne.linaae@digia.com> Reviewed-by: Kai Koehne <kai.koehne@digia.com>
* QtBase: Doc: Fix links to STL-style iteratorsDavid Schulz2012-12-0612-63/+63
| | | | | Change-Id: I2822c2a7e9bfc1949c20ff81e08961f641e961fb Reviewed-by: Jerome Pasion <jerome.pasion@digia.com>
* MSVC: don't use the variable name LINK in generated makefilesJoerg Bornemann2012-12-064-7/+7
| | | | | | | | | | | Rename LINK to LINKER. The MSVC linker uses the environment variable LINK to pass additional command line arguments. We must not hide this variable. Task-number: QTBUG-28332 Change-Id: Id78476d1cf4a73175b9f47292c67f38a43ae5ba4 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* remove dead lineOswald Buddenhagen2012-12-061-1/+0
| | | | | | | the compile-all-mocs-as-one-file feature is gone for years Change-Id: I6c35bce59c36b6920af2498661172b5938eeba52 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 06:23:12 +0000