diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-04 07:28:07 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-09-04 07:28:07 +0200 |
| commit | 4c68560009e29609ef00b5fc3b4ba430471f3589 (patch) | |
| tree | 1d5033319695c95dbfe3efbf9d095968bbe666e4 | |
| parent | a669c33d9c6f42a29d31f493a888ec4fef29bcd8 (diff) | |
| parent | b0382acf65dbc0debcb7cf956ba954117a682d90 (diff) | |
| download | qtquick1-4c68560009e29609ef00b5fc3b4ba430471f3589.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into dev
Change-Id: I9448cc3d5a89596e7b0afe30ad9e9ef5cb8130c8
4 files changed, 10 insertions, 0 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 03d250f6..e8e1a33d 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -47,6 +47,9 @@ #include "testhttpserver.h" +#if defined(Q_OS_OSX) +#include <unistd.h> +#endif DEFINE_BOOL_CONFIG_OPTION(qmlCheckTypes, QML_CHECK_TYPES) diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index 33fb60fb..b3ea9923 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -43,6 +43,9 @@ #define SERVER_ADDR "http://127.0.0.1:14450" #define SERVER_PORT 14450 +#if defined(Q_OS_MAC) +#include <unistd.h> +#endif class tst_qdeclarativemoduleplugin : public QDeclarativeDataTest { diff --git a/tests/auto/declarative/qdeclarativetextedit/BLACKLIST b/tests/auto/declarative/qdeclarativetextedit/BLACKLIST new file mode 100644 index 00000000..6a946bc5 --- /dev/null +++ b/tests/auto/declarative/qdeclarativetextedit/BLACKLIST @@ -0,0 +1,2 @@ +[openInputPanelOnClick] +linux diff --git a/tests/auto/declarative/qdeclarativetextinput/BLACKLIST b/tests/auto/declarative/qdeclarativetextinput/BLACKLIST index 13d5eba7..3725c29b 100644 --- a/tests/auto/declarative/qdeclarativetextinput/BLACKLIST +++ b/tests/auto/declarative/qdeclarativetextinput/BLACKLIST @@ -1,2 +1,4 @@ [validators] osx +[positionAt] +linux |