Skip to content

Commit 61f843f

Browse files
skvarkskvark
committed
back to Qt4
1 parent 89e7986 commit 61f843f

File tree

7 files changed

+30
-72
lines changed

7 files changed

+30
-72
lines changed

‎.travis.yml‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,7 @@ jobs:
239239
- PLAT=i686
240240
- ENABLE_CONTRIB=0
241241
- ENABLE_HEADLESS=0
242-
- USE_CCACHE=0
242+
243243
cache:
244244
directories: $HOME/.ccache
245245
- os: linux
@@ -263,7 +263,7 @@ jobs:
263263
- ENABLE_CONTRIB=0
264264
- ENABLE_HEADLESS=0
265265
- TEST_DEPENDS=numpy==1.11.3
266-
- USE_CCACHE=0
266+
267267
cache:
268268
directories: $HOME/.ccache
269269
- os: linux
@@ -287,7 +287,7 @@ jobs:
287287
- ENABLE_CONTRIB=0
288288
- ENABLE_HEADLESS=0
289289
- TEST_DEPENDS=numpy==1.14.5
290-
- USE_CCACHE=0
290+
291291
cache:
292292
directories: $HOME/.ccache
293293
- os: linux
@@ -311,7 +311,7 @@ jobs:
311311
- ENABLE_CONTRIB=0
312312
- ENABLE_HEADLESS=0
313313
- TEST_DEPENDS=numpy==1.17.3
314-
- USE_CCACHE=0
314+
315315
cache:
316316
directories: $HOME/.ccache
317317

@@ -335,7 +335,7 @@ jobs:
335335
- PLAT=i686
336336
- ENABLE_CONTRIB=0
337337
- ENABLE_HEADLESS=1
338-
- USE_CCACHE=0
338+
339339
cache:
340340
directories: $HOME/.ccache
341341
- os: linux
@@ -359,7 +359,7 @@ jobs:
359359
- ENABLE_CONTRIB=0
360360
- ENABLE_HEADLESS=1
361361
- TEST_DEPENDS=numpy==1.11.3
362-
- USE_CCACHE=0
362+
363363
cache:
364364
directories: $HOME/.ccache
365365
- os: linux
@@ -383,7 +383,7 @@ jobs:
383383
- ENABLE_CONTRIB=0
384384
- ENABLE_HEADLESS=1
385385
- TEST_DEPENDS=numpy==1.14.5
386-
- USE_CCACHE=0
386+
387387
cache:
388388
directories: $HOME/.ccache
389389
- os: linux
@@ -407,7 +407,7 @@ jobs:
407407
- ENABLE_CONTRIB=0
408408
- ENABLE_HEADLESS=1
409409
- TEST_DEPENDS=numpy==1.17.3
410-
- USE_CCACHE=0
410+
411411
cache:
412412
directories: $HOME/.ccache
413413

@@ -431,7 +431,7 @@ jobs:
431431
- PLAT=i686
432432
- ENABLE_CONTRIB=1
433433
- ENABLE_HEADLESS=0
434-
- USE_CCACHE=0
434+
435435
cache:
436436
directories: $HOME/.ccache
437437
- os: linux
@@ -455,7 +455,7 @@ jobs:
455455
- TEST_DEPENDS=numpy==1.11.3
456456
- ENABLE_CONTRIB=1
457457
- ENABLE_HEADLESS=0
458-
- USE_CCACHE=0
458+
459459
cache:
460460
directories: $HOME/.ccache
461461
- os: linux
@@ -479,7 +479,7 @@ jobs:
479479
- TEST_DEPENDS=numpy==1.14.5
480480
- ENABLE_CONTRIB=1
481481
- ENABLE_HEADLESS=0
482-
- USE_CCACHE=0
482+
483483
cache:
484484
directories: $HOME/.ccache
485485
- os: linux
@@ -503,7 +503,7 @@ jobs:
503503
- TEST_DEPENDS=numpy==1.17.3
504504
- ENABLE_CONTRIB=1
505505
- ENABLE_HEADLESS=0
506-
- USE_CCACHE=0
506+
507507
cache:
508508
directories: $HOME/.ccache
509509

@@ -528,7 +528,7 @@ jobs:
528528
- PLAT=i686
529529
- ENABLE_CONTRIB=1
530530
- ENABLE_HEADLESS=1
531-
- USE_CCACHE=0
531+
532532
cache:
533533
directories: $HOME/.ccache
534534
- os: linux
@@ -552,7 +552,7 @@ jobs:
552552
- TEST_DEPENDS=numpy==1.11.3
553553
- ENABLE_CONTRIB=1
554554
- ENABLE_HEADLESS=1
555-
- USE_CCACHE=0
555+
556556
cache:
557557
directories: $HOME/.ccache
558558
- os: linux
@@ -576,7 +576,7 @@ jobs:
576576
- TEST_DEPENDS=numpy==1.14.5
577577
- ENABLE_CONTRIB=1
578578
- ENABLE_HEADLESS=1
579-
- USE_CCACHE=0
579+
580580
cache:
581581
directories: $HOME/.ccache
582582
- os: linux
@@ -600,7 +600,7 @@ jobs:
600600
- TEST_DEPENDS=numpy==1.17.3
601601
- ENABLE_CONTRIB=1
602602
- ENABLE_HEADLESS=1
603-
- USE_CCACHE=0
603+
604604
cache:
605605
directories: $HOME/.ccache
606606

‎cv2/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
# this makes them available
1010
globals().update(importlib.import_module('cv2.cv2').__dict__)
1111

12-
if sys.platform == 'darwin' or sys.platform.startswith("linux"):
12+
if sys.platform == 'darwin':
1313
os.environ['QT_QPA_PLATFORM_PLUGIN_PATH'] = os.path.join(
1414
os.path.dirname(os.path.abspath(__file__)), 'qt', 'plugins'
1515
)

‎docker/manylinux2014/Dockerfile_i686‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
FROM quay.io/pypa/manylinux2014_i686:latest
22

3-
RUN yum install freetype-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel bzip2-devel curl-devel blas-devel lapack-devel atlas-devel -y
4-
5-
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6-
tar -xf qt-everywhere-src-5.15.0.tar.xz && \
7-
cd qt-everywhere* && \
8-
export MAKEFLAGS=-j$(nproc) && \
9-
# OpenCV only links against QtCore, QtGui, QtTest
10-
./configure -prefix /opt/Qt5.15.0 -platform linux-g++-32 -qtnamespace QtOpenCVPython -release -opensource -confirm-license -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
11-
make && \
12-
make install && \
13-
cd .. && \
14-
rm -rf qt-everywhere-src-5.15.0 && \
15-
rm qt-everywhere-src-5.15.0.tar.xz
16-
17-
ENV QTDIR /opt/Qt5.15.0
18-
ENV PATH "$QTDIR/bin:$PATH"
3+
RUN yum install bzip2-devel curl-devel zlib-devel qt-x11 -y
194

205
RUN mkdir ~/ffmpeg_sources && \
216
cd ~/ffmpeg_sources && \

‎docker/manylinux2014/Dockerfile_x86_64‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,6 @@
11
FROM quay.io/pypa/manylinux2014_x86_64:latest
22

3-
RUN yum install freetype-devel xcb-util-renderutil-devel xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel xcb-util-wm-devel mesa-libGL-devel libxkbcommon-devel libxkbcommon-x11-devel bzip2-devel curl-devel blas-devel lapack-devel atlas-devel -y
4-
5-
RUN curl -O -L https://download.qt.io/official_releases/qt/5.15/5.15.0/single/qt-everywhere-src-5.15.0.tar.xz && \
6-
tar -xf qt-everywhere-src-5.15.0.tar.xz && \
7-
cd qt-everywhere* && \
8-
export MAKEFLAGS=-j$(nproc) && \
9-
# OpenCV only links against QtCore, QtGui, QtTest
10-
./configure -prefix /opt/Qt5.15.0 -release -opensource -confirm-license -qtnamespace QtOpenCVPython -xcb -xcb-xlib -bundled-xcb-xinput -no-openssl -no-dbus -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdatavis3d -skip qtdoc -skip qtgamepad -skip qtgraphicaleffects -skip qtimageformats -skip qtlocation -skip qtmultimedia -skip qtpurchasing -skip qtqa -skip qtremoteobjects -skip qtrepotools -skip qtscript -skip qtscxml -skip qtsensors -skip qtserialbus -skip qtserialport -skip qtspeech -skip qttranslations -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip xmlpatterns -skip declarative -make libs && \
11-
make && \
12-
make install && \
13-
cd .. && \
14-
rm -rf qt-everywhere-src-5.15.0 && \
15-
rm qt-everywhere-src-5.15.0.tar.xz
16-
17-
ENV QTDIR /opt/Qt5.15.0
18-
ENV PATH "$QTDIR/bin:$PATH"
3+
RUN yum install bzip2-devel curl-devel zlib-devel qt-x11 -y
194

205
RUN mkdir ~/ffmpeg_sources && \
216
cd ~/ffmpeg_sources && \

‎patches/patchQtPlugins‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
diff --git a/opencv/CMakeLists.txt b/opencv/CMakeLists.txt
2-
index 4c0b3880fc..54da25f151 100644
2+
index 8ccad4d03a..0d5e2a79e9 100644
33
--- a/opencv/CMakeLists.txt
44
+++ b/opencv/CMakeLists.txt
5-
@@ -1187,6 +1187,12 @@ if(WITH_QT OR HAVE_QT)
5+
@@ -1164,6 +1164,7 @@ if(WITH_QT OR HAVE_QT)
66
if(HAVE_QT5)
77
status(" QT:" "YES (ver ${Qt5Core_VERSION_STRING})")
88
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${Qt5OpenGL_LIBRARIES} ${Qt5OpenGL_VERSION_STRING})" ELSE NO)
9-
+ if(APPLE)
10-
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
11-
+ endif()
12-
+ if(UNIX AND NOT APPLE)
13-
+ install(DIRECTORY /opt/Qt5.15.0/plugins DESTINATION lib/qt)
14-
+ endif()
9+
+ install(DIRECTORY ${Qt5_DIR}/../../../plugins DESTINATION lib/qt)
1510
elseif(HAVE_QT)
1611
status(" QT:" "YES (ver ${QT_VERSION_MAJOR}.${QT_VERSION_MINOR}.${QT_VERSION_PATCH} ${QT_EDITION})")
17-
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)
12+
status(" QT OpenGL support:" HAVE_QT_OPENGL THEN "YES (${QT_QTOPENGL_LIBRARY})" ELSE NO)

‎setup.py‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -142,23 +142,15 @@ def main():
142142
)
143143

144144
# OS-specific components
145-
if (
146-
sys.platform.startswith("linux")
147-
or sys.platform == "darwin"
148-
and not build_headless
149-
):
150-
cmake_args.append("-DWITH_QT=5")
145+
if sys.platform.startswith('linux') and not build_headless:
146+
cmake_args.append("-DWITH_QT=4")
151147

152-
if sys.platform == "darwin" and not build_headless:
148+
if sys.platform == 'darwin' and not build_headless:
149+
cmake_args.append("-DWITH_QT=5")
153150
rearrange_cmake_output_data["cv2.qt.plugins.platforms"] = [
154151
(r"lib/qt/plugins/platforms/libqcocoa\.dylib")
155152
]
156153

157-
if sys.platform.startswith("linux") and not build_headless:
158-
rearrange_cmake_output_data["cv2.qt.plugins.platforms"] = [
159-
(r"lib/qt/plugins/platforms/libqxcb\.so")
160-
]
161-
162154
if build_headless:
163155
# it seems that cocoa cannot be disabled so on macOS the package is not truly headless
164156
cmake_args.append("-DWITH_WIN32UI=OFF")
@@ -175,7 +167,7 @@ def main():
175167
if sys.platform.startswith("linux") and not x64:
176168
subprocess.check_call("patch -p0 < patches/patchOpenEXR", shell=True)
177169

178-
if sys.platform.startswith("linux") or sys.platform == "darwin":
170+
if sys.platform == "darwin":
179171
subprocess.check_call("patch -p1 < patches/patchQtPlugins", shell=True)
180172

181173
# Fixes for macOS builds

‎travis_config.sh‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ if [ -n "$IS_OSX" ]; then
2424
export MAKEFLAGS="-j$(sysctl -n hw.ncpu)"
2525
else
2626
echo " > Linux environment "
27-
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/Qt5.15.0/lib # Qt5 libs for auditwheel
2827
export MAKEFLAGS="-j$(grep -E '^processor[[:space:]]*:' /proc/cpuinfo | wc -l)"
2928
fi
3029

@@ -97,6 +96,8 @@ function pre_build {
9796
brew_add_local_bottles
9897
fi
9998

99+
brew style
100+
100101
echo 'Installing qt5'
101102
if [ -n "$CACHE_STAGE" ]; then
102103
brew_install_and_cache_within_time_limit qt5 || { [ $? -gt 1 ] && return 2 || return 0; }

0 commit comments

Comments
 (0)