aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix linking problem when built with -no-openglold/5.2Andy Shaw2014-02-111-0/+1
| | | | | | | | | When -no-opengl was used then it was not automatically pulling in the needed Windows libraries as it was not loading opengl.prf to get them from. Change-Id: Ic00717b2327a1f7cf05f55bcde7a7308e36c19e9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Bump MODULE_VERSION to 5.2.2Sergio Ahumada2014-01-161-1/+1
| | | | | Change-Id: I30507972c215276d389f706e601820d09741753d Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
* Merge remote-tracking branch 'origin/release' into stablev5.2.1Frederik Gladhorn2013-12-032-0/+208
|\ | | | | | | Change-Id: Idfe43a75901cf1a29946245bed0956b1541de298
| * Add missing include for QQuickDwmFeatures plugin.v5.2.0Friedemann Kleint2013-12-031-0/+1
| | | | | | | | | | | | | | Task-number: QTBUG-35260 Change-Id: I8145fd8a98b8549de7e819740e6b7529d0785488 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
| * Add plugins.qmltypes fileKai Koehne2013-11-301-0/+207
| | | | | | | | | | | | | | Task-number: QTBUG-35207 Change-Id: If6843d71c2d6e0a9afec3dca3683ac0fcd1188b6 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com>
* | Merge remote-tracking branch 'origin/release' into stableFrederik Gladhorn2013-11-261-1/+1
|\| | | | | | | Change-Id: Id23fc1705d026f3da5eb1a5f13f3e9aca368c7ed
| * Fix disableBlurBehindWindow(QWidget*)v5.2.0-rc1Nicolás Alvarez2013-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | The functions to handle blur-behind on QWidgets are inline wrappers that call the functions taking QWindow. disableBlurBehindWindow(QWidget*) was calling the *enable* function for QWindow* instead of the disable function. In other words, disableBlurBehindWindow was enabling blur-behind instead of disabling it. Change-Id: I02cc4b0ad956afe2d81fc5f7783986b799bd9cd2 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* | Bump MODULE_VERSION to 5.2.1Sergio Ahumada2013-11-251-1/+1
|/ | | | | | Change-Id: I132c72934727f344f850d117a7663fcff9e0ec5e Reviewed-by: Matti Paaso <matti.paaso@digia.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* Prefix the various CLSID/IID symbols by 'q'.Friedemann Kleint2013-11-0810-82/+162
| | | | | | | | | | Avoid clashes with the various MinGW libraries. Task-number: QTBUG-34638 Change-Id: I1fe0e1b79b52f887522c1c19a15bbdcb256fd917 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix static linkageJ-P Nurmi2013-11-071-3/+7
| | | | | | | Task-number: QTBUG-34638 Change-Id: Ie8fc39459107a984fac02396537c99bea1f29691 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add Quick Player exampleJ-P Nurmi2013-11-0720-0/+384
| | | | | | | | | This is a simplified Qt Quick-based version of the Music Player example. Change-Id: Ica9da1b388ccbc4d22ae0dccecb8fbd2b270522a Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Updated url variable in qdocconf files.Jerome Pasion2013-11-061-1/+1
| | | | | | | | | | | | | | | In 5.2, the HTML output is in a flatter structure and when they are hosted in qt-project.org/doc, the documentation will be found at http://qt-project.org/doc/qt-$QT_VER The url variable is used by projects outside of Qt 5 which need to link to Qt 5 documentation, such as Qt Creator. Task-number: QTBUG-34584 Change-Id: Iddcfdd81a7a30ed6dfd52f14593dc8f3e015cbfe Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* use private linkage where possibleOswald Buddenhagen2013-11-041-1/+1
| | | | | Change-Id: Iaf326a51e93ec334c02de07d8cd254998e73ce46 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* remove strange library removalOswald Buddenhagen2013-11-041-1/+0
| | | | | | | Change-Id: I49211946dc68b4ced4600e567ec9ceed5986ad92 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Change camel-case header <QWinFunctions> to <QtWin>Sze Howe Koh2013-10-297-7/+7
| | | | | | | | | | | Name the header after its namespace, to reduce the number of names developers must remember. Change-Id: I7b653886c1b504678d73117dfa4a9bfe2a2edbc4 Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com> Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix function pointer check.Friedemann Kleint2013-10-291-1/+1
| | | | | | Task-number: QTBUG-34284 Change-Id: Id8a2205f41012f7235bd2f422d02b7f997b88bc9 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Fix MinGW-w64 GCC 4.8.2 compilationJonathan Liu2013-10-232-0/+5
| | | | | Change-Id: Ia7d3a0cfa38b2cc046c18c8e5a8ca49877c73088 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Restore the former jumplist/dwmfeatures apps as manual testsv5.2.0-beta1J-P Nurmi2013-10-1012-1/+1152
| | | | | Change-Id: I7f8b79b01832224a1eeeaf2e6c6489ff1b46e495 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add quick-prefix to all QtQuick based manual testsJ-P Nurmi2013-10-108-1/+1
| | | | | | Change-Id: I4c377ab5db7699c182e8ce3903c10482668840bf Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Remove obsolete examplesJ-P Nurmi2013-10-0818-1437/+2
| | | | | | | | | | | These examples were more like manual tests than examples. These features are now covered and documented in the music player example. Furthermore, corresponding manual test applications already exist. Change-Id: I28d857cd704e08a8ef5e6763d6403885119accba Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix and change the way QQuickDwmFeatures works.Ivan Vizir2013-10-075-28/+246
| | | | | | | | | | Made it update each DWM property separately but not all at once every time a property changes. Added manual test for DwmFeatures QML item. Added blurBehindEnabled property. Change-Id: Icfa6fb922be0ac4554c232ba4b41b71d0e7585ca Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* A music player exampleJ-P Nurmi2013-10-0416-0/+907
| | | | | Change-Id: Ie28baa6373a8852b31137ed3c076ab4309d1c98f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Enhance the QWinThumbnailToolBar & QWinThumbnailToolButton docsJ-P Nurmi2013-10-044-28/+70
| | | | | Change-Id: I1f82a537aea550a9c714284a19f79c31cb707ae7 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Enhance the QWinTaskbarButton docsJ-P Nurmi2013-10-041-8/+23
| | | | | | Change-Id: I30661911dd6b6439208ec220354579ef7083a94d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Docs: fix QtWin namespace links in the overviewJ-P Nurmi2013-10-041-4/+4
| | | | | | Change-Id: I9651741d07f16be30e29cfb6cd96af527407ccd5 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Turn QtWin back to a namespaceJ-P Nurmi2013-10-027-73/+141
| | | | | | | | | | | The conditional QT_WIDGETS_LIB inline functions won't work on MSVC when they are class members. Symbols would have to be exported from the lib. The enum duplication can be hopefully solved later by adding Q_ENUMS() support for namespaces. Change-Id: Ibf01e9c64db2be7e5f189f2088e879e9d8fabf54 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Docs: fix "missing \qmlpropertygroup" warningsJ-P Nurmi2013-10-021-0/+2
| | | | | | Change-Id: I73eab1f97e43726e7092d91c7898b8f628f19808 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
* Doc: Setting navigation bar variables in qdocconf file.Jerome Pasion2013-10-021-0/+4
| | | | | | | -for navigation in offline mode. Change-Id: I0f5b2c9fa466be4ce9885822ae57b93e453e8b01 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Doc: Adding version of QtWinExtras QML module to \qmlmodule.Jerome Pasion2013-10-011-1/+1
| | | | | | | | QDoc uses \qmlmodule as the import statement Task-number: QTBUG-32172 Change-Id: Idea03933a13f8efb2e10a0966221adc5bdd67a37 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QWinJumpList::addCategory(): don't crash when passing a null pointerJ-P Nurmi2013-09-302-0/+5
| | | | | Change-Id: Icd2e29d73bd5f64c9ce68219a23c80b4fe3aa3d1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix winshobjidl_p.h include guardJ-P Nurmi2013-09-271-3/+3
| | | | | Change-Id: I54c27f029d36537275cc43a00f4df504fb00dee1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Add QWinJumpList auto testJ-P Nurmi2013-09-273-1/+274
| | | | | Change-Id: I24496afdfeb6ae8efe0b005f6d5cc33afff49b42 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Update the git-archive export optionsSergio Ahumada2013-09-272-0/+5
| | | | | | | | | | | | | | | The .gitattributes, .gitignore, .commit-template files do not need to be present in packaged sources, as they are for people using the Git repository. People who download tarballs usually don't reimport into Git -- they should just download the actual repositories. Meanwhile, the .tag file is quite useful. Instead of making Git extract to the useless SHA-1 of the "$Id$\n" string, ask git-archive to store the SHA-1 of the commit being packaged. Change-Id: I46c0496d0a58c2b77d7c662a705c0ac68005b02c Reviewed-by: J-P Nurmi <jpnurmi@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* Add QWinJumpList::identifierJ-P Nurmi2013-09-276-21/+119
| | | | | Change-Id: I38576256f2f90f9528a7210537255e35e4c598a9 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QWinJumpListCategory: ignore and warn about unsupported item typesJ-P Nurmi2013-09-261-5/+11
| | | | | | Change-Id: I119fba0938c3cb3caab7545ced18106051b531ac Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* QWinJumpList: use QDir::fromNativeSeparators() for file pathsJ-P Nurmi2013-09-261-2/+2
| | | | | | Change-Id: Id5856a73611b40db3affbc9582e8b9461c492bea Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Fix QWinJumpList::clear() for recent & frequent categoriesJ-P Nurmi2013-09-262-29/+17
| | | | | | | | | It must actually instantiate the recent & frequent categories in order for clear() to be effective. Change-Id: Ic3fc9c95a1170b21f257637eaaac080e1c30db9a Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Rename QML JumpLink/Destination to JumpListLink/DestinationJ-P Nurmi2013-09-265-18/+18
| | | | | | Change-Id: If7e761e435e75c218f50c50f8940428bb8c14a23 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Sync the jump lists QML APIJ-P Nurmi2013-09-2610-200/+669
| | | | | | | | The C++ API was changed - update the QML API accordingly. Change-Id: I89d0939c4ffc27580e7db53a479db4ff70ee0fef Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Set qtwinextras version to 5.2.0v5.2.0-alpha1Sergio Ahumada2013-09-241-1/+2
| | | | | Change-Id: I924728e92a59333a9306f963b4b7e834d83d4be3 Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* QWinJumpListCategory: fix initialization of member variablesJ-P Nurmi2013-09-202-3/+7
| | | | | | | | | The pDocList member was left uninitialized when not using QWinJumpListCategoryPrivate::create(). Change-Id: I3c443eaf00b8680d76cad710b2bdb8febb451ec7 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
* Jump Lists: introduce "categories" & hide COMJ-P Nurmi2013-09-2015-600/+1137
| | | | | | | | | | | | | | | | | | | | QWinJumpList now has three built-in categories: Recent, Frequent and Tasks. In addition to that, user can add custom categories. A new type, QWinJumpListCategory, represents all these categories, providing access to items in the category. The former COM-like begin(), append(), commit(), abort() API has been replaced by a more property/ attribute-based API. The jump list automatically invalidates and lazily rebuilds itself behind the scenes. Furthermore, the API has been minimalized for now - restoring the application identifier as a full-fledged property is in the works. Change-Id: I623a658b4b1fcfc881006f67e2300acadb483c97 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Jan Arve Sæther <jan-arve.saether@digia.com>
* Fix QtWin namespace docsJ-P Nurmi2013-09-161-44/+6
| | | | | | Change-Id: I3d29698dd6e5f85691222f23817a8c3ac8d3447f Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org>
* QQuickDwm: use QtWin::WindowFlip3DPolicyJ-P Nurmi2013-09-165-27/+14
| | | | | | Change-Id: Ifa74acbf7cde330838b37505e18a5b7376116216 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Make QtWin a Q_GADGET to expose the enums to the meta-systemJ-P Nurmi2013-09-161-175/+171
| | | | | | | | | | This allows us to use the QtWin enums in QML. Change-Id: I62cd21d850a9c2222ce901f166ab99859164a7fd Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
* Revamp QQuickDwmFeaturesJ-P Nurmi2013-09-134-38/+67
| | | | | | | | | | Add missing change notifiers, fix property names vs. isFoo() accessor names, remove unused member variables, fix the event filter and add missing updates... Change-Id: Ie86a89dc1415ad082ac5c2e839245d55a446a1d4 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* Overhaul the TaskbarButton QML typeJ-P Nurmi2013-09-125-49/+164
| | | | | | | | | | Make the overlay a grouped property, and use QQuickIconLoader internally to support remote icon sources. Change-Id: I888244fe5384702dceebe372b0bd0dd50891629a Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
* QWinTaskbarButton: use qt_qstringToNullTerminated()J-P Nurmi2013-09-111-4/+3
| | | | | | Change-Id: I45afc2906fac85b1db074f37040a1c81fb7379c5 Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
* Taskbar related class docs and overviewsJ-P Nurmi2013-09-118-16/+128
| | | | | | | Change-Id: Ib5aebea73f9637d62dc64f71050bb07b1998a66d Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com> Reviewed-by: Ivan Vizir <define-true-false@yandex.com>
* Tidy up the QtQuick classesJ-P Nurmi2013-09-1115-200/+214
| | | | | | | | | | | - not part of the public API => private header naming convention - unify class names (quick-prefix vs. win-prefix vs. quickwin-prefix) => drop the superfluous win-prefix from the class names, just like for the registered QML type names Change-Id: I408cb22b38ae1db71e9bd7cdb8fa29c1aa1f504a Reviewed-by: Ivan Vizir <define-true-false@yandex.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>