diff --git a/setup/extensions.py b/setup/extensions.py index d520cbf622..893ce1be39 100644 --- a/setup/extensions.py +++ b/setup/extensions.py @@ -348,8 +348,10 @@ class Build(Command): VERSION = 1.0.0 CONFIG += %s ''')%(ext.name, ' '.join(ext.headers), ' '.join(ext.sources), archs) + pro = pro.replace('\\', '\\\\') open(ext.name+'.pro', 'wb').write(pro) - subprocess.check_call([QMAKE, '-o', 'Makefile', ext.name+'.pro']) + subprocess.check_call([QMAKE, '-o', 'Makefile', '-spec', + 'win32-msvc2008', ext.name+'.pro']) subprocess.check_call([make, '-f', 'Makefile']) objects = glob.glob(obj_pat) return list(map(self.a, objects)) diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 29809907ab..35fe78b13b 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -13,7 +13,7 @@ from setup import Command, modules, functions, basenames, __version__, \ from setup.build_environment import msvc, MT, RC from setup.installer.windows.wix import WixMixIn -QT_DIR = 'C:\\Qt\\4.6.3' +QT_DIR = 'Q:\\Qt\\4.7.0' QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] LIBUSB_DIR = 'C:\\libusb' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index 545070f7ff..46aabecfa0 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -37,8 +37,7 @@ Qt Extract Qt sourcecode to C:\Qt\4.x.x. Run configure and make:: - configure -opensource -qt-zlib -qt-gif -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc -no-qt3support -webkit -xmlpatterns -no-phonon - nmake + configure -opensource -release -qt-zlib -qt-gif -qt-libmng -qt-libpng -qt-libtiff -qt-libjpeg -release -platform win32-msvc2008 -no-qt3support -webkit -xmlpatterns -no-phonon -no-style-plastique -no-style-cleanlooks -no-style-motif -no-style-cde -no-declarative -no-scripttools -no-audio-backend -no-multimedia -no-dbus -no-openvg -no-opengl -no-qt3support -confirm-license && nmake SIP -----