diff options
author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-15 00:00:10 (GMT) |
---|---|---|
committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-12-15 00:00:10 (GMT) |
commit | d8df35d7949a619cb9ca86bf111fd892d06f674a (patch) | |
tree | 0eab085b5e4e03b36d06f64e0f9908955187c975 /mkspecs/common/symbian/symbian.conf | |
parent | a8759624f80cbad50a94aacb955c75fbad3613e4 (diff) | |
parent | d6dace9bebd8a8ad8caaecb69dd24dd1ddf96f4a (diff) | |
download | Qt-d8df35d7949a619cb9ca86bf111fd892d06f674a.zip Qt-d8df35d7949a619cb9ca86bf111fd892d06f674a.tar.gz Qt-d8df35d7949a619cb9ca86bf111fd892d06f674a.tar.bz2 |
Merge branch 'master-upstream' into master-water
Diffstat (limited to 'mkspecs/common/symbian/symbian.conf')
-rw-r--r-- | mkspecs/common/symbian/symbian.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index bc5ea45..d2afb51 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -147,7 +147,7 @@ SYMBIAN_SUPPORTED_LANGUAGES = \ # These directories must match what configure uses for QT_INSTALL_PLUGINS and QT_INSTALL_IMPORTS QT_PLUGINS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/plugins -QT_IMPORTS_BASE_DIR = /resource/qt/imports +QT_IMPORTS_BASE_DIR = /resource/qt$${QT_LIBINFIX}/imports load(symbian/platform_paths) |