summaryrefslogtreecommitdiffstats
path: root/src/corelib/io/qfileselector.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Merge remote-tracking branch 'origin/stable' into dev" into ↵Frederik Gladhorn2014-05-131-0/+5
|\ | | | | | | refs/staging/dev
| * Add winrt and winphone to the list of platform file selector namesAndrew Knight2014-05-031-0/+5
| | | | | | | | | | | | Change-Id: Ifdab4184f048572c6f0e0496f6d6be2c5f92d1cc Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* | Add QSysInfo::osType()Thiago Macieira2014-05-091-7/+2
|/ | | | | | | | | | | | This function returns the OS kernel type. It's usually the same as the first part of the mkspec, in qmake, or the result of uname. Usually, because it's not the case for a few systems, like Android, OS X, iOS, BlackBerry, etc. Change-Id: I295d92048d33ef02987e8696772ea89e925428d3 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Sergio Ahumada <sahumada@blackberry.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
* QFileSelector: correct the macros for Apple platforms.Jake Petroules2014-02-041-5/+9
| | | | | | | | | | | | | This fixes a serious regression from 7d72516b52b20b0782d972224a55a43e74b8ae5a. [ChangeLog] QFileSelector: the identifier for OS X has been changed back to 'osx' from 'mac', and 'mac' and 'darwin' have now been added as selectors for Darwin OS (which is the base of both OS X and iOS). Task-number: QTBUG-35073 Change-Id: I83183e34c5a697338cc1ddcac33a41bd379ded12 Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* QFileSelector: correct the macro for android platformLiang Qi2014-01-301-2/+2
| | | | | | | Task-number: QTBUG-35073 Change-Id: I50d254ae61dac3cedc11291bd5ed35f9f9447622 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Alan Alpert <aalpert@blackberry.com>
* Add missed header to qfileselector.cpp.Ivan Komissarov2014-01-031-0/+4
| | | | | Change-Id: I2fd6fb2ae1663730a008221f6beeef19a5307246 Reviewed-by: David Faure <david.faure@kdab.com>
* Improve QFileSelector docAlan Alpert2013-12-301-27/+36
| | | | | | | | | Mostly just adding proper tags and sections, as well as a few grammatical fixes. Change-Id: I219517d740fa7385e923a9e09cb7e241378fcbdd Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: Martin Smith <martin.smith@digia.com>
* QNX: Fix buildFrank Osterfeld2013-11-201-0/+2
| | | | | | | | Return "qnx" on non-BB10 QNX. Task-number: QTBUG-34980 Change-Id: I80a95f8d4945fb180fdd565147cf344b51d79fda Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
* Change platform selectors to match qmake selectorsAlan Alpert2013-11-151-12/+18
| | | | | | | | | | Previously matched Qt.platform.os, however that can only provide one string. Multiple selectors can be present at once, so we can provide both unix and linux instead of having to pick the most specialized one. Task-number: QTBUG-34796 Change-Id: I219517d740fa7385e923a9e09cb7e241378fbaee Reviewed-by: David Faure <david.faure@kdab.com>
* Use the correct identifier for the OS X operating system.Jake Petroules2013-09-211-3/+3
| | | | | | | | This is consistent with other areas of Qt: qmake, Qt.platform.os (QML), qbs.targetOS (QBS), and #define Q_OS_OSX. Change-Id: Ibf98e6ba3556a14187dadae1b0235e9c907c9001 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
* Change QT_FILE_SELECTORS to be comma separatedAlan Alpert2013-09-201-5/+1
| | | | | | | | | | It is not full paths being used, so switching to comma does not require different environment variables per platform nor does it appear to be platform dependent. Change-Id: I219517d740fa7385e923a9e09cb7e241378f85ba Reviewed-by: Thiago Macieira <thiago.macieira@intel.com> Reviewed-by: David Faure <david.faure@kdab.com>
* Add QFileSelector APIAlan Alpert2013-09-161-0/+383
For easy cross-platform and cross-device UIs, automatic asset swapping based on filename is being developed. This API provides the logic for the swapping, so that applications can use it themselves with the same logic as any automatic swapping done in application templates. Selector set is initially minimal, aiming for just platform selection and enabling a common selection mechanism for Qt platforms to use. Change-Id: I219517d740fa7385e923a9e09cb7e241378f857a Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-04 14:42:03 +0000