diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-07-15 10:51:00 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-17 09:39:53 +0200 |
| commit | d9751bc29d2f80b86eb237226ce832bf2e372f1d (patch) | |
| tree | 12e8390c3bc3d4826274c69adc43bd7d83565c1a | |
| parent | 37a8c1d1adc5a0951e1841bb3d9e89f6012ff984 (diff) | |
Disable dialogs to allow changes in qtbase (use urls internally)
Change-Id: I9ae09416acdbe437acbe9672d0ecfc42059695ae
Reviewed-by: David Faure <david.faure@kdab.com>
| -rw-r--r-- | src/imports/imports.pro | 3 | ||||
| -rw-r--r-- | tests/auto/quick/quick.pro | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/imports/imports.pro b/src/imports/imports.pro index 7a922a832e..6fbe8a51b8 100644 --- a/src/imports/imports.pro +++ b/src/imports/imports.pro @@ -10,7 +10,8 @@ qtHaveModule(quick) { qtquick2 \ particles \ window \ - dialogs \ +# disabled to allow file dialog changes to use urls internally (qtbase) +# dialogs \ testlib } diff --git a/tests/auto/quick/quick.pro b/tests/auto/quick/quick.pro index 81d4fd3348..d0f8c401d6 100644 --- a/tests/auto/quick/quick.pro +++ b/tests/auto/quick/quick.pro @@ -69,7 +69,8 @@ QUICKTESTS = \ qquickcanvasitem \ qquickscreen \ touchmouse \ - dialogs \ +# disabled to allow file dialog changes to use urls internally (qtbase) +# dialogs \ SUBDIRS += $$PUBLICTESTS |