diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2013-03-02 18:28:57 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-04 14:54:57 +0100 |
| commit | 4c1e7305e5a8687bbb029b3e5a3a0ec206909567 (patch) | |
| tree | a36def674a1c17e0622fc30e574ea4401f86e5e8 /mkspecs/common | |
| parent | e3f36e7290aef480df1aaae90611691bfb2f1f95 (diff) | |
Teach configure's pro-file parser to parse quoted $$system()
If the command is quoted, it can contain anything but quotes (we do not
support escaped quotes, so single quotes have to be used). If the
command is unquoted we look for the first closing parenthesis. We used
to do this using .*?, but the greedy modifier '?' didn't seem to work,
so we now use an inverse character set.
Change-Id: I40660ce7aef6a6b6d480292d28da1b079bb161da
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/common')
| -rw-r--r-- | mkspecs/common/xcode.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/xcode.conf b/mkspecs/common/xcode.conf index 800e2e849c..d38a7bdf6d 100644 --- a/mkspecs/common/xcode.conf +++ b/mkspecs/common/xcode.conf @@ -3,7 +3,7 @@ # # Get path of Xcode's Developer directory -QMAKE_XCODE_DEVELOPER_PATH = $$system(xcode-select --print-path) +QMAKE_XCODE_DEVELOPER_PATH = $$system("xcode-select --print-path") isEmpty(QMAKE_XCODE_DEVELOPER_PATH): \ error("Xcode path is not set. Please use xcode-select to choose Xcode installation path.") |