diff options
| -rw-r--r-- | .gitmodules | 6 | ||||
| -rwxr-xr-x | configure | 10 | ||||
| -rw-r--r-- | configure.bat | 11 | ||||
| -rwxr-xr-x | init-repository | 2 | ||||
| -rw-r--r-- | qt.pro | 2 | ||||
| m--------- | qtmacextras | 0 | ||||
| m--------- | qtqa | 0 | ||||
| m--------- | qtrepotools | 0 | ||||
| m--------- | qtwinextras | 0 |
9 files changed, 14 insertions, 17 deletions
diff --git a/.gitmodules b/.gitmodules index d8c8bd28..8fbcde15 100644 --- a/.gitmodules +++ b/.gitmodules @@ -94,3 +94,9 @@ [submodule "qtx11extras"] path = qtx11extras url = ../qtx11extras.git +[submodule "qtmacextras"] + path = qtmacextras + url = ../qtmacextras.git +[submodule "qtwinextras"] + path = qtwinextras + url = ../qtwinextras.git @@ -53,11 +53,5 @@ mkdir -p qtbase || exit echo "+ cd qtbase" cd qtbase || exit -echo "+ $configure $@" -"$configure" "$@" || exit 1 - -echo "+ cd .." -cd .. - -echo "+ qtbase/bin/qmake $srcpath" -exec qtbase/bin/qmake "$srcpath" +echo "+ $configure -top-level $@" +exec "$configure" -top-level "$@" diff --git a/configure.bat b/configure.bat index 73395684..d3bb977f 100644 --- a/configure.bat +++ b/configure.bat @@ -52,17 +52,10 @@ if not exist qtbase mkdir qtbase || exit /b 1 echo + cd qtbase cd qtbase || exit /b 1 -echo + %configure% %* -call %configure% %* +echo + %configure% -top-level %* +call %configure% -top-level %* set err=%errorlevel% cd .. -if not %err% == 0 goto out - -echo + qtbase\bin\qmake %srcpath% -qtbase\bin\qmake %srcpath% -set err=%errorlevel% - -:out exit /b %err% diff --git a/init-repository b/init-repository index 09adc994..b355ffa3 100755 --- a/init-repository +++ b/init-repository @@ -226,6 +226,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtjsondb qtjsbackend qtlocation + qtmacextras qtmultimedia qtpim qtqa @@ -242,6 +243,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtwayland qtwebkit qtwebkit-examples + qtwinextras qtx11extras qtxmlpatterns ); @@ -54,6 +54,8 @@ defineTest(addModule) { # it may not build. addModule(qtbase) +addModule(qtmacextras, qtbase) +addModule(qtwinextras, qtbase) addModule(qtx11extras, qtbase) addModule(qlalr, qtbase) addModule(qtsvg, qtbase) diff --git a/qtmacextras b/qtmacextras new file mode 160000 +Subproject e537fadafafb6e91be4597a779a77c8cce5b83b diff --git a/qtqa b/qtqa -Subproject 591e4d5e83cd42f126f2f3b3f3f6d6272125c8f +Subproject c5ba2745d2493f2d8fba8fddea0040ccc2776c1 diff --git a/qtrepotools b/qtrepotools -Subproject 826e736176ff0c8a5f5b8cb3de6bb1b185fdd27 +Subproject 871ad351a15903f34edca8f814e21ed6d0876ac diff --git a/qtwinextras b/qtwinextras new file mode 160000 +Subproject 447815121b25c2de61eba8446ad5db57ae739b5 |