diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-12 13:37:38 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-12 13:37:38 +0200 |
| commit | 637d751a0cd52136599162f8227312e6e45f5499 (patch) | |
| tree | e7b6a209566914d9e89867622524c637d306f848 | |
| parent | 486936ac870d88d7d06a2fee3c0d237d3e647e2e (diff) | |
| parent | d709388240837cf82cb68ac98c60c1565132a802 (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I927061263d64f236a2dde6f77cd5d2f034bcaace
| -rw-r--r-- | tests/auto/auto.pro | 1 | ||||
| -rw-r--r-- | tests/auto/headersclean/headersclean.pro | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index bfa2c7c..3a2d881 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -1,6 +1,5 @@ TEMPLATE = subdirs SUBDIRS = \ - headersclean \ macfunctions ### FIXME Mac native toolbar is now private in this module #SUBDIRS += cmake diff --git a/tests/auto/headersclean/headersclean.pro b/tests/auto/headersclean/headersclean.pro deleted file mode 100644 index 99d4385..0000000 --- a/tests/auto/headersclean/headersclean.pro +++ /dev/null @@ -1,2 +0,0 @@ -QT = macextras -load(qt_headersclean) |