Qt static build - installs missing static libraries and adds missing dependancies in pkgconfig and pri files#277
Closed
matteoceraico wants to merge 23 commits intoqtwebkit:qtwebkit-stablefrom
Closed
Conversation
New cmake arguments added: - DISABLE_TESTS, disables all test - QT_STATIC_BUILD, defines that qt is compiled as a static lib Provided ability to exclude QT features, you need to add the parameters (in accordance with QT) as a cmake argument (e.g.: -DQT_NO_GRAPHICSVIEW=ON)
Now QT_STATIC_BUILD is populated dynamically
We’re able to manage it in another way
DISABLE_TESTS has been substituted with ENABLE_TEST_SUPPORT (that was already implemented)
Moved declaration of QT_STATIC_BUILD Used a better check for the tests related to the JavaScriptCore (we’re looking for ENABLE_API_TESTS instead of ENABLE_TEST_SUPPORT)
The sources of SQLITE3 will be compiled instead of to use the system libraries.
Change-Id: Ia909a560db58d6cdc6ec4bbac879249eb5e286ef Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
Change-Id: If0155e6706cc91f2b00e2a446c8f5643b88f0b69
They are deprecated since Qt 5.0. Change-Id: Id6df1fa1eec1e1f6bee863d7c00f37a599dd49f3 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
… about missing source file
…es in pkgconfig and pri files
Source/WebKit/PlatformQt.cmake
Outdated
| BASE_NAME Qt5WebKit | ||
| LIB_INSTALL_DIR "lib" | ||
| DEPS "Qt5Core Qt5Gui Qt5Network" | ||
| DEPS "Qt5Core Qt5Gui Qt5Network Qt5Sql${PKGCONFIG_EXTRA_LIBS}" |
Member
There was a problem hiding this comment.
We should not link users of standard build to Qt5Sql, it's a private dependency
c96d163 to
b6891c5
Compare
Source/WebKit/PlatformQt.cmake
Outdated
| set(WEBKIT_PRI_DEPS "${WEBKIT_PRI_DEPS} sql") | ||
| set(WEBKITWIDGETS_PKGCONFIG_DEPS "${WEBKITWIDGETS_PKGCONFIG_DEPS} Qt5PrintSupport") | ||
| set(WEBKITWIDGETS_PRI_DEPS "${WEBKITWIDGETS_PRI_DEPS} printsupport") | ||
| set(EXTRA_LIBS_NAMES "WTF" "JavaScriptCore" "WebCore" "xml2") |
Member
There was a problem hiding this comment.
Order is wrong, should be
set(EXTRA_LIBS_NAMES WebCore JavaScriptCore WTF xml2)
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Installs:
Adds missing dependancies in: