Attachment #400222 for bug #487512

Lines 33-38 TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor translations be installed Link Here

(-)a/INSTALL (+1 lines)
33	TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is	33	TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is
34	NODEBUG=1 - release target	34	NODEBUG=1 - release target
35	NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)	35	NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
		36	SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal
36		37
37	see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list	38	see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list
38		39

Lines 6-12 include (Config.pri) Link Here

(-)a/src/src.pro (-2 / +5 lines)
6	#Custom config	6	#Custom config
7	include(Custom.pri)	7	include(Custom.pri)
8		8
9	include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)	9	isEmpty(SYSTEM_QTSA) {
		10	include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
		11	} else {
		12	CONFIG += qtsingleapplication
		13	}
10	include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)	14	include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
11		15
12	#Qt Version	16	#Qt Version
13	-

Return to bug 487512