Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
Qt5
Commits
d3f10a82
Commit
d3f10a82
authored
13 years ago
by
Lincoln Ramsay
Committed by
axis
13 years ago
Browse files
Options
Download
Patches
Plain Diff
Don't assume that commands succeed
Signed-off-by:
axis
<
qt-info@nokia.com
>
parent
984400a5
dev
5.10
5.11
5.12
5.12.1
5.12.10
5.12.11
5.12.12
5.12.2
5.12.3
5.12.4
5.12.5
5.12.6
5.12.7
5.12.8
5.12.9
5.13
5.13.0
5.13.1
5.13.2
5.14
5.14.0
5.14.1
5.14.2
5.15
5.15.0
5.15.1
5.15.2
5.3
5.4
5.5
5.6
5.7
5.8
5.9
5.9.8
6.0
6.0.0
6.1
6.1.0
6.1.1
6.1.2
6.1.3
6.2
6.2.0
6.2.1
6.2.2
ifw-5.12.10
ifw-5.12.11
pyside6.0
pyside6.1
wip/cmake
wip/emulator/master
wip/flashing-wizard/master
wip/installer-framework/3.0
wip/installer-framework/3.1
wip/installer-framework/master
wip/navigation
wip/ogl-runtime/2.4
wip/ogl-runtime/2.5
wip/ogl-runtime/2.6
wip/ogl-runtime/2.7
wip/ogl-runtime/master
wip/pyside-setup/5.11.0
wip/pyside-setup/5.14
wip/qbs/1.10
wip/qbs/master
wip/qdb/master
wip/qt3d-runtime/2.0
wip/qt3d-runtime/2.0.1
wip/qt3d-runtime/2.1
wip/qt3d-runtime/2.2
wip/qt3d-runtime/2.3
wip/qt3d-runtime/2.4
wip/qt3d-runtime/master
wip/qt3dstudio/2.0
wip/qt3dstudio/2.0.1
wip/qt3dstudio/2.1
wip/qt3dstudio/2.2
wip/qt3dstudio/2.3
wip/qt3dstudio/2.4
wip/qt3dstudio/2.5
wip/qt3dstudio/2.6
wip/qt3dstudio/2.7
wip/qt3dstudio/master
wip/qt3dstudio/runtime2
wip/qt6
wip/qtsaferenderer/1.0
wip/qtsaferenderer/1.1
wip/qtsaferenderer/1.2
wip/qtsaferenderer/master
wip/qtwebkit/5.212
wip/tqtc-qt-config-gui/master
wip/vxworks/5.9.5
wip/webassembly
v5.15.0-alpha1
v5.14.1
v5.14.0
v5.14.0-rc2
v5.14.0-rc1
v5.14.0-beta3
v5.14.0-beta2
v5.14.0-beta1
v5.14.0-alpha1
v5.13.2
v5.13.1
v5.13.0
v5.13.0-rc3
v5.13.0-rc2
v5.13.0-rc1
v5.13.0-beta4
v5.13.0-beta3
v5.13.0-beta2
v5.13.0-beta1
v5.13.0-alpha1
v5.12.7
v5.12.6
v5.12.5
v5.12.4
v5.12.3
v5.12.2
v5.12.1
v5.12.0
v5.12.0-rc2
v5.12.0-rc1
v5.12.0-beta4
v5.12.0-beta3
v5.12.0-beta2
v5.12.0-beta1
v5.12.0-alpha1
v5.11.3
v5.11.2
v5.11.1
v5.11.0
v5.11.0-rc2
v5.11.0-rc1
v5.11.0-beta4
v5.11.0-beta3
v5.11.0-beta2
v5.11.0-beta1
v5.11.0-alpha1
v5.10.1
v5.10.0
v5.10.0-rc3
v5.10.0-rc2
v5.10.0-rc1
v5.10.0-beta4
v5.10.0-beta3
v5.10.0-beta2
v5.10.0-beta1
v5.10.0-alpha1
v5.9.9
v5.9.8
v5.9.7
v5.9.6
v5.9.5
v5.9.4
v5.9.3
v5.9.2
v5.9.1
v5.9.0
v5.9.0-rc2
v5.9.0-rc1
v5.9.0-beta4
v5.9.0-beta3
v5.9.0-beta2
v5.9.0-beta1
v5.9.0-alpha1
v5.8.0
v5.8.0-rc1
v5.8.0-beta1
v5.8.0-alpha1
v5.7.1
v5.7.0
v5.7.0-rc1
v5.7.0-beta1
v5.7.0-alpha1
v5.6.3
v5.6.2
v5.6.1
v5.6.1-1
v5.6.0
v5.6.0-rc1
v5.6.0-beta1
v5.6.0-alpha1
v5.5.1
v5.5.0
v5.5.0-rc1
v5.5.0-beta1
v5.5.0-alpha1
v5.4.2
v5.4.1
v5.4.0
v5.4.0-rc1
v5.4.0-beta1
v5.4.0-alpha1
v5.3.2
v5.3.1
v5.3.0
v5.3.0-rc1
v5.3.0-beta1
v5.3.0-alpha1
v5.2.1
v5.2.0
v5.2.0-rc1
v5.2.0-beta1
v5.2.0-alpha1
v5.1.1
v5.1.0
v5.1.0-rc2
v5.1.0-rc1
v5.1.0-beta1
v5.1.0-alpha1
v5.0.0-beta1
qt-v5.0.0-alpha1
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
configure
+4
-4
configure
with
4 additions
and
4 deletions
configure
+
4
−
4
View file @
d3f10a82
...
...
@@ -51,7 +51,8 @@ if (! -e "$relpath/qtbase/configure") {
ensureDir
("
$outpath
/qtbase
");
chdir
("
$outpath
/qtbase
");
system_v
("
$relpath
/qtbase/configure
@ARGV
");
my
$ret
=
system_v
("
$relpath
/qtbase/configure
@ARGV
");
exit
$ret
unless
(
$ret
==
0
);
chdir
("
$outpath
");
...
...
@@ -59,6 +60,5 @@ open QMAKE_CACHE, ">.qmake.cache" || die "Could not open .qmake.cache for writin
print
QMAKE_CACHE
"
include(
\$\$
PWD/qtbase/.qmake.cache)
\n
";
close
QMAKE_CACHE
;
system_v
("
$outpath
/qtbase/bin/qmake
$relpath
/qt.pro
");
exit
0
;
$ret
=
system_v
("
$outpath
/qtbase/bin/qmake
$relpath
/qt.pro
");
exit
$ret
;
This diff is collapsed.
Click to expand it.
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets