diff --git a/QScintilla/Python/configure.py b/QScintilla/Python/configure.py
index af5644c..7277948 100644
--- a/QScintilla/Python/configure.py
+++ b/QScintilla/Python/configure.py
@@ -31,12 +31,15 @@ import glob
 import os
 import optparse
 import sys
+import re
 
 
 ###############################################################################
 # You shouldn't need to modify anything above this line.
 ###############################################################################
 
+# get python version
+python_version = re.compile('^(\d\.\d).*').findall(sys.version)[0]
 
 class ModuleConfiguration(object):
     """ This class encapsulates all the module specific information needed by
@@ -307,7 +310,7 @@ class ModuleConfiguration(object):
             qmake['INCLUDEPATH'] = quote(target_configuration.qsci_inc_dir)
 
         if target_configuration.qsci_lib_dir is not None:
-            qmake['LIBS'] = '-L%s' % quote(target_configuration.qsci_lib_dir)
+            qmake['LIBS'] = '-L%s' % quote(target_configuration.qsci_lib_dir) + ' -lQt5PrintSupport -lQt5Widgets'
 
         if target_configuration.qsci_features_dir is not None:
             os.environ['QMAKEFEATURES'] = target_configuration.qsci_features_dir
@@ -818,6 +821,7 @@ class _TargetConfiguration:
                 flags.append('-n')
                 flags.append(sip_module)
 
+            flags.append('-g')
             flags.append('-t')
             flags.append(self._get_platform_tag())
 
@@ -1583,7 +1587,7 @@ INSTALLS += sip
     # These optimisations could apply to other platforms.
     if module_config.no_exceptions:
         if target_config.py_platform.startswith('linux') or target_config.py_platform == 'darwin':
-            pro.write('QMAKE_CXXFLAGS += -fno-exceptions\n')
+            pro.write('QMAKE_CXXFLAGS += -fno-exceptions @Q5CFLAGS@\n')
 
     if target_config.py_platform.startswith('linux') and not opts.static:
         if target_config.py_version >= 0x030000:
@@ -1614,7 +1618,7 @@ INSTALLS += sip
     if target_config.py_inc_dir != target_config.sip_inc_dir:
         pro.write('INCLUDEPATH += %s\n' % quote(target_config.py_inc_dir))
 
-    libs = qmake_config.get('LIBS')
+    libs = qmake_config.get('LIBS') + ' -l@QSCINTILLALIB@'
     if libs:
         pro.write('LIBS += %s\n' % libs)
 
diff --git a/QScintilla/Qt4Qt5/Qsci/qsciscintillabase.h b/QScintilla/Qt4Qt5/Qsci/qsciscintillabase.h
index d0bd631..770d230 100644
--- a/QScintilla/Qt4Qt5/Qsci/qsciscintillabase.h
+++ b/QScintilla/Qt4Qt5/Qsci/qsciscintillabase.h
@@ -21,6 +21,8 @@
 #ifndef QSCISCINTILLABASE_H
 #define QSCISCINTILLABASE_H
 
+#include <stdint.h>
+
 #include <qglobal.h>
 
 #include <QAbstractScrollArea>
diff --git a/QScintilla/Qt4Qt5/qsciscintillabase.cpp b/QScintilla/Qt4Qt5/qsciscintillabase.cpp
index d15898d..651abcb 100644
--- a/QScintilla/Qt4Qt5/qsciscintillabase.cpp
+++ b/QScintilla/Qt4Qt5/qsciscintillabase.cpp
@@ -37,6 +37,7 @@
 #include <QScrollBar>
 #include <QStyle>
 #include <QTextCodec>
+#include <QUrl>
 
 #include "SciAccessibility.h"
 #include "ScintillaQt.h"
diff --git a/QScintilla/designer-Qt4Qt5/designer.pro b/QScintilla/designer-Qt4Qt5/designer.pro
index f03d3b3..411ab9b 100644
--- a/QScintilla/designer-Qt4Qt5/designer.pro
+++ b/QScintilla/designer-Qt4Qt5/designer.pro
@@ -20,3 +20,11 @@ SOURCES = qscintillaplugin.cpp
 
 target.path = $$[QT_INSTALL_PLUGINS]/designer
 INSTALLS += target
+
+greaterThan(QT_MAJOR_VERSION, 4) {
+    LIBS += -L$$[QT_INSTALL_LIBS] -L../Qt4Qt5 -lqscintilla2_qt5
+    INCPATH = ../Qt4Qt5
+} else {
+    LIBS += -L$$[QT_INSTALL_LIBS] -L../Qt4 -lqscintilla2_qt4
+    INCPATH = ../Qt4
+}