diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 22:30:27 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-11-26 22:35:48 +0100 |
| commit | 4a8273a6fc2e741e811cf5dabc9a3c240306cf7f (patch) | |
| tree | 2148abc88f8543eecdc0b97b2dd92594836af9b2 /src/corelib/io/qdir.cpp | |
| parent | 036c5db468164297d213764c59a4b59daa76d90a (diff) | |
| parent | 1c2be58fecaff1de5f2849192eb712984ebd59bd (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).
Conflicts:
configure
qmake/generators/win32/msvc_nmake.cpp
src/3rdparty/angle/src/libEGL/Surface.cpp
src/angle/src/common/common.pri
src/corelib/global/qglobal.h
src/corelib/io/qstandardpaths.cpp
src/plugins/platforms/qnx/qqnxintegration.cpp
src/plugins/platforms/qnx/qqnxscreeneventhandler.h
src/plugins/platforms/xcb/qglxintegration.h
src/widgets/kernel/win.pri
tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
tools/configure/configureapp.cpp
Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812
Diffstat (limited to 'src/corelib/io/qdir.cpp')
| -rw-r--r-- | src/corelib/io/qdir.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/corelib/io/qdir.cpp b/src/corelib/io/qdir.cpp index bb2b2e99f3..624f45caaf 100644 --- a/src/corelib/io/qdir.cpp +++ b/src/corelib/io/qdir.cpp @@ -1863,9 +1863,12 @@ bool QDir::setCurrent(const QString &path) */ /*! - Returns the absolute path of the application's current directory. + Returns the absolute path of the application's current directory. The + current directory is the last directory set with QDir::setCurrent() or, if + that was never called, the directory at which this application was started + at by the parent process. - \sa current(), setCurrent(), homePath(), rootPath(), tempPath() + \sa current(), setCurrent(), homePath(), rootPath(), tempPath(), QCoreApplication::applicationDirPath() */ QString QDir::currentPath() { @@ -2205,10 +2208,10 @@ QStringList QDir::nameFiltersFromString(const QString &nameFilter) \relates QDir Initializes the resources specified by the \c .qrc file with the - specified base \a name. Normally, Qt resources are loaded - automatically at startup. The Q_INIT_RESOURCE() macro is - necessary on some platforms for resources stored in a static - library. + specified base \a name. Normally, when resources are built as part + of the application, the resources are loaded automatically at + startup. The Q_INIT_RESOURCE() macro is necessary on some platforms + for resources stored in a static library. For example, if your application's resources are listed in a file called \c myapp.qrc, you can ensure that the resources are |