diff options
| author | Frederik Gladhorn <frederik.gladhorn@nokia.com> | 2012-06-20 20:24:30 +0200 |
|---|---|---|
| committer | Jens Bache-Wiig <jens.bache-wiig@nokia.com> | 2012-06-21 12:00:15 +0200 |
| commit | e6d37087aea3a7f681dd34abc577e06c145db436 (patch) | |
| tree | ea968f416fc90707ec1ead5fdaab13791e4a9037 | |
| parent | 42118c084faae1eebd99a5f87c150f88fb532a0e (diff) | |
| download | qtquickcontrols-e6d37087aea3a7f681dd34abc577e06c145db436.tar.gz | |
Remove old merge conflict, use QQuick 2
Change-Id: If16005177415341272122c434071f074b85ed8ac
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@nokia.com>
| -rw-r--r-- | examples/Browser.qml | 4 | ||||
| -rw-r--r-- | examples/TopLevelBrowser.qml | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/examples/Browser.qml b/examples/Browser.qml index 404b15ef..2fb4c317 100644 --- a/examples/Browser.qml +++ b/examples/Browser.qml @@ -1,9 +1,5 @@ -<<<<<<< HEAD import QtQuick 2.0 -======= -import QtQuick 1.0 import QtDesktop 0.2 ->>>>>>> master import QtWebKit 1.0 import "content" diff --git a/examples/TopLevelBrowser.qml b/examples/TopLevelBrowser.qml index 366ff4d7..ce8995a6 100644 --- a/examples/TopLevelBrowser.qml +++ b/examples/TopLevelBrowser.qml @@ -1,4 +1,4 @@ -import QtQuick 1.0 +import QtQuick 2.0 import QtDesktop 0.2 import "content" |