diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-17 07:54:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-08-17 07:54:48 (GMT) |
| commit | 4b90559d0a8b693241dd79682d0d31362497468b (patch) | |
| tree | 7b0c95682018fa1001189165068ab2d0477a395c /tests | |
| parent | 3a2cedde7c5d706cf21e088856f5477e9b038347 (diff) | |
| parent | 3be7f871f07041477b5bca0182623b36afd2b3e6 (diff) | |
| download | Qt-4b90559d0a8b693241dd79682d0d31362497468b.zip Qt-4b90559d0a8b693241dd79682d0d31362497468b.tar.gz Qt-4b90559d0a8b693241dd79682d0d31362497468b.tar.bz2 | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team
* 'master' of git://scm.dev.nokia.troll.no/qt/qt-qa-team:
test: Fix `tst_qfiledialog' in a namespaced build
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qfiledialog/tst_qfiledialog.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/qfiledialog/tst_qfiledialog.cpp b/tests/auto/qfiledialog/tst_qfiledialog.cpp index 08d2e88..81da8a3 100644 --- a/tests/auto/qfiledialog/tst_qfiledialog.cpp +++ b/tests/auto/qfiledialog/tst_qfiledialog.cpp @@ -80,7 +80,9 @@ # define SRCDIR "C:/Private/" TOSTRING(SYMBIAN_SRCDIR_UID) "/" #elif defined(Q_OS_UNIX) #ifdef QT_BUILD_INTERNAL +QT_BEGIN_NAMESPACE extern Q_GUI_EXPORT QString qt_tildeExpansion(const QString &path, bool *expanded = 0); +QT_END_NAMESPACE #endif #endif |