diff options
| author | J-P Nurmi <jpnurmi@digia.com> | 2014-05-14 16:47:59 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@digia.com> | 2014-05-14 16:47:59 +0200 |
| commit | ce4054c193ed3e6f578cbaa5dd30dfd69e765a6e (patch) | |
| tree | b17bbd0da004c5199a2eea5550e6a99d45bf26f0 /src/dialogs/qquickplatformfiledialog.cpp | |
| parent | 5988cfda014ffbe8ab8640f84c4fc704335b205d (diff) | |
| parent | efbaa82fc79f3bee5486c12acf21e71cfaaed093 (diff) | |
| download | qtquickcontrols-ce4054c193ed3e6f578cbaa5dd30dfd69e765a6e.tar.gz | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
.qmake.conf
src/controls/Private/TabBar.qml
Change-Id: Id176e44fe8e402c1c2c021ecb63c8c5c75736d47
Diffstat (limited to 'src/dialogs/qquickplatformfiledialog.cpp')
| -rw-r--r-- | src/dialogs/qquickplatformfiledialog.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dialogs/qquickplatformfiledialog.cpp b/src/dialogs/qquickplatformfiledialog.cpp index 5a969adb..c4a39060 100644 --- a/src/dialogs/qquickplatformfiledialog.cpp +++ b/src/dialogs/qquickplatformfiledialog.cpp @@ -264,7 +264,7 @@ QPlatformFileDialogHelper *QQuickPlatformFileDialog::helper() The value of this property is also updated after the dialog is closed. - By default, this property is false. + By default, the url is empty. */ /*! |