diff options
| -rw-r--r-- | .commit-template | 7 | ||||
| -rw-r--r-- | .gitmodules | 3 | ||||
| -rwxr-xr-x | init-repository | 1 | ||||
| -rw-r--r-- | qt.pro | 8 | ||||
| m--------- | qtenginio | 0 |
5 files changed, 13 insertions, 6 deletions
diff --git a/.commit-template b/.commit-template index 0aef528f..813ca689 100644 --- a/.commit-template +++ b/.commit-template @@ -4,10 +4,10 @@ # ==[ Details: Describe what changed and explain why it changed ]======| -# ==[ Footers: Uncomment and edit where applicable ]===================| -# # Change log entry (see below for instructions). #[ChangeLog][][] + +# ==[ Footers: Uncomment and edit where applicable ]===================| # # One task per entry. Remember space after colon. #Task-number: @@ -22,7 +22,8 @@ # Change log entry: If this commit adds a significant feature, fixes an # issue or contains a behavior change that is relevant to others, # add a change log entry. It can be multiple lines long and ends with an -# empty newline. +# empty newline. Try to integrate it into the flow of the commit message +# to avoid redundancy. # Use the module name to indicate the area of the change e.g. [QtCore]. # Optionally specify a class or subtopic [QtNetwork][QSslSocket]. # Other common tags are: [General], [Important Behavior Changes], diff --git a/.gitmodules b/.gitmodules index e8c071b9..4a1c3d05 100644 --- a/.gitmodules +++ b/.gitmodules @@ -100,3 +100,6 @@ [submodule "qtandroidextras"] path = qtandroidextras url = ../qtandroidextras.git +[submodule "qtenginio"] + path = qtenginio + url = ../qtenginio.git diff --git a/init-repository b/init-repository index 819e98f1..272193d8 100755 --- a/init-repository +++ b/init-repository @@ -208,6 +208,7 @@ my %GERRIT_REPOS = map { $_ => "qt/$_" } qw( qtdeclarative qtdoc qtdocgallery + qtenginio qtfeedback qtgraphicaleffects qtimageformats @@ -3,6 +3,7 @@ cache(, super) CONFIG += build_pass # hack to disable the .qmake.super auto-add load(qt_build_config) +CONFIG -= build_pass # unhack, as it confuses Qt Creator TEMPLATE = subdirs @@ -76,16 +77,17 @@ addModule(qtsensors, qtbase, qtdeclarative) addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative, qtjsondb) -addModule(qtwebkit, qtdeclarative, qtlocation qtsensors, WebKit.pro) +addModule(qtwebkit, qtdeclarative, qtlocation qtmultimedia qtsensors, WebKit.pro) addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit) addModule(qtwebkit-examples, qtwebkit qttools) addModule(qtimageformats, qtbase) addModule(qtgraphicaleffects, qtdeclarative) -addModule(qtscript, qtbase) -addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit qttools) +addModule(qtscript, qtbase, qttools) +addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit) addModule(qtdocgallery, qtdeclarative, qtjsondb) !win32:!mac:addModule(qtwayland, qtbase, qtdeclarative) addModule(qtserialport, qtbase) +addModule(qtenginio, qtdeclarative) addModule(qttranslations, qttools) addModule(qtdoc, qtdeclarative) addModule(qtqa, qtbase) diff --git a/qtenginio b/qtenginio new file mode 160000 +Subproject 136ee0aa5dc2276699018bc743e758ea9ffda12 |