diff --git a/.qmake.conf b/.qmake.conf deleted file mode 100644 index e2ab5a6..0000000 --- a/.qmake.conf +++ /dev/null @@ -1,3 +0,0 @@ -TOP_SRCDIR=$$PWD -TOP_BUILDDIR=$$shadowed($$PWD) - diff --git a/src/msgpackcommon.cpp b/src/msgpackcommon.cpp index 36425bd..82599c2 100644 --- 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); diff --git a/src/src.pro b/src/src.pro index 9db8f67..6bbf7eb 100644 --- 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