diff --git a/Makefile.common b/Makefile.common
index 1944d4563a..fc22528afb 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -272,8 +272,12 @@ endif
 
 # Qt
 
+ifeq ($(HAVE_QT_WRAPPER), 1)
+LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/obj/
+LIBS += -lwrapper
+endif
+
 ifeq ($(HAVE_QT), 1)
-HAVE_QT_WRAPPER=0
 OBJ += ui/drivers/ui_qt.o \
        ui/drivers/qt/ui_qt_application.o \
        ui/drivers/qt/ui_qt_window.o \
@@ -283,13 +287,6 @@ OBJ += ui/drivers/ui_qt.o \
 ifneq ($(findstring Linux,$(OS)),)
 DEFINES += -I/usr/include/qt -fPIC
 endif
-
-# TODO/FIXME - figure out which libraries we need to link against
-LIBS += -lQt5Quick -lQt5Widgets -lQt5Gui -lQt5Qml -lQt5Network -lQt5Core -L./ui/drivers/qt/wrapper/build/release
-
-ifeq ($(HAVE_QT_WRAPPER), 1)
-LIBS += -lwrapper
-endif
 endif
 
 ifeq ($(HAVE_SSA),1)
diff --git a/qb/config.params.sh b/qb/config.params.sh
index 61d5a41861..9efebba082 100644
--- a/qb/config.params.sh
+++ b/qb/config.params.sh
@@ -80,6 +80,7 @@ HAVE_PARPORT=auto          # Parallel port joypad support
 HAVE_IMAGEVIEWER=yes       # Built-in image viewer support.
 HAVE_MMAP=auto             # MMAP support
 HAVE_QT=no                 # QT companion support
+HAVE_QT_WRAPPER=no
 HAVE_XSHM=no               # XShm video driver support
 HAVE_CHEEVOS=yes           # Retro Achievements
 HAVE_SHADERPIPELINE=yes    # Additional shader-based pipelines
diff --git a/ui/drivers/qt/wimp-test/wimp-test.pro b/ui/drivers/qt/wimp-test/wimp-test.pro
index d7d0e07fb3..cd3966adf0 100644
--- a/ui/drivers/qt/wimp-test/wimp-test.pro
+++ b/ui/drivers/qt/wimp-test/wimp-test.pro
@@ -1,11 +1,22 @@
 TARGET = wimp-test
 CONFIG += console
 
-
 SOURCES += main.cpp
 
-win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../wimp/build/release/ -lwimp.dll
-else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../wimp/build/debug/ -lwimp.dll
+Release:DESTDIR = ../build/release
+Release:OBJECTS_DIR = ../build/release/obj
+Release:MOC_DIR = ../build/release/moc
+Release:RCC_DIR = ../build/release/rcc
+Release:UI_DIR = ../build/release/ui
+
+Debug:DESTDIR = ../build/debug
+Debug:OBJECTS_DIR = ../build/debug/obj
+Debug:MOC_DIR = ../build/debug/moc
+Debug:RCC_DIR = ../build/debug/rcc
+Debug:UI_DIR = ../build/debug/ui
+
+win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll
+else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/build/debug/ -lwimp.dll
 else:unix: LIBS += -L$$PWD/../wimp/build/ -lwimp.dll
 
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwrapper.dll
diff --git a/ui/drivers/qt/wimp/wimp.pro b/ui/drivers/qt/wimp/wimp.pro
index 5dbf8f3b93..4917f2c1ea 100644
--- a/ui/drivers/qt/wimp/wimp.pro
+++ b/ui/drivers/qt/wimp/wimp.pro
@@ -21,6 +21,17 @@ HEADERS +=\
 RESOURCES += \
     qml.qrc
 
+Release:DESTDIR = ../build/release
+Release:OBJECTS_DIR = ../build/release/obj
+Release:MOC_DIR = ../build/release/moc
+Release:RCC_DIR = ../build/release/rcc
+Release:UI_DIR = ../build/release/ui
+
+Debug:DESTDIR = ../build/debug
+Debug:OBJECTS_DIR = ../build/debug/obj
+Debug:MOC_DIR = ../build/debug/moc
+Debug:RCC_DIR = ../build/debug/rcc
+Debug:UI_DIR = ../build/debug/ui
 
 INCLUDEPATH += $$PWD/../../../../
 INCLUDEPATH += $$PWD/../../../../libretro-common/include/
diff --git a/ui/drivers/qt/wrapper/wrapper.pro b/ui/drivers/qt/wrapper/wrapper.pro
index d1ecf5744f..cc4b69c9a8 100644
--- a/ui/drivers/qt/wrapper/wrapper.pro
+++ b/ui/drivers/qt/wrapper/wrapper.pro
@@ -14,6 +14,18 @@ HEADERS += \
     wrapper.h
 
 
+Release:DESTDIR = ../build/release
+Release:OBJECTS_DIR = ../build/release/obj
+Release:MOC_DIR = ../build/release/moc
+Release:RCC_DIR = ../build/release/rcc
+Release:UI_DIR = ../build/release/ui
+
+Debug:DESTDIR = ../build/debug
+Debug:OBJECTS_DIR = ../build/debug/obj
+Debug:MOC_DIR = ../build/debug/moc
+Debug:RCC_DIR = ../build/debug/rcc
+Debug:UI_DIR = ../build/debug/ui
+
 win32:CONFIG(release, debug|release): LIBS += -L$$PWD/../build/release/ -lwimp.dll
 else:win32:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.dll
 else:unix:CONFIG(debug, debug|release): LIBS += -L$$PWD/../build/debug/ -lwimp.so