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 <qt_sanity_bot@ovi.com> Reviewed-by:
Daniel Teske <daniel.teske@nokia.com>
Showing
- src/plugins/projectexplorer/gcctoolchain.cpp 46 additions, 5 deletionssrc/plugins/projectexplorer/gcctoolchain.cpp
- src/plugins/projectexplorer/gcctoolchain.h 3 additions, 0 deletionssrc/plugins/projectexplorer/gcctoolchain.h
- src/plugins/qt4projectmanager/qmakestep.cpp 11 additions, 5 deletionssrc/plugins/qt4projectmanager/qmakestep.cpp
- src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp 7 additions, 28 deletions...plugins/qt4projectmanager/qt-desktop/desktopqtversion.cpp
- src/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h 1 addition, 7 deletionssrc/plugins/qt4projectmanager/qt-desktop/desktopqtversion.h
- src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp 7 additions, 29 deletions...ugins/qt4projectmanager/qt-desktop/simulatorqtversion.cpp
- src/plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h 1 addition, 7 deletions...plugins/qt4projectmanager/qt-desktop/simulatorqtversion.h
- src/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/qt-s60/symbianqtversion.cpp
- src/plugins/qt4projectmanager/qt-s60/symbianqtversion.h 2 additions, 2 deletionssrc/plugins/qt4projectmanager/qt-s60/symbianqtversion.h
- src/plugins/qt4projectmanager/winceqtversion.cpp 1 addition, 1 deletionsrc/plugins/qt4projectmanager/winceqtversion.cpp
- src/plugins/qt4projectmanager/winceqtversion.h 1 addition, 1 deletionsrc/plugins/qt4projectmanager/winceqtversion.h
- src/plugins/qtsupport/baseqtversion.cpp 11 additions, 8 deletionssrc/plugins/qtsupport/baseqtversion.cpp
- src/plugins/qtsupport/baseqtversion.h 3 additions, 1 deletionsrc/plugins/qtsupport/baseqtversion.h
- src/plugins/remotelinux/maemoqtversion.cpp 1 addition, 1 deletionsrc/plugins/remotelinux/maemoqtversion.cpp
- src/plugins/remotelinux/maemoqtversion.h 1 addition, 1 deletionsrc/plugins/remotelinux/maemoqtversion.h
Loading
Please register or sign in to comment