Commit 10bf66ac authored by Boudewijn Rempt's avatar Boudewijn Rempt

Update OSX to use Qt 5.10

parent 3eb7dd24
...@@ -29,6 +29,7 @@ if (WIN32) ...@@ -29,6 +29,7 @@ if (WIN32)
else (QT_ENABLE_DYNAMIC_OPENGL) else (QT_ENABLE_DYNAMIC_OPENGL)
list(APPEND _QT_conf -opengl desktop -no-angle) list(APPEND _QT_conf -opengl desktop -no-angle)
endif (QT_ENABLE_DYNAMIC_OPENGL) endif (QT_ENABLE_DYNAMIC_OPENGL)
ExternalProject_Add( ExternalProject_Add(
ext_qt ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
...@@ -161,17 +162,16 @@ else( APPLE ) ...@@ -161,17 +162,16 @@ else( APPLE )
# Fix Xcode xcrun related issue. # Fix Xcode xcrun related issue.
# NOTE: This should be fixed by Qt 5.7.1 see here: http://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=77a71c32c9d19b87f79b208929e71282e8d8b5d9 # NOTE: This should be fixed by Qt 5.7.1 see here: http://code.qt.io/cgit/qt/qtbase.git/commit/?h=dev&id=77a71c32c9d19b87f79b208929e71282e8d8b5d9
# NOTE: but no one's holding their breath. # NOTE: but no one's holding their breath.
set(ext_qt_PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gerrit-166202.diff set(ext_qt_PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff #COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/qtbase-configure.patch
COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase -i ${CMAKE_CURRENT_SOURCE_DIR}/qtbase-configure.patch #COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase/mkspecs/features/mac -i ${CMAKE_CURRENT_SOURCE_DIR}/mac-default.patch
COMMAND ${PATCH_COMMAND} -p1 -b -d <SOURCE_DIR>/qtbase/mkspecs/features/mac -i ${CMAKE_CURRENT_SOURCE_DIR}/mac-default.patch) )
message(STATUS "${EXTPREFIX_qt}:Additional patches injected.") message(STATUS "${EXTPREFIX_qt}:Additional patches injected.")
else() else()
# No extra patches will be applied # No extra patches will be applied
# NOTE: defaults for some untested scenarios like xcrun fails and xcode_version < 8. # NOTE: defaults for some untested scenarios like xcrun fails and xcode_version < 8.
# NOTE: that is uncharted territory and (hopefully) a very unlikely scenario... # NOTE: that is uncharted territory and (hopefully) a very unlikely scenario...
set(ext_qt_PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/gerrit-166202.diff set(ext_qt_PATCH_COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff)
COMMAND ${PATCH_COMMAND} -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/macdeploy-qt.diff)
endif() endif()
# Qt is big - try and parallelize if at all possible # Qt is big - try and parallelize if at all possible
...@@ -188,6 +188,7 @@ else( APPLE ) ...@@ -188,6 +188,7 @@ else( APPLE )
set(PARALLEL_MAKE "make") set(PARALLEL_MAKE "make")
endif() endif()
ExternalProject_Add(ext_qt ExternalProject_Add(ext_qt
DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR} DOWNLOAD_DIR ${EXTERNALS_DOWNLOAD_DIR}
...@@ -197,15 +198,17 @@ else( APPLE ) ...@@ -197,15 +198,17 @@ else( APPLE )
LOG_BUILD ON LOG_BUILD ON
LOG_TEST ON LOG_TEST ON
LOG_INSTALL ON LOG_INSTALL ON
BUILD_IN_SOURCE ON BUILD_IN_SOURCE ON
URL https://download.qt.io/official_releases/qt/5.7/5.7.0/single/qt-everywhere-opensource-src-5.7.0.tar.gz URL https://download.qt.io/development_releases/qt/5.10/5.10.0-beta3/single/qt-everywhere-src-5.10.0.tar.xz
URL_MD5 9a46cce61fc64c20c3ac0a0e0fa41b42 URL_MD5 e809bf33732fb68d531e609979ba529f
PATCH_COMMAND ${ext_qt_PATCH_COMMAND} PATCH_COMMAND ${ext_qt_PATCH_COMMAND}
INSTALL_DIR ${EXTPREFIX_qt} INSTALL_DIR ${EXTPREFIX_qt}
CONFIGURE_COMMAND <SOURCE_DIR>/configure -confirm-license -opensource -nomake examples -no-openssl -no-compile-examples -qt-freetype -qt-harfbuzz -opengl desktop -qt-zlib -qt-pcre -qt-libpng -qt-libjpeg -skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtgraphicaleffects -skip qtlocation -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -prefix ${EXTPREFIX_qt} CONFIGURE_COMMAND <SOURCE_DIR>/configure
-skip qt3d -skip qtactiveqt -skip qtcanvas3d -skip qtconnectivity -skip qtdoc -skip qtenginio -skip qtgraphicaleffects -skip qtlocation -skip qtsensors -skip qtserialport -skip qtwayland
-skip qtwebchannel -skip qtwebengine -skip qtwebsockets -skip qtwebview -skip qtxmlpatterns -no-sql-sqlite -skip qtcharts -skip qtdatavis3d -skip qtgamepad -skip qtnetworkauth -skip qtpurchasing -skip qtremoteobjects -skip qtscxml -skip qtserialbus -skip qtspeech -skip qtvirtualkeyboard -nomake examples -nomake tools -no-compile-examples -no-dbus -no-iconv -no-qml-debug -no-libproxy -no-system-proxies -no-icu -no-mtdev -system-zlib -qt-pcre -opensource -confirm-license -prefix ${EXTPREFIX_qt}
BUILD_COMMAND ${PARALLEL_MAKE} BUILD_COMMAND ${PARALLEL_MAKE}
INSTALL_COMMAND make install INSTALL_COMMAND make install
UPDATE_COMMAND "" UPDATE_COMMAND ""
......
This diff is collapsed.
commit 26d6c76d5a51504ebabec5f4ea2643069743f962
Author: Boudewijn Rempt <boud@valdyas.org>
Date: Sat Nov 4 14:15:25 2017 +0100
Fix macdeployqt
diff --git a/qttools/src/macdeployqt/macdeployqt/main.cpp b/qttools/src/macdeployqt/macdeployqt/main.cpp diff --git a/qttools/src/macdeployqt/macdeployqt/main.cpp b/qttools/src/macdeployqt/macdeployqt/main.cpp
index 2e6ad0c..8a90c1a 100644 index 5488a5f..1e90c72 100644
--- a/qttools/src/macdeployqt/macdeployqt/main.cpp --- a/qttools/src/macdeployqt/macdeployqt/main.cpp
+++ b/qttools/src/macdeployqt/macdeployqt/main.cpp +++ b/qttools/src/macdeployqt/macdeployqt/main.cpp
@@ -52,6 +52,7 @@ int main(int argc, char **argv) @@ -53,6 +53,7 @@ int main(int argc, char **argv)
qDebug() << " -always-overwrite : Copy files even if the target file exists";
qDebug() << " -codesign=<ident> : Run codesign with the given identity on all executables"; qDebug() << " -codesign=<ident> : Run codesign with the given identity on all executables";
qDebug() << " -appstore-compliant: Skip deployment of components that use private API"; qDebug() << " -appstore-compliant: Skip deployment of components that use private API";
qDebug() << " -libpath=<path> : Add the given path to the library search path";
+ qDebug() << " -extra-plugins=<d> : Deploy plugins from given extra directory"; + qDebug() << " -extra-plugins=<d> : Deploy plugins from given extra directory";
qDebug() << ""; qDebug() << "";
qDebug() << "macdeployqt takes an application bundle as input and makes it"; qDebug() << "macdeployqt takes an application bundle as input and makes it";
qDebug() << "self-contained by copying in the Qt frameworks and plugins that"; qDebug() << "self-contained by copying in the Qt frameworks and plugins that";
@@ -92,6 +93,7 @@ int main(int argc, char **argv) @@ -94,6 +95,7 @@ int main(int argc, char **argv)
extern QString codesignIdentiy; extern QString codesignIdentiy;
extern bool appstoreCompliant; extern bool appstoreCompliant;
extern bool deployFramework; extern bool deployFramework;
...@@ -18,7 +24,7 @@ index 2e6ad0c..8a90c1a 100644 ...@@ -18,7 +24,7 @@ index 2e6ad0c..8a90c1a 100644
for (int i = 2; i < argc; ++i) { for (int i = 2; i < argc; ++i) {
QByteArray argument = QByteArray(argv[i]); QByteArray argument = QByteArray(argv[i]);
@@ -153,6 +155,14 @@ int main(int argc, char **argv) @@ -162,6 +164,14 @@ int main(int argc, char **argv)
LogDebug() << "Argument found:" << argument; LogDebug() << "Argument found:" << argument;
deployFramework = true; deployFramework = true;
...@@ -33,7 +39,7 @@ index 2e6ad0c..8a90c1a 100644 ...@@ -33,7 +39,7 @@ index 2e6ad0c..8a90c1a 100644
} else if (argument.startsWith("-")) { } else if (argument.startsWith("-")) {
LogError() << "Unknown argument" << argument << "\n"; LogError() << "Unknown argument" << argument << "\n";
return 1; return 1;
@@ -183,10 +193,13 @@ int main(int argc, char **argv) @@ -192,10 +202,13 @@ int main(int argc, char **argv)
deploymentInfo.deployedFrameworks = deploymentInfo.deployedFrameworks.toSet().toList(); deploymentInfo.deployedFrameworks = deploymentInfo.deployedFrameworks.toSet().toList();
} }
...@@ -50,10 +56,10 @@ index 2e6ad0c..8a90c1a 100644 ...@@ -50,10 +56,10 @@ index 2e6ad0c..8a90c1a 100644
} }
diff --git a/qttools/src/macdeployqt/shared/shared.cpp b/qttools/src/macdeployqt/shared/shared.cpp diff --git a/qttools/src/macdeployqt/shared/shared.cpp b/qttools/src/macdeployqt/shared/shared.cpp
index 5577265..a590039 100644 index 9575090..477f7a0 100644
--- a/qttools/src/macdeployqt/shared/shared.cpp --- a/qttools/src/macdeployqt/shared/shared.cpp
+++ b/qttools/src/macdeployqt/shared/shared.cpp +++ b/qttools/src/macdeployqt/shared/shared.cpp
@@ -1070,6 +1070,43 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl @@ -1120,6 +1120,43 @@ void deployPlugins(const ApplicationBundleInfo &appBundleInfo, const QString &pl
} }
} }
...@@ -97,7 +103,7 @@ index 5577265..a590039 100644 ...@@ -97,7 +103,7 @@ index 5577265..a590039 100644
void createQtConf(const QString &appBundlePath) void createQtConf(const QString &appBundlePath)
{ {
// Set Plugins and imports paths. These are relative to App.app/Contents. // Set Plugins and imports paths. These are relative to App.app/Contents.
@@ -1111,6 +1148,16 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo, @@ -1161,6 +1198,16 @@ void deployPlugins(const QString &appBundlePath, DeploymentInfo deploymentInfo,
deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs); deployPlugins(applicationBundle, deploymentInfo.pluginPath, pluginDestinationPath, deploymentInfo, useDebugLibs);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment