Merge pull request #30 from KonstantinRitt/fixes/build

build fixes
2018-03-03 22:27:20 +03:00
parent b7284725e8 5ca284052c
commit 4f1c4d3d80
3 changed files with 2 additions and 5 deletions
--- a/.qmake.conf
+++ b/.qmake.conf
@ -1,3 +0,0 @@
-TOP_SRCDIR=$$PWD
-TOP_BUILDDIR=$$shadowed($$PWD)
-
--- a/src/msgpackcommon.cpp
+++ b/src/msgpackcommon.cpp
@ -4,7 +4,7 @@

 QString MsgPack::version()
 {
-	return QString("%1.%2.%3")
+    return QString::fromLatin1("%1.%2.%3")
            .arg(MSGPACK_MAJOR)
            .arg(MSGPACK_MINOR)
            .arg(MSGPACK_VERSION);
--- a/src/src.pro
+++ b/src/src.pro
@ -5,7 +5,7 @@ CONFIG   -= app_bundle

 TEMPLATE = lib
 DEFINES += MSGPACK_MAKE_LIB
-DESTDIR = $$TOP_SRCDIR/bin
+DESTDIR = $$PWD/../bin
 QMAKE_CXXFLAGS += -fPIC

 CONFIG   += debug_and_release