diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-16 09:26:02 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-16 09:26:02 +0200 |
| commit | 8b3671923794d10c5cb33077e9f392992c4b529d (patch) | |
| tree | 7f0cdb32438bdf70dde875c8a4eb4c138bf6b369 | |
| parent | 8cd7557cb45f8732f253a5242c3843c154219d5b (diff) | |
| parent | f8a48df4fcb2b40c2978c4e446bc6599c942aa32 (diff) | |
| download | qtscript-8b3671923794d10c5cb33077e9f392992c4b529d.tar.gz | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I42c37ff61d79826c4dd1ee8e4d3816b9b4929bdd
| -rw-r--r-- | tests/auto/headersclean/headersclean.pro | 3 | ||||
| -rw-r--r-- | tests/auto/host.pro | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro deleted file mode 100644 index 4c6c350..0000000 --- a/tests/auto/headersclean/headersclean.pro +++ /dev/null @@ -1,3 +0,0 @@ -QT = script scripttools -load(qt_headersclean) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/host.pro b/tests/auto/host.pro index 6bc8753..4095052 100644 --- a/tests/auto/host.pro +++ b/tests/auto/host.pro @@ -1,4 +1,4 @@ TEMPLATE=subdirs SUBDIRS=\ - headersclean \ + |