-
Notifications
You must be signed in to change notification settings - Fork 37.7k
Depends : Qt Use Top-Level Structure #20600
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
Closed
Changes from all commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
ef283d5
Add QML/ QtQuick Depends
BlockMechanic 633660c
Start using top level Qt for depends
BlockMechanic 8068300
Update qt.mk
BlockMechanic 7eb9c96
Update funcs.mk
BlockMechanic 4ff303e
Update qt.mk
BlockMechanic 88da239
Delete fix_android_base_head_conf.patch
BlockMechanic f7aefca
Version Agnostic
BlockMechanic e96fb4a
Remove unnecessary line
BlockMechanic f295c9d
Rename to qt.modules
BlockMechanic 37b7460
Add complete configure file
BlockMechanic 6f500bb
Create qt (copy).mk
BlockMechanic a606ebd
Update qt.mk
BlockMechanic 158b0a9
Delete qt (copy).mk
BlockMechanic b02b2a8
Resolve Modules
BlockMechanic 68b9816
Resolve Modules
BlockMechanic 9630653
Resolve Modules
BlockMechanic File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,49 @@ | ||
| #! /bin/sh | ||
| ############################################################################# | ||
| ## | ||
| ## Copyright (C) 2015 The Qt Company Ltd. | ||
| ## Contact: http://www.qt.io/licensing/ | ||
| ## | ||
| ## This file is part of the build tools of the Qt Toolkit. | ||
| ## | ||
| ## $QT_BEGIN_LICENSE:LGPL21$ | ||
| ## Commercial License Usage | ||
| ## Licensees holding valid commercial Qt licenses may use this file in | ||
| ## accordance with the commercial license agreement provided with the | ||
| ## Software or, alternatively, in accordance with the terms contained in | ||
| ## a written agreement between you and The Qt Company. For licensing terms | ||
| ## and conditions see http://www.qt.io/terms-conditions. For further | ||
| ## information use the contact form at http://www.qt.io/contact-us. | ||
| ## | ||
| ## GNU Lesser General Public License Usage | ||
| ## Alternatively, this file may be used under the terms of the GNU Lesser | ||
| ## General Public License version 2.1 or version 3 as published by the Free | ||
| ## Software Foundation and appearing in the file LICENSE.LGPLv21 and | ||
| ## LICENSE.LGPLv3 included in the packaging of this file. Please review the | ||
| ## following information to ensure the GNU Lesser General Public License | ||
| ## requirements will be met: https://www.gnu.org/licenses/lgpl.html and | ||
| ## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. | ||
| ## | ||
| ## As a special exception, The Qt Company gives you certain additional | ||
| ## rights. These rights are described in The Qt Company LGPL Exception | ||
| ## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. | ||
| ## | ||
| ## $QT_END_LICENSE$ | ||
| ## | ||
| ############################################################################# | ||
|
|
||
| srcpath=`dirname $0` | ||
| srcpath=`(cd "$srcpath"; pwd)` | ||
| configure=$srcpath/qtbase/configure | ||
| if [ ! -e "$configure" ]; then | ||
| echo "$configure not found. Did you forget to run \"init-repository\"?" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| mkdir -p qtbase || exit | ||
|
|
||
| echo "+ cd qtbase" | ||
| cd qtbase || exit | ||
|
|
||
| echo "+ $configure -top-level $@" | ||
| exec "$configure" -top-level "$@" | ||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This files looks to be stripped of its licence (LGPL). It's better to extract the file (and others) directly from the submodules. If the files have been slightly modified from the Qt source add a patchfile - to be in line with the current practice.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These specific files are not within the submodules unfortunately nor are they listed in the download directory see :- https://download.qt.io/official_releases/qt/5.9/5.9.8/submodules. They are only in the all-in-one or the git, so I had copied them separately to avoid downloading the whole all-in-one only to extract these three files and then duplicate the work by separately downloading each module.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In that case I vote for downloading the all-in-one. It would reduce this PR by three files and most of its lines. It would also simplify existing code. The download would take a bit longer but if we want QML I think it's worth it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm already working on that approach @icota. Also worth noting that single file was the old approach, and it was changed in ab67dd7, maybe @theuni had a motivation for using modules.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@promag I have an all in one build already functional, should i open a PR and we collaborate ?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@BlockMechanic sure! Happy to review and compare with my change.