Am 01.05.12 11:37 schrieb(en) Oliver Eichler:
PS: I must currently stick to SVN revision 3257 as source tree, currently being stuck on Ubuntu 10.04 and QT 4.6 for development (the changes made after 3257 introduce QT 4.7 dependencies that prevent a successful build)That is bad, because it will cause trouble in the merge. What is the bad dependency. Maybe we can work around.
I think so. The offending method is toMSecsSinceEpoch(), but the patch below
should IMHO serve exactly the same function.
Cheers, Albrecht.
---
Replace QDateTime::toMSecsSinceEpoch() by directly reading the milliseconds
element
from the related QTime object as to remove a Qt >= 4.7 requirement.
Index: src/CDeviceTwoNav.cpp
===================================================================
--- src/CDeviceTwoNav.cpp (Revision 3335)
+++ src/CDeviceTwoNav.cpp (Arbeitskopie)
@@ -716,7 +716,7 @@ void CDeviceTwoNav::readTrkFile(QDir &dir, const Q
time.setTimeSpec(Qt::UTC);
time = time.addYears(100);
pt.timestamp = time.toTime_t();
- pt.timestamp_msec = time.toMSecsSinceEpoch() - pt.timestamp *
1000;
+ pt.timestamp_msec = time.time().msec();
pt.ele = values[7].toFloat();
*track << pt;
pgpRd3CN5b6vE.pgp
Description: PGP signature
------------------------------------------------------------------------------ Live Security Virtual Conference Exclusive live event will cover all the ways today's security and threat landscape has changed and how IT managers can respond. Discussions will include endpoint security, mobile security and the latest in malware threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________ Qlandkartegt-users mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/qlandkartegt-users
