diff options
| -rw-r--r-- | qt/README | 2 | ||||
| -rw-r--r-- | qt/ScintillaEdit/ScintillaDocument.h | 2 | ||||
| -rw-r--r-- | qt/ScintillaEditPy/README | 5 |
3 files changed, 7 insertions, 2 deletions
@@ -22,6 +22,8 @@ Alternatively, run "qmake" to build make files and then use the platform make to build. Most commonly, use "make" on Unix and "nmake"
on Windows.
+On Linux, qmake may be called qmake-qt5 or qmake-qt4.
+
ScintillaEdit requires a generation command be run first. From the
ScintillaEdit directory:
diff --git a/qt/ScintillaEdit/ScintillaDocument.h b/qt/ScintillaEdit/ScintillaDocument.h index 52d28774b..ef62ab2f1 100644 --- a/qt/ScintillaEdit/ScintillaDocument.h +++ b/qt/ScintillaEdit/ScintillaDocument.h @@ -88,6 +88,8 @@ signals: void style_needed(int pos); void lexer_changed(); void error_occurred(int status); + + friend class ::WatcherHelper; }; #ifdef SCI_NAMESPACE diff --git a/qt/ScintillaEditPy/README b/qt/ScintillaEditPy/README index 623cf9900..a9f4fbef1 100644 --- a/qt/ScintillaEditPy/README +++ b/qt/ScintillaEditPy/README @@ -26,8 +26,9 @@ On apt-based systems, the packages are libshiboken-dev, shiboken, libpyside-dev, and python-pyside. python-dev is also needed for Python language headers.
On yum-based systems the packages are shiboken-devel, python-pyside-devel,
and python-devel.
-The qmake program may not be in the path and can be found with
-"find /usr -name qmake".
+The qmake program may be called qmake-qt5 or qmake-qt4.
+It can be found with:
+which qmake-qt5 || which qmake-qt4 || which qmake
On Windows, the PySide library packages can be downloaded from
http://developer.qt.nokia.com/wiki/PySide_Binaries_Windows
|