Commit bc9693c8 authored by Jan Möbius's avatar Jan Möbius

Some changes to output used compiler

git-svn-id: http://www.openflipper.org/svnrepo/OpenFlipper/branches/Free@8097 383ad7c9-94d9-4d36-a494-682f7c89f535
parent 83c2da4e
......@@ -58,9 +58,24 @@
#include <QDir>
#include <QCoreApplication>
#if defined(__GNUC__)
#if defined(__GNUC_PATCHLEVEL__)
#define __GNUC_VERSION__ ( __GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100 \
+ __GNUC_PATCHLEVEL__)
#else
#define __GNUC_VERSION__ ( __GNUC__ * 10000 \
+ __GNUC_MINOR__ * 100)
#endif
#endif
namespace OpenFlipper {
namespace Options {
/// This Variable will hold special compiler information
static QString compilerInfo_ = "";
/// Pointer to the internal settings object storing OpenFlippers program options ( and the pplugins Options)
static QSettings* settings_ = 0;
......@@ -795,6 +810,17 @@ bool renderPicking( ) {
bool initializeSettings() {
#if defined(__GNUC__)
compilerInfo_ = "Gnu CC";
#else
#if defined (_MSC_FULL_VER)
compilerInfo_ = "MSVC";
#else
compilerInfo_ = "Unknown";
#endif
#endif
//==================================================================================================
// Get the Main config dir in the home directory and possibly create it
//==================================================================================================
......@@ -980,6 +1006,10 @@ void closeSettings() {
// Delete the settings object. This will flush all data to the disk.
delete settings_;
}
QString compilerInfo() {
return compilerInfo_;
}
}
}
......@@ -994,5 +1024,7 @@ QSettings& OpenFlipperSettings() {
return emptySettings;
}
//=============================================================================
......@@ -784,6 +784,10 @@ QString updatePassword( );
DLLEXPORT
QString coreVersion();
/// Information about the used compiler
DLLEXPORT
QString compilerInfo();
/** @} */
//===========================================================================
......
......@@ -143,6 +143,13 @@ void CoreWidget::showAboutWidget( ) {
aboutWidget_->OpenFlipperAbout->append(tr("Currently used Version:\t") + qVersion() );
aboutWidget_->OpenFlipperAbout->append(tr("Link time Version:\t\t") + QT_VERSION_STR );
// =====================================================================================
// Compiler information
// =====================================================================================
aboutWidget_->OpenFlipperAbout->append("\n");
aboutWidget_->OpenFlipperAbout->append(tr("Compiler Version Info:"));
aboutWidget_->OpenFlipperAbout->append( OpenFlipper::Options::compilerInfo() );
// =====================================================================================
// List the currently registered data types
// =====================================================================================
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment