projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'seezer'
[quassel.git]
/
src
/
common
/
global.cpp
diff --git
a/src/common/global.cpp
b/src/common/global.cpp
index
a062886
..
8941d5b
100644
(file)
--- a/
src/common/global.cpp
+++ b/
src/common/global.cpp
@@
-110,13
+110,11
@@
void Global::setupVersion() {
quasselVersion = QString("v%1 (unknown rev)").arg(quasselBaseVersion);
} else {
QStringList parts = quasselGeneratedVersion.split(':');
quasselVersion = QString("v%1 (unknown rev)").arg(quasselBaseVersion);
} else {
QStringList parts = quasselGeneratedVersion.split(':');
-
if(parts.count() < 2) parts.append("unknown rev"
);
-
quasselVersion = QString("v%1 (%2)").arg(parts[0], parts[1]
);
+
quasselVersion = QString("v%1").arg(parts[0]
);
+
if(parts.count() >= 2) quasselVersion.append(QString(" (%1)").arg(parts[1])
);
}
}
-# ifdef __DATE__
- quasselBuildDate = __DATE__;
-# endif
-
+ quasselBuildDate = __DATE__;
+ quasselBuildTime = __TIME__;
}
// Static variables
}
// Static variables
@@
-125,6
+123,7
@@
QString Global::quasselVersion;
QString Global::quasselBaseVersion;
QString Global::quasselGeneratedVersion;
QString Global::quasselBuildDate;
QString Global::quasselBaseVersion;
QString Global::quasselGeneratedVersion;
QString Global::quasselBuildDate;
+QString Global::quasselBuildTime;
uint Global::protocolVersion;
uint Global::clientNeedsProtocol;
uint Global::coreNeedsProtocol;
uint Global::protocolVersion;
uint Global::clientNeedsProtocol;
uint Global::coreNeedsProtocol;