diff options
| author | David Boddie <dboddie@trolltech.com> | 2009-06-11 16:47:38 (GMT) |
|---|---|---|
| committer | David Boddie <dboddie@trolltech.com> | 2009-06-11 16:47:38 (GMT) |
| commit | 6564a1262c6a151336a35e722e437b6f1a192c54 (patch) | |
| tree | 5d104b59f033052b2e450acfceb981fee401607d | |
| parent | 3c4239a9ced4945e9b016a755180fac2f6b3a5ab (diff) | |
| parent | 021ce0ba93168dcaf1744fc2da8faf4e2f4ba683 (diff) | |
| download | Qt-6564a1262c6a151336a35e722e437b6f1a192c54.zip Qt-6564a1262c6a151336a35e722e437b6f1a192c54.tar.gz Qt-6564a1262c6a151336a35e722e437b6f1a192c54.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/corelib/io/qsettings_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index 93d07e0..565aeb6 100644 --- a/src/corelib/io/qsettings_p.h +++ b/src/corelib/io/qsettings_p.h @@ -146,7 +146,7 @@ inline QString QSettingsGroup::toString() const return result; } -class QConfFile +class Q_AUTOTEST_EXPORT QConfFile { public: ParsedSettingsMap mergedKeyMap() const; |