Attachment #400220 for bug #487512

Lines 51-56 TRANSDIR_MERKAARTOR=<path> - where will the Merkaartor translations be installe Link Here

(-)a/INSTALL (+2 lines)
51	TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is	51	TRANSDIR_SYSTEM=<path> - where your global Qt translation directory is
52	NODEBUG=1 - release target	52	NODEBUG=1 - release target
53	NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)	53	NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
		54	SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal
		55	SYSTEM_QUAZIP - use system copy of quazip instead of internal
54		56
55		57
56	3. Run your build tool, make for posix like systems, nmake for	58	3. Run your build tool, make for posix like systems, nmake for




#Custom config
include(Custom.pri)

isEmpty(SYSTEM_QTSA) {
  include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
} else {
  CONFIG += qtsingleapplication
}
isEmpty(SYSTEM_QUAZIP) {
  DEFINES += QUAZIP_STATIC
  include(../3rdparty/quazip-0.7/quazip.pri)
} else {
  LIBS += -lquazip
}

#Qt Version
QT_VERSION = $$[QT_VERSION]
- 

Return to bug 487512

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

(-)a/src/src.pro (-6 / +11 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	DEFINES += QUAZIP_STATIC	10	include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
11	include(../3rdparty/quazip-0.7/quazip.pri)	11	} else {
12		12	CONFIG += qtsingleapplication
13	#LIBS += -lquazip	13	}
		14	isEmpty(SYSTEM_QUAZIP) {
		15	DEFINES += QUAZIP_STATIC
		16	include(../3rdparty/quazip-0.7/quazip.pri)
		17	} else {
		18	LIBS += -lquazip
		19	}
14		20
15	#Qt Version	21	#Qt Version
16	QT_VERSION = $$[QT_VERSION]	22	QT_VERSION = $$[QT_VERSION]
17	-