summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-09-18 17:20:36 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-19 19:54:44 +0200
commitf104640fa5fa01a05886ea1b9780f1e5edebb437 (patch)
tree7adee7ebd6e5ffbe4aa2f16bb4d610fbd539cf64
parent695051f3be09c8277dde3be1cd33d7b51fc37f6e (diff)
syncqt only the QtCore headers for the bootstrap
Change-Id: I26e19805823bfe987c721f6a274803e54f0e4003 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rwxr-xr-xconfigure2
-rw-r--r--configure.bat2
-rw-r--r--tools/configure/configureapp.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/configure b/configure
index 55b60b7d18..97110b970e 100755
--- a/configure
+++ b/configure
@@ -3541,7 +3541,7 @@ fi
# symlink includes
if [ -n "$PERL" ] && [ -x "$relpath/bin/syncqt" ]; then
- "$outpath/bin/syncqt" -minimal "$relpath" || exit 1
+ "$outpath/bin/syncqt" -minimal -module QtCore "$relpath" || exit 1
fi
# $1: input variable name (awk regexp)
diff --git a/configure.bat b/configure.bat
index 09f19fdd8d..1b6f6caed8 100644
--- a/configure.bat
+++ b/configure.bat
@@ -57,7 +57,7 @@ if not exist include (
md mkspecs
if errorlevel 1 goto exit
)
- perl %QTSRC%bin\syncqt -minimal -outdir %QTDIR% %QTSRC%
+ perl %QTSRC%bin\syncqt -minimal -module QtCore -outdir %QTDIR% %QTSRC%
if errorlevel 1 goto exit
)
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp
index 0c26bd4226..e9daa4349c 100644
--- a/tools/configure/configureapp.cpp
+++ b/tools/configure/configureapp.cpp
@@ -3420,7 +3420,7 @@ void Configure::generateHeaders()
cout << "Running syncqt..." << endl;
QStringList args;
args += buildPath + "/bin/syncqt.bat";
- args += "-minimal";
+ args << "-minimal" << "-module" << "QtCore";
args += sourcePath;
int retc = Environment::execute(args, QStringList(), QStringList());
if (retc) {