projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update genversion and Global to use version.dist
[quassel.git]
/
src
/
common
/
global.h
diff --git
a/src/common/global.h
b/src/common/global.h
index
d5fbdec
..
ac13646
100644
(file)
--- a/
src/common/global.h
+++ b/
src/common/global.h
@@
-33,16
+33,17
@@
namespace Global {
extern QString quasselVersion;
namespace Global {
extern QString quasselVersion;
- extern QString quasselDate;
- extern uint quasselBuild;
+ extern QString quasselBaseVersion;
+ extern QString quasselBuildDate;
+ extern QString quasselBuildTime;
+ extern QString quasselCommit;
+ extern uint quasselArchiveDate;
+ extern uint protocolVersion;
- //! Minimum client build number the core needs
- extern uint clientBuildNeeded;
- extern QString clientVersionNeeded;
+ extern uint clientNeedsProtocol; //< Minimum protocol version the client needs
+ extern uint coreNeedsProtocol; //< Minimum protocol version the core needs
- //! Minimum core build number the client needs
- extern uint coreBuildNeeded;
- extern QString coreVersionNeeded;
+ extern QString quasselGeneratedVersion; //< This is possibly set in version.gen
// We need different config (QSettings) files for client and gui, since the core cannot work with GUI types
// Set these here. They're used in ClientSettings and CoreSettings.
// We need different config (QSettings) files for client and gui, since the core cannot work with GUI types
// Set these here. They're used in ClientSettings and CoreSettings.
@@
-53,9
+54,10
@@
namespace Global {
extern RunMode runMode;
extern unsigned int defaultPort;
extern RunMode runMode;
extern unsigned int defaultPort;
- extern bool
SPUTDEV; // FIXME This is for internal use only!
+ extern bool
DEBUG;
void registerMetaTypes();
void registerMetaTypes();
+ void setupVersion();
};
#endif
};
#endif