diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-07-12 14:03:21 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-07-12 14:03:21 +0200 |
| commit | 1866c13b7dd48aa0c6ede1cf7907a2640e9399f8 (patch) | |
| tree | 0b61c2d801525228f4c5795795d1cdeb57b3edfa /tests/auto/tools/qmake/testdata/functions | |
| parent | 5b648d4d79d07a7c851ce6211ffff8375d41bfa2 (diff) | |
| parent | 3ef6cf060e984bca43956a23b61b32ec7347cfc7 (diff) | |
Merge "Merge branch 'stable' into dev" into refs/staging/dev
Diffstat (limited to 'tests/auto/tools/qmake/testdata/functions')
| -rw-r--r-- | tests/auto/tools/qmake/testdata/functions/functions.pro | 3 | ||||
| -rw-r--r-- | tests/auto/tools/qmake/testdata/functions/infiletest.pro | 2 | ||||
| -rw-r--r-- | tests/auto/tools/qmake/testdata/functions/textfile | 1 |
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/qmake/testdata/functions/functions.pro b/tests/auto/tools/qmake/testdata/functions/functions.pro index bf1344eb68..84f97c2022 100644 --- a/tests/auto/tools/qmake/testdata/functions/functions.pro +++ b/tests/auto/tools/qmake/testdata/functions/functions.pro @@ -171,4 +171,5 @@ else: \ testReplace($$shell_quote($$in), $$out, "shell_quote") testReplace($$reverse($$list(one two three)), three two one, "reverse") -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 + +testReplace($$cat(textfile), hi '"holla he"' 'hu!') diff --git a/tests/auto/tools/qmake/testdata/functions/infiletest.pro b/tests/auto/tools/qmake/testdata/functions/infiletest.pro index 7dca60191e..821cb5cb2c 100644 --- a/tests/auto/tools/qmake/testdata/functions/infiletest.pro +++ b/tests/auto/tools/qmake/testdata/functions/infiletest.pro @@ -1,3 +1 @@ DEFINES = QT_DLL - -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/tools/qmake/testdata/functions/textfile b/tests/auto/tools/qmake/testdata/functions/textfile new file mode 100644 index 0000000000..a8248ed6f8 --- /dev/null +++ b/tests/auto/tools/qmake/testdata/functions/textfile @@ -0,0 +1 @@ +hi "holla he" hu! |