diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-28 16:10:22 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-07-29 10:55:04 (GMT) |
| commit | 21e5823e431bb8a64a048e61419b7bfc56f674d6 (patch) | |
| tree | 4ffcf055a19010d11eb34ba7a0e61430e4cce45e /tools/configure | |
| parent | 45919e5085ff07348d1be8e1d37c0f6544fab7b1 (diff) | |
| download | Qt-21e5823e431bb8a64a048e61419b7bfc56f674d6.zip Qt-21e5823e431bb8a64a048e61419b7bfc56f674d6.tar.gz Qt-21e5823e431bb8a64a048e61419b7bfc56f674d6.tar.bz2 | |
Remove "no-stl" from the build key and add compatibility for old plugins.
STL support hasn't had binary compatibility effects for the entire
lifetime of Qt 4, so it should never have been there. It is a legacy
thing I am now correcting.
When inspecting a plugin, remove the "no-stl" from its loaded build
key. That indicates a pre-4.6 build, since now Qt no longer adds it to
its own build keys.
Note that you have to remove the 4.6 plugin cache from
$HOME/.config/Trolltech.conf or the registry for this change to work
(if you compile Qt with -no-stl). Otherwise, plugins that have already
been scanned will fail to load.
Reviewed-by: Bradley T. Hughes
Diffstat (limited to 'tools/configure')
| -rw-r--r-- | tools/configure/configureapp.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 39588e6..c938919 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2045,8 +2045,6 @@ void Configure::generateBuildKey() QStringList build_options; if (!dictionary["QCONFIG"].isEmpty()) build_options += dictionary["QCONFIG"] + "-config "; - if (dictionary["STL"] == "no") - build_options += "no-stl"; build_options.sort(); // Sorted defines that start with QT_NO_ |