Merge pull request sqlitebrowser#181 from samir-aguiar/master

MKleusberg · MKleusberg · commit 414f27e50a56 · 2015-01-08T22:54:55.000+01:00
qmake: Add compatibility with shadow build
diff --git a/src/src.pro b/src/src.pro
@@ -99,9 +99,9 @@ CONFIG(sqlcipher) {
 	LIBS += -lsqlite3
 }
 
-LIBPATH_QHEXEDIT=$$PWD/../libs/qhexedit
-LIBPATH_ANTLR=$$PWD/../libs/antlr-2.7.7
-LIBPATH_QCUSTOMPLOT=$$PWD/../libs/qcustomplot-source
+LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit
+LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7
+LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source
 unix {
     LIBS += -ldl
 }

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,9 @@ CONFIG(sqlcipher) {`
`99`	`99`	`LIBS += -lsqlite3`
`100`	`100`	`}`
`101`	`101`
`102`		`-LIBPATH_QHEXEDIT=$$PWD/../libs/qhexedit`
`103`		`-LIBPATH_ANTLR=$$PWD/../libs/antlr-2.7.7`
`104`		`-LIBPATH_QCUSTOMPLOT=$$PWD/../libs/qcustomplot-source`
	`102`	`+LIBPATH_QHEXEDIT=$$OUT_PWD/../libs/qhexedit`
	`103`	`+LIBPATH_ANTLR=$$OUT_PWD/../libs/antlr-2.7.7`
	`104`	`+LIBPATH_QCUSTOMPLOT=$$OUT_PWD/../libs/qcustomplot-source`
`105`	`105`	`unix {`
`106`	`106`	`LIBS += -ldl`
`107`	`107`	`}`