Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
otb
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Sébastien Peillet
otb
Commits
323cbc0c
Commit
323cbc0c
authored
7 years ago
by
Rashad Kanavath
Browse files
Options
Downloads
Patches
Plain Diff
BUG: exclude docs from qt build
parent
9531829f
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
SuperBuild/patches/QT4/qt4-1-minbuild-all.diff
+17
-5
17 additions, 5 deletions
SuperBuild/patches/QT4/qt4-1-minbuild-all.diff
with
17 additions
and
5 deletions
SuperBuild/patches/QT4/qt4-1-minbuild-all.diff
+
17
−
5
View file @
323cbc0c
diff -burN qt-everywhere-opensource-src-4.8.7.orig/projects.pro qt-everywhere-opensource-src-4.8.7/projects.pro
--- qt-everywhere-opensource-src-4.8.7.orig/projects.pro 2017-08-18 10:54:46.519887277 +0200
+++ qt-everywhere-opensource-src-4.8.7/projects.pro 2017-08-23 14:33:05.289398427 +0200
@@ -11,7 +11,7 @@
symbian|integrity {
QT_BUILD_PARTS = libs tools examples demos
} else {
- QT_BUILD_PARTS = libs tools examples demos docs translations
+ QT_BUILD_PARTS = libs tools examples demos translations
}
} else { #make sure the order makes sense
contains(QT_BUILD_PARTS, translations) {
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pri qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri
--- qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pri 2017-08-18 10:54:45.407880063 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri 2017-08-2
1
1
6:51:31.977064035
+0200
+++ qt-everywhere-opensource-src-4.8.7/src/gui/image/qjpeghandler.pri 2017-08-2
3
1
4:32:27.641149748
+0200
@@ -4,7 +4,7 @@
SOURCES += $$PWD/qjpeghandler.cpp
contains(QT_CONFIG, system-jpeg) {
...
...
@@ -12,7 +24,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/gui/image/qjpeghandler.pr
}
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/graphicssystems.pro qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/graphicssystems.pro 2017-08-18 10:54:45.583881205 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro 2017-08-2
1
1
6:51:32.037064450
+0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/graphicssystems/graphicssystems.pro 2017-08-2
3
1
4:32:27.661149879
+0200
@@ -1,5 +1,4 @@
TEMPLATE = subdirs
-SUBDIRS += trace
...
...
@@ -21,7 +33,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/graphicssystems/g
SUBDIRS += openvg
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imageformats.pro qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imageformats.pro 2017-08-18 10:54:45.583881205 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro 2017-08-2
1
1
6:51:32.037064450
+0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/imageformats/imageformats.pro 2017-08-2
3
1
4:32:27.661149879
+0200
@@ -3,7 +3,7 @@
!contains(QT_CONFIG, no-jpeg):!contains(QT_CONFIG, jpeg):SUBDIRS += jpeg
!contains(QT_CONFIG, no-gif):!contains(QT_CONFIG, gif):SUBDIRS += gif
...
...
@@ -33,7 +45,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/imageformats/imag
!contains(QT_CONFIG, no-tga):SUBDIRS += tga
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro 2017-08-18 10:54:45.599881309 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro 2017-08-2
1
1
6:51:32.037064450
+0200
+++ qt-everywhere-opensource-src-4.8.7/src/plugins/plugins.pro 2017-08-2
3
1
4:32:27.661149879
+0200
@@ -1,16 +1,16 @@
TEMPLATE = subdirs
...
...
@@ -62,7 +74,7 @@ diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/plugins/plugins.pro qt-ev
contains(QT_CONFIG, declarative): SUBDIRS *= qmltooling
diff -burN qt-everywhere-opensource-src-4.8.7.orig/src/src.pro qt-everywhere-opensource-src-4.8.7/src/src.pro
--- qt-everywhere-opensource-src-4.8.7.orig/src/src.pro 2017-08-18 10:54:46.487887069 +0200
+++ qt-everywhere-opensource-src-4.8.7/src/src.pro 2017-08-2
1
1
6:52:29.237459465
+0200
+++ qt-everywhere-opensource-src-4.8.7/src/src.pro 2017-08-2
3
1
4:32:27.661149879
+0200
@@ -4,7 +4,7 @@
unset(SRC_SUBDIRS)
win32:SRC_SUBDIRS += src_winmain
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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