diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-12 06:50:55 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2009-12-12 06:50:55 (GMT) |
commit | b1906f053ec1a9c90c4df1870568e3036fae6b9b (patch) | |
tree | 09d595ad5e698561f7b094dab2983bed350ec7c6 /configure | |
parent | 1860aa75013a4d91b553c9dadf8130cc06a96641 (diff) | |
parent | dacbb8b055815f629e2eeccdb7d4ca4cc5a2f839 (diff) | |
download | Qt-b1906f053ec1a9c90c4df1870568e3036fae6b9b.zip Qt-b1906f053ec1a9c90c4df1870568e3036fae6b9b.tar.gz Qt-b1906f053ec1a9c90c4df1870568e3036fae6b9b.tar.bz2 |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into qt-integration
* '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
Update Polish translations
Assistant: Add documentation for -remove-search-index.
Designer: Handle "visible"-properties of item view headers correctly.
Fix .gitignore to not ignore qdoc.pro
Update polish translations
Fix broken delete key, some cleanup.
Assistant: Fix race condition in index creation.
Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -2894,7 +2894,7 @@ fi # pass on $CFG_SDK to the configure tests. if [ '!' -z "$CFG_SDK" ]; then - MAC_CONFIG_TEST_COMMANDLINE="-sdk $CFG_SDK" + MAC_CONFIG_TEST_COMMANDLINE="$MAC_CONFIG_TEST_COMMANDLINE -sdk $CFG_SDK" fi # find the default framework value |