From aaf260c04b27cc066939de1cc9ad1dafd76ebfa7 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 6 Sep 2011 15:19:05 +0000 Subject: ABI: Improve tool chain selection for Qt projects * Set a null-ABI for toolchains where detection of ABI failed: This allows the user to select any tool chain. * Warn if ABI detection fails by showing a message in the Qt version setup dialog * Do not override the mkspec if the Qt version has a null ABI only: We (have to) trust the user to know what he is doing in that case. * GCC: Add version information to GCC tool chain and use it to select the mkspec on Mac. * GCC: Do not override mkspec if we do a cross-compile (and actually detect that). * GCC: Leave out -32 or -64 from mkspec if the compiler binaries ABI matches the target ABI. * Linux-generic is compatible with all other linuxes (both ways) The targets themselves do additional filtering and will remove anything that does not work for them anyway. Task-number: QTCREATORBUG-5756 Task-number: QTCREATORBUG-5960 Change-Id: Ib3c0ac91f3aa8e2a823e3e9891a02bdccb97af14 Reviewed-on: http://codereview.qt-project.org/4281 Reviewed-by: Qt Sanity Bot Reviewed-by: Daniel Teske --- src/plugins/qt4projectmanager/winceqtversion.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/plugins/qt4projectmanager/winceqtversion.h') diff --git a/src/plugins/qt4projectmanager/winceqtversion.h b/src/plugins/qt4projectmanager/winceqtversion.h index b57e01fd50..7bff4a8063 100644 --- a/src/plugins/qt4projectmanager/winceqtversion.h +++ b/src/plugins/qt4projectmanager/winceqtversion.h @@ -48,7 +48,7 @@ public: QString type() const; - QList qtAbis() const; + QList detectQtAbis() const; bool supportsTargetId(const QString &id) const; QSet supportedTargetIds() const; -- cgit v1.2.1