Merge

src/SConscript

@@ -6,18 +6,36 @@ env = qt_env.Clone()
 
 # If we do more of this, these need to be tools!
 # Fortunately, although we don't use any of the qt modules, we don't care.
+# A note: if you *build* pyqt, you get files in one place. If you use the
+# provided installers, you get it somewhere else...
+env['ENV']['PATH'] = '%s;%s' % (os.path.join(env['QTDIR'], 'bin'),
+                                env['ENV']['PATH'])
 
-pyqt_path = os.path.join('${PYTHONPATH}', 'Lib', 'site-packages',
-                                                      'PyQt${QT_MAJOR_VERSION}')
 ui = env.Command('pyCfgDialog.py', 'pyCfgDialog.ui',
-                 os.path.join(pyqt_path, 'pyuic${QT_MAJOR_VERSION}') +
-                                                       ' -o $TARGET -x $SOURCE')
-rc = env.Command('pyCfgResource_rc.py', 'pyCfgResource.qrc',
-                 os.path.join(pyqt_path, 'pyrcc${QT_MAJOR_VERSION}') +
+                 os.path.join('${PYTHONPATH}',
+                              'pyuic%d' % env['QT_MAJOR_VERSION']) +
                                                           ' -o $TARGET $SOURCE')
+rc = env.Command('pyCfgResource_rc.py', 'pyCfgResource.qrc',
+                 os.path.join('${PYTHONPATH}',
+                              'pyrcc%d' % env['QT_MAJOR_VERSION']) +
+                                                          ' -o $TARGET $SOURCE')
+
+init = env.Command('__init__.py', None, Touch('$TARGET'))
 
 env.Pseudo('install')
 env.Depends('install',
             (env.Install('${INSTALL_PATH}', 'pyCfg.py'),
              env.Install(os.path.join('${INSTALL_PATH}', 'data'),
-                         ( ui, rc, 'settings.json' ))))
+                         ( ui, rc, 'settings.json' )),
+             ))
+
+if env['QT_MAJOR_VERSION'] > 4:
+    pyqt = 'PyQt%d' % env['QT_MAJOR_VERSION']
+    pqtdir = os.path.join('${PYTHONPATH}', 'Lib', 'site-packages', pyqt)
+    env.Depends('install',
+        env.Install(os.path.join('${INSTALL_PATH}', 'data', pyqt),
+                    [ os.path.join(pqtdir, 'Qt%s.pyd' % lib)
+                                     for lib in ('Core', 'Gui', 'Widgets') ] + [
+                        '__init__.py' ]
+                    )
+        )

src/pyniEdit.pro

@@ -12,7 +12,8 @@ SOURCES += \
     dummy.cpp
 
 OTHER_FILES += \
-    pyCfg.py
+    pyCfg.py\
+    settings.json
 
 TRANSLATIONS = $${TARGET}_en.ts \
                $${TARGET}_de.ts \
@@ -35,9 +36,11 @@ WINPWD = $$PWD
 DSTDIR ~= s,/,$$QMAKE_DIR_SEP,g
 WINPWD ~= s,/,$$QMAKE_DIR_SEP,g
 
+# Warning. If you *build* pyqt, you get your files in one place. If you
+# install it you get them in another...
 greaterThan(QT_MAJOR_VERSION, 4) {
-  QMAKE_POST_LINK += $${PYTHONPATH}/pyuic5 -x $$quote($$PWD/pyCfgDialog.ui) -o $$quote($$PWD/pyCfgDialog.py) $$escape_expand(\\n)
-  QMAKE_POST_LINK += $${PYTHONPATH}/pyrcc5 -o $$quote($$PWD/pyCfgResource_rc.py) $$quote($$PWD/pyCfgResource.qrc) $$escape_expand(\\n)
+  QMAKE_POST_LINK += $$quote($${PYTHONPATH}\\pyuic5) $$quote($$PWD/pyCfgDialog.ui) -o $$quote($$PWD/pyCfgDialog.py) $$escape_expand(\\n)
+  QMAKE_POST_LINK += $$quote($${PYTHONPATH}\\pyrcc5) -o $$quote($$PWD/pyCfgResource_rc.py) $$quote($$PWD/pyCfgResource.qrc) $$escape_expand(\\n)
 } else {
   QMAKE_POST_LINK += $$quote($${PYTHONPATH}\\Lib\\site-packages\\PyQt4\\pyuic4) -x $$quote($$PWD\\pyCfgDialog.ui) -o $$quote($$PWD\\pyCfgDialog.py) $$escape_expand(\\n)
   QMAKE_POST_LINK += $$quote($${PYTHONPATH}\\Lib\\site-packages\\PyQt4\\pyrcc4) -o $$quote($$PWD/pyCfgResource_rc.py) $$quote($$PWD/pyCfgResource.qrc) $$escape_expand(\\n)