summaryrefslogtreecommitdiff
path: root/src/share
diff options
context:
space:
mode:
authorcon <qtc-committer@nokia.com>2011-02-10 20:58:17 +0100
committercon <qtc-committer@nokia.com>2011-02-18 17:15:41 +0100
commitb40500a7bf41bcb8cb49f4abd0cbbfb6f3880e53 (patch)
tree9086a83f5588a2673b10fe9751249995b2f512e3 /src/share
parent738d1ccec915f0ed0b7f96eb40352bd3886b38bb (diff)
downloadqt-creator-b40500a7bf41bcb8cb49f4abd0cbbfb6f3880e53.tar.gz
Add a generic variable chooser widget.
The chooser allows choosing variables from a list, and inserting them into previously focused line edit, text edit, or plain text edit. Variables are now registered with a description in the variable manager. Also make the QT_INSTALL_BINS --> CurrentProject:QT_INSTALL_BINS for consistency.
Diffstat (limited to 'src/share')
-rw-r--r--src/share/qtcreator/externaltools/lrelease.xml2
-rw-r--r--src/share/qtcreator/externaltools/lupdate.xml2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/share/qtcreator/externaltools/lrelease.xml b/src/share/qtcreator/externaltools/lrelease.xml
index 70f69c12fd..d42d15eacb 100644
--- a/src/share/qtcreator/externaltools/lrelease.xml
+++ b/src/share/qtcreator/externaltools/lrelease.xml
@@ -38,7 +38,7 @@
<category xml:lang="de">Linguist</category>
<order>2</order>
<executable>
- <path>%{QT_INSTALL_BINS}/lrelease</path>
+ <path>%{CurrentProject:QT_INSTALL_BINS}/lrelease</path>
<path>lrelease</path>
<arguments>%{CurrentProject:FilePath}</arguments>
<workingdirectory>%{CurrentProject:Path}</workingdirectory>
diff --git a/src/share/qtcreator/externaltools/lupdate.xml b/src/share/qtcreator/externaltools/lupdate.xml
index 65ce542efd..b3ed21a431 100644
--- a/src/share/qtcreator/externaltools/lupdate.xml
+++ b/src/share/qtcreator/externaltools/lupdate.xml
@@ -38,7 +38,7 @@
<category xml:lang="de">Linguist</category>
<order>1</order>
<executable>
- <path>%{QT_INSTALL_BINS}/lupdate</path>
+ <path>%{CurrentProject:QT_INSTALL_BINS}/lupdate</path>
<path>lupdate</path>
<arguments>%{CurrentProject:FilePath}</arguments>
<workingdirectory>%{CurrentProject:Path}</workingdirectory>