diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-06-08 10:06:30 +0200 |
|---|---|---|
| committer | Tony Sarajärvi <tony.sarajarvi@digia.com> | 2015-06-08 08:52:13 +0000 |
| commit | 15711924091efc8b7c64528217a7e1ff9e077429 (patch) | |
| tree | 5537f9923b433d3e54e2c9d74a1d0cffa659e364 | |
| parent | 2b8791e472993fbd90453a0949ce3fd471281a38 (diff) | |
Fix QtWebEngine 5.5 and 5.5.0 integrations
They should be done against the 5.5 and 5.5.0 branches of the other
Qt modules, not dev.
Change-Id: I0b6acc5d5e9c1597977d6aeed15c9f0699fa00cf
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@digia.com>
| -rw-r--r-- | projects/QtWebEngine_5.5.0_Integration/properties/qt.branch | 1 | ||||
| -rw-r--r-- | projects/QtWebEngine_5.5_Integration/properties/qt.branch | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/projects/QtWebEngine_5.5.0_Integration/properties/qt.branch b/projects/QtWebEngine_5.5.0_Integration/properties/qt.branch new file mode 100644 index 00000000..d50359de --- /dev/null +++ b/projects/QtWebEngine_5.5.0_Integration/properties/qt.branch @@ -0,0 +1 @@ +5.5.0 diff --git a/projects/QtWebEngine_5.5_Integration/properties/qt.branch b/projects/QtWebEngine_5.5_Integration/properties/qt.branch new file mode 100644 index 00000000..9ad974f6 --- /dev/null +++ b/projects/QtWebEngine_5.5_Integration/properties/qt.branch @@ -0,0 +1 @@ +5.5 |