diff options
| author |  Robert Förster | 2014-02-27 20:04:41 +0000 |
|---|---|---|
| committer | Robert Förster | 2014-02-27 20:04:41 +0000 |
| commit | 17d7487d963e1a6f97bbe9b9665180c2eca00e9d (patch) | |
| tree | 1f2dd50c5ca9658b73308842cdfc85216f82e21e /src/modules/file/libkvifile.cpp | |
| parent | - some fixing for cmake 3 (diff) | |
| download | KVIrc-17d7487d963e1a6f97bbe9b9665180c2eca00e9d.tar.gz KVIrc-17d7487d963e1a6f97bbe9b9665180c2eca00e9d.tar.bz2 KVIrc-17d7487d963e1a6f97bbe9b9665180c2eca00e9d.zip | |
- bump to QT 4.7 (we have no QT 4.8 specific code)
- QT4 on MSVC still needs qtmain, the cmake policy does not apply there
- fix perl on windows, remove activestate hack, we don't support that anymore
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6371 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/file/libkvifile.cpp')
| -rw-r--r-- | src/modules/file/libkvifile.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp index 9b0329f83..b9cd95acc 100644 --- a/src/modules/file/libkvifile.cpp +++ b/src/modules/file/libkvifile.cpp @@ -1588,11 +1588,8 @@ static bool file_kvs_fnc_time(KviKvsModuleFunctionCall * c) c->warning(__tr2qs("Unknown option '%1', defaulting to 'm'").arg(szType)); time = f.lastModified(); } -#if QT_VERSION >= 0x040700 + c->returnValue()->setInteger(time.toMSecsSinceEpoch() / 1000); -#else - c->returnValue()->setInteger(time.toTime_t()); -#endif return true; } |