diff options
| author | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-01 10:02:15 (GMT) |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@digia.com> | 2010-09-01 10:05:38 (GMT) |
| commit | dd1a7c2186348157c4a255f56f280006c8d8c17d (patch) | |
| tree | 6e4dad0e4957f0115afe5f249cf5e6db4b6efbf6 /mkspecs | |
| parent | 22fe21e22cf3a8aedea57e419034ed3245b10c0d (diff) | |
| download | Qt-dd1a7c2186348157c4a255f56f280006c8d8c17d.zip Qt-dd1a7c2186348157c4a255f56f280006c8d8c17d.tar.gz Qt-dd1a7c2186348157c4a255f56f280006c8d8c17d.tar.bz2 | |
QT_PLUGINS_BASE_DIR needs to be defined after load(qt_config)
QT_LIBINFIX is defined in qconfig.pri, so qt_config needs to be loaded
before that is used.
Reviewed-by: TrustMe
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/common/symbian/symbian.conf | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/common/symbian/symbian.conf b/mkspecs/common/symbian/symbian.conf index 04b81b0..61cc7d9 100644 --- a/mkspecs/common/symbian/symbian.conf +++ b/mkspecs/common/symbian/symbian.conf @@ -117,11 +117,12 @@ QMAKE_GZIP = gzip -9f QT_ARCH = symbian +load(qt_config) + # 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 -load(qt_config) load(symbian/platform_paths) # The Symbian^3 PDK does not necessarily contain the required sis files. |