diff options
| author | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
|---|---|---|
| committer | Thomas Zander <t.zander@nokia.com> | 2010-10-06 12:32:43 (GMT) |
| commit | e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d (patch) | |
| tree | 08fa39a9605ec38a45247baea0e2053179f5970f /tests/auto/qsettings | |
| parent | 838ed9c68aef4d5a4f0b4d4dbbc1c1f7797cde91 (diff) | |
| parent | 901ea45ca02dc8fbbf3f6112240c4e468c240b73 (diff) | |
| download | Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.zip Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.gz Qt-e3724aeab93a2ab3cc5b1d78c42f9a4e2f60628d.tar.bz2 | |
Merge commit 'origin/master' into fileEngines
Conflicts:
src/s60installs/bwins/QtCoreu.def
Diffstat (limited to 'tests/auto/qsettings')
| -rw-r--r-- | tests/auto/qsettings/qsettings.pro | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/tests/auto/qsettings/qsettings.pro b/tests/auto/qsettings/qsettings.pro index 115fb13..19513b3 100644 --- a/tests/auto/qsettings/qsettings.pro +++ b/tests/auto/qsettings/qsettings.pro @@ -5,3 +5,4 @@ RESOURCES += qsettings.qrc contains(QT_CONFIG, qt3support):QT += qt3support CONFIG -= debug CONFIG += release +win32-msvc*:LIBS += advapi32.lib |