diff options
| author | Timur Pocheptsov <timur.pocheptsov@theqtcompany.com> | 2016-07-05 19:20:05 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-07-05 20:51:40 +0000 |
| commit | 6c935dc74fa9e997144499d7aa34ef5aad389fbb (patch) | |
| tree | 7d34363555f5aa115d850c02279d02646348731a /qmake/library | |
| parent | b073ba57f821b2e79c553f974d9fba2cbb034ee9 (diff) | |
| parent | b5695bd5be908970244919bcd7c19cbf7ccca2c4 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'qmake/library')
| -rw-r--r-- | qmake/library/qmakeevaluator.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/qmake/library/qmakeevaluator.h b/qmake/library/qmakeevaluator.h index 5477d82f26..f9da7e9a61 100644 --- a/qmake/library/qmakeevaluator.h +++ b/qmake/library/qmakeevaluator.h @@ -177,7 +177,6 @@ public: void setTemplate(); ProStringList split_value_list(const QString &vals, const ProFile *source = 0); - ProStringList expandVariableReferences(const ProString &value, int *pos = 0, bool joined = false); ProStringList expandVariableReferences(const ushort *&tokPtr, int sizeHint = 0, bool joined = false); QString currentFileName() const; |