summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-01-23 18:08:30 (UTC)
committer mickeyl <mickeyl>2005-01-23 18:08:30 (UTC)
commitda166ce6066568db9b7ac0bf5c2cc0dc9afb0776 (patch) (side-by-side diff)
tree2a26219682f582a68fbcbe356f3755655b59664d
parent701dd4a1e9c64294a9d8947df18a5414bbf62a4f (diff)
downloadopie-da166ce6066568db9b7ac0bf5c2cc0dc9afb0776.zip
opie-da166ce6066568db9b7ac0bf5c2cc0dc9afb0776.tar.gz
opie-da166ce6066568db9b7ac0bf5c2cc0dc9afb0776.tar.bz2
show Qt version instead of the builder name which is more or less irrelevant nowadays
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/sysinfo.pro2
-rw-r--r--noncore/settings/sysinfo/versioninfo.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/noncore/settings/sysinfo/sysinfo.pro b/noncore/settings/sysinfo/sysinfo.pro
index fc754d7..e1d6449 100644
--- a/noncore/settings/sysinfo/sysinfo.pro
+++ b/noncore/settings/sysinfo/sysinfo.pro
@@ -18,19 +18,19 @@ SOURCES = main.cpp \
load.cpp \
storage.cpp \
processinfo.cpp \
modulesinfo.cpp \
detail.cpp \
contrib/dhry.c contrib/fft.c \
benchmarkinfo.cpp \
sysloginfo.cpp \
versioninfo.cpp \
sysinfo.cpp
INCLUDEPATH += $(OPIEDIR)/include
DEPENDPATH += $(OPIEDIR)/include
LIBS += -lqpe -lopiecore2 -lopieui2
DEFINES += UNIX
TARGET = sysinfo
-VERSION = 1.2.1
+VERSION = 1.2.2
include( $(OPIEDIR)/include.pro )
diff --git a/noncore/settings/sysinfo/versioninfo.cpp b/noncore/settings/sysinfo/versioninfo.cpp
index 2111298..d8fd7fa 100644
--- a/noncore/settings/sysinfo/versioninfo.cpp
+++ b/noncore/settings/sysinfo/versioninfo.cpp
@@ -65,34 +65,34 @@ VersionInfo::VersionInfo( QWidget *parent, const char *name, WFlags f )
kernelVersionString.append( strList[2] );
kernelVersionString.append( "<br>" );
kernelVersionString.append( tr( "Compiled by: " ) );
kernelVersionString.append( strList[3] );
kernelVersionString.append("</qt>");
file.close();
}
QString palmtopVersionString = "<qt>" + tr( "<b>Opie</b><p>Version: " );
palmtopVersionString.append( QPE_VERSION );
palmtopVersionString.append( "<br>" );
#ifdef QPE_VENDOR
QString builder = QPE_VENDOR;
#else
QString builder = "Unknown";
#endif
- palmtopVersionString.append( tr( "Compiled by: " ) );
- palmtopVersionString.append( builder );
+ palmtopVersionString.append( tr( "Built against Qt/E " ) );
+ palmtopVersionString.append( QT_VERSION_STR );
palmtopVersionString.append( "<br>" );
palmtopVersionString.append( tr( "Built on: " ) );
palmtopVersionString.append( __DATE__ );
palmtopVersionString.append( "</qt>" );
QHBoxLayout *hb1 = new QHBoxLayout( vb );
hb1->setSpacing( 2 );
QLabel *palmtopLogo = new QLabel( container );
QImage logo1 = Resource::loadImage( "logo/opielogo" );
logo1 = logo1.smoothScale( 50, 55 );
QPixmap logo1Pixmap;
logo1Pixmap.convertFromImage( logo1 );
palmtopLogo->setPixmap( logo1Pixmap );
palmtopLogo->setFixedSize( 60, 60 );
hb1->addWidget( palmtopLogo, 0, Qt::AlignTop + Qt::AlignLeft );