Hi,
in SVN r13924, a build failure was introduced into src/MainWindow.cpp when
TRANSDIR_MERKAARTOR
and/or TRANSDIR_SYSTEM are set.
In r14681, it was resolved for TRANSDIR_MERKAARTOR by quoting the
defined string using STRINGIFY(). Yet this remains to be done for
TRANSDIR_SYSTEM.
An easy patch is attached.
Thanks,
Moritz
--- /home/mbarsnic/tmp/sw/merkaartor-SVN-r15281/src/MainWindow.cpp
2009-05-28 09:55:45.053421000 +0200
+++ src/MainWindow.cpp 2009-05-28 10:16:30.850219744 +0200
@@ -2480,10 +2480,10 @@
qtTranslator = new QTranslator;
#ifdef TRANSDIR_SYSTEM
bool retQt;
- if (!QDir::isAbsolutePath(TRANSDIR_SYSTEM))
- retQt = qtTranslator->load("qt_" + DefaultLanguage,
QCoreApplication::applicationDirPath() + "/" + TRANSDIR_SYSTEM);
+ if (!QDir::isAbsolutePath(STRINGIFY(TRANSDIR_SYSTEM)))
+ retQt = qtTranslator->load("qt_" + DefaultLanguage,
QCoreApplication::applicationDirPath() + "/" + STRINGIFY(TRANSDIR_SYSTEM));
else
- retQt = qtTranslator->load("qt_" + DefaultLanguage,
TRANSDIR_SYSTEM);
+ retQt = qtTranslator->load("qt_" + DefaultLanguage,
STRINGIFY(TRANSDIR_SYSTEM));
#else
bool retQt = qtTranslator->load("qt_" + DefaultLanguage,
QLibraryInfo::location(QLibraryInfo::TranslationsPath));
#endif
_______________________________________________
Merkaartor mailing list
[email protected]
http://lists.openstreetmap.org/listinfo/merkaartor
