diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py index 2cf7e1df48..b7eb864de0 100644 --- a/setup/installer/osx/app/main.py +++ b/setup/installer/osx/app/main.py @@ -296,6 +296,10 @@ class Py2App(object): self.add_qt_framework(f) for d in glob.glob(join(SW, 'qt', 'plugins', '*')): shutil.copytree(d, join(self.contents_dir, 'MacOS', basename(d))) + sty = join(self.contents_dir, 'MacOS', 'styles') + os.mkdir(sty) + shutil.copyfile(glob.glob(join(SW, 'build', 'QtCurve*', 'build', 'style', + 'qtcurve.so'))[-1], join(sty, 'qtcurve.dylib')) for l in glob.glob(join(self.contents_dir, 'MacOS', '*/*.dylib')): self.fix_dependencies_in_lib(l) x = os.path.relpath(l, join(self.contents_dir, 'MacOS')) diff --git a/setup/installer/windows/freeze.py b/setup/installer/windows/freeze.py index 448d888505..dc331699f3 100644 --- a/setup/installer/windows/freeze.py +++ b/setup/installer/windows/freeze.py @@ -16,6 +16,7 @@ from setup.installer.windows.wix import WixMixIn OPENSSL_DIR = r'Q:\openssl' QT_DIR = 'Q:\\Qt\\4.8.1' QT_DLLS = ['Core', 'Gui', 'Network', 'Svg', 'WebKit', 'Xml', 'XmlPatterns'] +QTCURVE = r'C:\plugins\styles' LIBUNRAR = 'C:\\Program Files\\UnrarDLL\\unrar.dll' SW = r'C:\cygwin\home\kovid\sw' IMAGEMAGICK = os.path.join(SW, 'build', 'ImageMagick-6.7.6', @@ -247,6 +248,14 @@ class Win32Freeze(Command, WixMixIn): if os.path.exists(tg): shutil.rmtree(tg) shutil.copytree(imfd, tg) + self.info('\nAdding QtCurve...') + qtcurve = self.j(QTCURVE, 'qtcurve.dll') + tg = self.j(tdir, 'styles') + if os.path.exists(tg): + shutil.rmtree(tg) + os.mkdir(tg) + shutil.copy2(qtcurve, tg) + for dirpath, dirnames, filenames in os.walk(tdir): for x in filenames: if not x.endswith('.dll'): diff --git a/setup/installer/windows/notes.rst b/setup/installer/windows/notes.rst index 7fe978d30b..349141d658 100644 --- a/setup/installer/windows/notes.rst +++ b/setup/installer/windows/notes.rst @@ -101,6 +101,14 @@ Now, run configure and make:: Add the path to the bin folder inside the Qt dir to your system PATH. +Now build QtCurve +cd qmake +edit the qmake.pro file setting the TARGET to Release + +qmake && nmake + +The plugin will be in c:\plugins\styles + SIP -----