Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 1 Dec 2010 20:55:49 GMT
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/152752: devel/qtcreator: update to 2.0.1 for Qt-4.7
Message-ID:  <201012012055.oB1KtnGq025603@red.freebsd.org>
Resent-Message-ID: <201012012100.oB1L0MUF039939@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         152752
>Category:       ports
>Synopsis:       devel/qtcreator: update to 2.0.1 for Qt-4.7
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Wed Dec 01 21:00:22 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator:     Max Brazhnikov
>Release:        FreeBSD 8.2-PRERELEASE amd64
>Organization:
>Environment:
FreeBSD luna.dio.ru 8.2-PRERELEASE FreeBSD 8.2-PRERELEASE #0: Tue Nov 30 22:58:45 MSK 2010     root@luna.dio.ru:/usr/obj/usr/freebsd/8/src/sys/LUNA  amd64
>Description:
Qt4 will be updated to 4.7.1 soon. I'd like to update qtcreator along with Qt, since qtcreator-1.3.1 does not build with Qt-4.7, while 2.0.1 is broken with Qt-4.6.

This patch also fixes ports/144226
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/qtcreator/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	28 Mar 2010 06:33:37 -0000	1.5
+++ Makefile	28 Nov 2010 22:24:02 -0000
@@ -7,11 +7,11 @@
 #
 
 PORTNAME=	qtcreator
-PORTVERSION=	1.3.1
-PORTREVISION=	1
-CATEGORIES?=	devel
+PORTVERSION=	2.0.1
+CATEGORIES=	devel
 MASTER_SITES=	http://download.qt.nokia.com/qtcreator/
 DISTNAME=	qt-creator-${PORTVERSION}-src
+EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	kmoore@freebsd.org
 COMMENT=	Qt4 IDE
@@ -28,7 +28,7 @@
 		sql svg xml webkit
 HAS_CONFIGURE=	yes
 
-QMAKE_ARGS=	-unix -recursive ${QMAKE_PRO}
+QMAKE_ARGS=	-recursive CONFIG+="configure" ${QMAKE_PRO}
 QMAKE_PRO=	qtcreator.pro
 
 MAKE_JOBS_SAFE=	yes
@@ -43,14 +43,14 @@
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} -unix CONFIG+="configure" ${QMAKE_PRO}
+		${QMAKE} ${QMAKEFLAGS} ${QMAKE_ARGS}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/qtcreator ${PREFIX}/bin/qtcreator
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator.bin ${PREFIX}/bin/qtcreator.bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/qtcreator_process_stub ${PREFIX}/bin/qtcreator_process_stub
+	${MKDIR} ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator ${PREFIX}/bin/qtcreator
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/qtcreator_process_stub ${PREFIX}/bin/qtcreator_process_stub
 	${MKDIR} ${PREFIX}/lib/
-	cd ${WRKSRC}/lib/ && ${FIND} -d qtcreator | ${CPIO} -dumpl ${PREFIX}/lib/ >/dev/null
+	cd ${WRKSRC}/lib/ && ${COPYTREE_SHARE} qtcreator ${PREFIX}/lib/
 	${MKDIR} ${PREFIX}/share/
 	cd ${WRKSRC}/share && ${COPYTREE_SHARE} qtcreator ${PREFIX}/share/
 	${MKDIR} ${PREFIX}/share/doc
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/qtcreator/distinfo,v
retrieving revision 1.2
diff -u -r1.2 distinfo
--- distinfo	23 Mar 2010 17:09:06 -0000	1.2
+++ distinfo	28 Nov 2010 21:17:42 -0000
@@ -1,3 +1,2 @@
-MD5 (qt-creator-1.3.1-src.tar.gz) = bc5d64922a292cdccb5f9e5e1a33575e
-SHA256 (qt-creator-1.3.1-src.tar.gz) = b738a327b64276c5d8c0a01cbb840e316a657635514bc8e41c6cfa1c77e691ed
-SIZE (qt-creator-1.3.1-src.tar.gz) = 10623442
+SHA256 (qt-creator-2.0.1-src.tgz) = e682109f1ce4baf3ee54c0a3ead757c1334d26f2b8fed177458b6b183c40aee1
+SIZE (qt-creator-2.0.1-src.tgz) = 18350214
Index: pkg-plist
===================================================================
RCS file: /home/pcvs/ports/devel/qtcreator/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	23 Mar 2010 17:09:06 -0000	1.2
+++ pkg-plist	28 Nov 2010 22:22:17 -0000
@@ -1,10 +1,13 @@
 bin/qtcreator
-bin/qtcreator.bin
 bin/qtcreator_process_stub
 lib/qtcreator/libAggregation.so
 lib/qtcreator/libAggregation.so.1
 lib/qtcreator/libAggregation.so.1.0
 lib/qtcreator/libAggregation.so.1.0.0
+lib/qtcreator/libBotan.so
+lib/qtcreator/libBotan.so.1
+lib/qtcreator/libBotan.so.1.0
+lib/qtcreator/libBotan.so.1.0.0
 lib/qtcreator/libCPlusPlus.so
 lib/qtcreator/libCPlusPlus.so.1
 lib/qtcreator/libCPlusPlus.so.1.0
@@ -17,6 +20,14 @@
 lib/qtcreator/libExtensionSystem.so.1
 lib/qtcreator/libExtensionSystem.so.1.0
 lib/qtcreator/libExtensionSystem.so.1.0.0
+lib/qtcreator/libNet7ssh.so
+lib/qtcreator/libNet7ssh.so.1
+lib/qtcreator/libNet7ssh.so.1.0
+lib/qtcreator/libNet7ssh.so.1.0.0
+lib/qtcreator/libQmlJS.so
+lib/qtcreator/libQmlJS.so.1
+lib/qtcreator/libQmlJS.so.1.0
+lib/qtcreator/libQmlJS.so.1.0.0
 lib/qtcreator/libQtConcurrent.so
 lib/qtcreator/libQtConcurrent.so.1
 lib/qtcreator/libQtConcurrent.so.1.0
@@ -25,10 +36,14 @@
 lib/qtcreator/libUtils.so.1
 lib/qtcreator/libUtils.so.1.0
 lib/qtcreator/libUtils.so.1.0.0
+lib/qtcreator/libsymbianutils.so
+lib/qtcreator/libsymbianutils.so.1
+lib/qtcreator/libsymbianutils.so.1.0
+lib/qtcreator/libsymbianutils.so.1.0.0
 lib/qtcreator/plugins/Nokia/BinEditor.pluginspec
 lib/qtcreator/plugins/Nokia/Bookmarks.pluginspec
-lib/qtcreator/plugins/Nokia/CVS.pluginspec
 lib/qtcreator/plugins/Nokia/CMakeProjectManager.pluginspec
+lib/qtcreator/plugins/Nokia/CVS.pluginspec
 lib/qtcreator/plugins/Nokia/CodePaster.pluginspec
 lib/qtcreator/plugins/Nokia/Core.pluginspec
 lib/qtcreator/plugins/Nokia/CppEditor.pluginspec
@@ -40,12 +55,12 @@
 lib/qtcreator/plugins/Nokia/GenericProjectManager.pluginspec
 lib/qtcreator/plugins/Nokia/Help.pluginspec
 lib/qtcreator/plugins/Nokia/Locator.pluginspec
+lib/qtcreator/plugins/Nokia/Mercurial.pluginspec
 lib/qtcreator/plugins/Nokia/Perforce.pluginspec
 lib/qtcreator/plugins/Nokia/ProjectExplorer.pluginspec
-lib/qtcreator/plugins/Nokia/QmlEditor.pluginspec
+lib/qtcreator/plugins/Nokia/QmlJSEditor.pluginspec
 lib/qtcreator/plugins/Nokia/QmlProjectManager.pluginspec
 lib/qtcreator/plugins/Nokia/Qt4ProjectManager.pluginspec
-lib/qtcreator/plugins/Nokia/QtScriptEditor.pluginspec
 lib/qtcreator/plugins/Nokia/ResourceEditor.pluginspec
 lib/qtcreator/plugins/Nokia/ScmGit.pluginspec
 lib/qtcreator/plugins/Nokia/Subversion.pluginspec
@@ -54,8 +69,8 @@
 lib/qtcreator/plugins/Nokia/Welcome.pluginspec
 lib/qtcreator/plugins/Nokia/libBinEditor.so
 lib/qtcreator/plugins/Nokia/libBookmarks.so
-lib/qtcreator/plugins/Nokia/libCVS.so
 lib/qtcreator/plugins/Nokia/libCMakeProjectManager.so
+lib/qtcreator/plugins/Nokia/libCVS.so
 lib/qtcreator/plugins/Nokia/libCodePaster.so
 lib/qtcreator/plugins/Nokia/libCore.so
 lib/qtcreator/plugins/Nokia/libCppEditor.so
@@ -67,12 +82,12 @@
 lib/qtcreator/plugins/Nokia/libGenericProjectManager.so
 lib/qtcreator/plugins/Nokia/libHelp.so
 lib/qtcreator/plugins/Nokia/libLocator.so
+lib/qtcreator/plugins/Nokia/libMercurial.so
 lib/qtcreator/plugins/Nokia/libPerforce.so
 lib/qtcreator/plugins/Nokia/libProjectExplorer.so
-lib/qtcreator/plugins/Nokia/libQmlEditor.so
+lib/qtcreator/plugins/Nokia/libQmlJSEditor.so
 lib/qtcreator/plugins/Nokia/libQmlProjectManager.so
 lib/qtcreator/plugins/Nokia/libQt4ProjectManager.so
-lib/qtcreator/plugins/Nokia/libQtScriptEditor.so
 lib/qtcreator/plugins/Nokia/libResourceEditor.so
 lib/qtcreator/plugins/Nokia/libScmGit.so
 lib/qtcreator/plugins/Nokia/libSubversion.so
@@ -87,7 +102,6 @@
 share/doc/qtcreator/coding-style.qdoc
 share/doc/qtcreator/doc.pri
 share/doc/qtcreator/doxygen/Doxyfile
-share/doc/qtcreator/eike_doc.patch
 share/doc/qtcreator/examples/addressbook-sdk/part1/addressbook.cpp
 share/doc/qtcreator/examples/addressbook-sdk/part1/addressbook.h
 share/doc/qtcreator/examples/addressbook-sdk/part1/addressbook.ui
@@ -116,22 +130,27 @@
 share/doc/qtcreator/examples/addressbook-sdk/part5/finddialog.ui
 share/doc/qtcreator/examples/addressbook-sdk/part5/main.cpp
 share/doc/qtcreator/examples/addressbook-sdk/part5/part5.pro
-share/doc/qtcreator/examples/addressbook-sdk/part6/finddialog.cpp
+share/doc/qtcreator/examples/addressbook-sdk/part6/addressbook.cpp
 share/doc/qtcreator/examples/addressbook-sdk/part6/addressbook.h
-share/doc/qtcreator/examples/addressbook-sdk/part6/main.cpp
+share/doc/qtcreator/examples/addressbook-sdk/part6/addressbook.ui
+share/doc/qtcreator/examples/addressbook-sdk/part6/finddialog.cpp
+share/doc/qtcreator/examples/addressbook-sdk/part6/finddialog.h
 share/doc/qtcreator/examples/addressbook-sdk/part6/finddialog.ui
-share/doc/qtcreator/examples/addressbook-sdk/part6/addressbook.cpp
+share/doc/qtcreator/examples/addressbook-sdk/part6/main.cpp
 share/doc/qtcreator/examples/addressbook-sdk/part6/part6.pro
-share/doc/qtcreator/examples/addressbook-sdk/part6/finddialog.h
-share/doc/qtcreator/examples/addressbook-sdk/part6/addressbook.ui
-share/doc/qtcreator/examples/addressbook-sdk/part7/main.cpp
-share/doc/qtcreator/examples/addressbook-sdk/part7/part7.pro
+share/doc/qtcreator/examples/addressbook-sdk/part7/addressbook.cpp
 share/doc/qtcreator/examples/addressbook-sdk/part7/addressbook.h
 share/doc/qtcreator/examples/addressbook-sdk/part7/addressbook.ui
 share/doc/qtcreator/examples/addressbook-sdk/part7/finddialog.cpp
 share/doc/qtcreator/examples/addressbook-sdk/part7/finddialog.h
 share/doc/qtcreator/examples/addressbook-sdk/part7/finddialog.ui
-share/doc/qtcreator/examples/addressbook-sdk/part7/addressbook.cpp
+share/doc/qtcreator/examples/addressbook-sdk/part7/main.cpp
+share/doc/qtcreator/examples/addressbook-sdk/part7/part7.pro
+share/doc/qtcreator/examples/batteryindicator/BatteryIndicator.pro
+share/doc/qtcreator/examples/batteryindicator/batteryindicator.cpp
+share/doc/qtcreator/examples/batteryindicator/batteryindicator.h
+share/doc/qtcreator/examples/batteryindicator/batteryindicator.ui
+share/doc/qtcreator/examples/batteryindicator/main.cpp
 share/doc/qtcreator/examples/textfinder/input.txt
 share/doc/qtcreator/examples/textfinder/main.cpp
 share/doc/qtcreator/examples/textfinder/textfinder.cpp
@@ -147,20 +166,24 @@
 share/doc/qtcreator/images/addressbook-tutorial-part2-add-contact.png
 share/doc/qtcreator/images/addressbook-tutorial-part2-add-flowchart.png
 share/doc/qtcreator/images/addressbook-tutorial-part2-add-successful.png
+share/doc/qtcreator/images/addressbook-tutorial-part2-form-design.png
 share/doc/qtcreator/images/addressbook-tutorial-part2-signals-and-slots.png
 share/doc/qtcreator/images/addressbook-tutorial-part2-stretch-effects.png
 share/doc/qtcreator/images/addressbook-tutorial-part3-drop-in-gridlayout.png
 share/doc/qtcreator/images/addressbook-tutorial-part3-linkedlist.png
 share/doc/qtcreator/images/addressbook-tutorial-part3-screenshot.png
+share/doc/qtcreator/images/addressbook-tutorial-part4-confirm.png
 share/doc/qtcreator/images/addressbook-tutorial-part4-drop-in-gridlayout.png
-share/doc/qtcreator/images/addressbook-tutorial-part5-signals-and-slots.png
-share/doc/qtcreator/images/addressbook-tutorial-part5-finddialog-in-designer.png
+share/doc/qtcreator/images/addressbook-tutorial-part4-remove.png
+share/doc/qtcreator/images/addressbook-tutorial-part4-screenshot.png
 share/doc/qtcreator/images/addressbook-tutorial-part5-dialogbox.png
+share/doc/qtcreator/images/addressbook-tutorial-part5-finddialog-in-designer.png
 share/doc/qtcreator/images/addressbook-tutorial-part5-screenshot.png
+share/doc/qtcreator/images/addressbook-tutorial-part5-signals-and-slots.png
 share/doc/qtcreator/images/addressbook-tutorial-part6-opendialog.png
 share/doc/qtcreator/images/addressbook-tutorial-part6-propertyeditor.png
-share/doc/qtcreator/images/addressbook-tutorial-part6-screenshot.png
 share/doc/qtcreator/images/addressbook-tutorial-part6-savedialog.png
+share/doc/qtcreator/images/addressbook-tutorial-part6-screenshot.png
 share/doc/qtcreator/images/addressbook-tutorial-part7-screenshot.png
 share/doc/qtcreator/images/addressbook-tutorial-screenshot.png
 share/doc/qtcreator/images/completion/class.png
@@ -179,26 +202,84 @@
 share/doc/qtcreator/images/completion/var.png
 share/doc/qtcreator/images/completion/var_priv.png
 share/doc/qtcreator/images/completion/var_prot.png
+share/doc/qtcreator/images/qmldesigner-anchor-fill-screen.png
+share/doc/qtcreator/images/qmldesigner-application-output.png
+share/doc/qtcreator/images/qmldesigner-borderimage.png
+share/doc/qtcreator/images/qmldesigner-button.png
+share/doc/qtcreator/images/qmldesigner-center-in.png
+share/doc/qtcreator/images/qmldesigner-code-completion.png
+share/doc/qtcreator/images/qmldesigner-debugging-simultaneous.png
+share/doc/qtcreator/images/qmldesigner-helloworld-base-state.png
+share/doc/qtcreator/images/qmldesigner-helloworld-edited.png
+share/doc/qtcreator/images/qmldesigner-helloworld-screen-size.png
+share/doc/qtcreator/images/qmldesigner-helloworld-state1.png
+share/doc/qtcreator/images/qmldesigner-helloworld-widget-add.png
+share/doc/qtcreator/images/qmldesigner-helloworld-widget-edit.png
+share/doc/qtcreator/images/qmldesigner-helloworld.png
+share/doc/qtcreator/images/qmldesigner-inspector-add-watch.png
+share/doc/qtcreator/images/qmldesigner-inspector-watchers.png
+share/doc/qtcreator/images/qmldesigner-inspector.png
+share/doc/qtcreator/images/qmldesigner-new-project-contents.png
+share/doc/qtcreator/images/qmldesigner-new-project-location.png
+share/doc/qtcreator/images/qmldesigner-new-project-summary.png
+share/doc/qtcreator/images/qmldesigner-new-project.png
+share/doc/qtcreator/images/qmldesigner-run-custom-exe.png
+share/doc/qtcreator/images/qmldesigner-run-settings.png
+share/doc/qtcreator/images/qmldesigner-visual-editor.png
+share/doc/qtcreator/images/qt-creator-app_manager_screenshot1.png
+share/doc/qtcreator/images/qt-creator-app_manager_screenshot2.png
 share/doc/qtcreator/images/qt-logo.png
+share/doc/qtcreator/images/qt-simulator.png
 share/doc/qtcreator/images/qtcreator-add-resource-wizard.png
 share/doc/qtcreator/images/qtcreator-add-resource-wizard2.png
+share/doc/qtcreator/images/qtcreator-add-resource-wizard3.png
 share/doc/qtcreator/images/qtcreator-add-resource.png
+share/doc/qtcreator/images/qtcreator-app-manager-extras-devel-screenshot.png
+share/doc/qtcreator/images/qtcreator-app-manager-screenshot.png
+share/doc/qtcreator/images/qtcreator-app-manager-sdk-screenshot.png
 share/doc/qtcreator/images/qtcreator-application-output.png
+share/doc/qtcreator/images/qtcreator-back.png
+share/doc/qtcreator/images/qtcreator-batteryindicator-screenshot.png
+share/doc/qtcreator/images/qtcreator-blockhighlighting.png
 share/doc/qtcreator/images/qtcreator-breakdown.png
+share/doc/qtcreator/images/qtcreator-build-dependencies.png
 share/doc/qtcreator/images/qtcreator-build-issues.png
+share/doc/qtcreator/images/qtcreator-build-steps.png
 share/doc/qtcreator/images/qtcreator-class-info.png
+share/doc/qtcreator/images/qtcreator-clean-steps.png
+share/doc/qtcreator/images/qtcreator-clear.png
+share/doc/qtcreator/images/qtcreator-closesidebar.png
 share/doc/qtcreator/images/qtcreator-cmake-build-settings.png
 share/doc/qtcreator/images/qtcreator-cmake-import-wizard1.png
 share/doc/qtcreator/images/qtcreator-cmake-import-wizard2.png
+share/doc/qtcreator/images/qtcreator-cmakeexecutable.png
+share/doc/qtcreator/images/qtcreator-codecompletion.png
 share/doc/qtcreator/images/qtcreator-compile-pane.png
 share/doc/qtcreator/images/qtcreator-context-sensitive-help.png
+share/doc/qtcreator/images/qtcreator-custom-project-wizards.png
+share/doc/qtcreator/images/qtcreator-debug-breakpoints.png
 share/doc/qtcreator/images/qtcreator-debug-mode.png
 share/doc/qtcreator/images/qtcreator-debug-stack.png
 share/doc/qtcreator/images/qtcreator-debug-view.png
+share/doc/qtcreator/images/qtcreator-debugger-views.png
 share/doc/qtcreator/images/qtcreator-debugging-buttons.png
+share/doc/qtcreator/images/qtcreator-editor-casesensitive.png
+share/doc/qtcreator/images/qtcreator-editor-regularexpressions.png
+share/doc/qtcreator/images/qtcreator-editor-settings.png
+share/doc/qtcreator/images/qtcreator-editor-wholewords.png
+share/doc/qtcreator/images/qtcreator-editortoolbar-symbols.png
+share/doc/qtcreator/images/qtcreator-expand.png
+share/doc/qtcreator/images/qtcreator-filter.png
 share/doc/qtcreator/images/qtcreator-find-in-files.png
 share/doc/qtcreator/images/qtcreator-formedit.png
+share/doc/qtcreator/images/qtcreator-forward.png
+share/doc/qtcreator/images/qtcreator-gs-build-example-open.png
+share/doc/qtcreator/images/qtcreator-gs-build-example-select-qs.png
+share/doc/qtcreator/images/qtcreator-gs-build-example-targets.png
+share/doc/qtcreator/images/qtcreator-help-filter-attributes.png
+share/doc/qtcreator/images/qtcreator-help-filters.png
 share/doc/qtcreator/images/qtcreator-intro-and-location.png
+share/doc/qtcreator/images/qtcreator-linux-add.png
 share/doc/qtcreator/images/qtcreator-locator-classes.png
 share/doc/qtcreator/images/qtcreator-locator-current-project.png
 share/doc/qtcreator/images/qtcreator-locator-customize.png
@@ -208,47 +289,100 @@
 share/doc/qtcreator/images/qtcreator-locator-line.png
 share/doc/qtcreator/images/qtcreator-locator-magnify.png
 share/doc/qtcreator/images/qtcreator-locator-methods.png
+share/doc/qtcreator/images/qtcreator-locator-open.png
 share/doc/qtcreator/images/qtcreator-locator-opendocs.png
 share/doc/qtcreator/images/qtcreator-locator-symbols.png
 share/doc/qtcreator/images/qtcreator-locator.png
+share/doc/qtcreator/images/qtcreator-macosx-add.png
+share/doc/qtcreator/images/qtcreator-mad-developer-screenshot.png
+share/doc/qtcreator/images/qtcreator-maemo-deb-package.png
+share/doc/qtcreator/images/qtcreator-maemo-emulator-button.png
+share/doc/qtcreator/images/qtcreator-maemo-emulator-connection-key.png
+share/doc/qtcreator/images/qtcreator-maemo-emulator-connection.png
+share/doc/qtcreator/images/qtcreator-mobile-class-info.png
+share/doc/qtcreator/images/qtcreator-mobile-intro-and-location.png
+share/doc/qtcreator/images/qtcreator-mobile-project-contents.png
+share/doc/qtcreator/images/qtcreator-mobile-project-qt-versions.png
+share/doc/qtcreator/images/qtcreator-mobile-project-summary.png
+share/doc/qtcreator/images/qtcreator-mobile-project-widgets.png
+share/doc/qtcreator/images/qtcreator-mobile-simulated.png
+share/doc/qtcreator/images/qtcreator-movestep.png
 share/doc/qtcreator/images/qtcreator-navigate-customfilter.png
 share/doc/qtcreator/images/qtcreator-navigate-popup.png
+share/doc/qtcreator/images/qtcreator-new-mobile-project.png
+share/doc/qtcreator/images/qtcreator-new-project-qt-versions.png
 share/doc/qtcreator/images/qtcreator-new-project-summary.png
 share/doc/qtcreator/images/qtcreator-new-project.png
+share/doc/qtcreator/images/qtcreator-next.png
+share/doc/qtcreator/images/qtcreator-overview.png
 share/doc/qtcreator/images/qtcreator-ppbuildsettings.png
 share/doc/qtcreator/images/qtcreator-ppbuildsettings_orig.png
 share/doc/qtcreator/images/qtcreator-pprunsettings.png
 share/doc/qtcreator/images/qtcreator-pprunsettings_orig.png
+share/doc/qtcreator/images/qtcreator-previous.png
 share/doc/qtcreator/images/qtcreator-projectpane.png
 share/doc/qtcreator/images/qtcreator-projectpane_orig.png
-share/doc/qtcreator/images/qtcreator-qt4-s60sdks.png
-share/doc/qtcreator/images/qtcreator-qt4-qtversions.png
-share/doc/qtcreator/images/qtcreator-qt4-qtversions-win-symbian.png
+share/doc/qtcreator/images/qtcreator-qt4-addbutton.png
 share/doc/qtcreator/images/qtcreator-qt4-qtversions-win-mingw.png
 share/doc/qtcreator/images/qtcreator-qt4-qtversions-win-msvc.png
-share/doc/qtcreator/images/qtcreator-welcome-session.png
+share/doc/qtcreator/images/qtcreator-qt4-qtversions-win-symbian.png
+share/doc/qtcreator/images/qtcreator-qt4-qtversions.png
+share/doc/qtcreator/images/qtcreator-qt4-s60sdks.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-add-target.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-device-connected.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-device-notconnected.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-runsettings.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-select-symbian-device.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-signing.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-target-added.png
+share/doc/qtcreator/images/qtcreator-qt4-symbian-target-tabs.png
+share/doc/qtcreator/images/qtcreator-refactoring-find.png
+share/doc/qtcreator/images/qtcreator-refactoring-replace.png
 share/doc/qtcreator/images/qtcreator-run.png
+share/doc/qtcreator/images/qtcreator-screenshot-build-settings.png
+share/doc/qtcreator/images/qtcreator-screenshot-devconf.png
+share/doc/qtcreator/images/qtcreator-screenshot-run-settings.png
+share/doc/qtcreator/images/qtcreator-screenshot-toolchain.png
 share/doc/qtcreator/images/qtcreator-screenshots.png
+share/doc/qtcreator/images/qtcreator-search-allprojects.png
 share/doc/qtcreator/images/qtcreator-search-pane.png
+share/doc/qtcreator/images/qtcreator-searchresults.png
 share/doc/qtcreator/images/qtcreator-select-modules.png
+share/doc/qtcreator/images/qtcreator-semanticerror.png
+share/doc/qtcreator/images/qtcreator-serverbutton.png
 share/doc/qtcreator/images/qtcreator-session-manager.png
 share/doc/qtcreator/images/qtcreator-session-menu.png
 share/doc/qtcreator/images/qtcreator-setting-breakpoint1.png
 share/doc/qtcreator/images/qtcreator-setting-breakpoint2.png
+share/doc/qtcreator/images/qtcreator-sidebar.png
+share/doc/qtcreator/images/qtcreator-splitbar.png
+share/doc/qtcreator/images/qtcreator-spliteditorview.png
+share/doc/qtcreator/images/qtcreator-ssh-key-configuration.png
 share/doc/qtcreator/images/qtcreator-symbian-add-buildconfiguration.png
 share/doc/qtcreator/images/qtcreator-symbian-add-run-in-emulator.png
 share/doc/qtcreator/images/qtcreator-symbian-add-runconfiguration.png
 share/doc/qtcreator/images/qtcreator-symbian-change-buildconfiguration.png
-share/doc/qtcreator/images/qtcreator-symbian-change-runconfiguration.png
 share/doc/qtcreator/images/qtcreator-symbian-change-run-in-emulator.png
+share/doc/qtcreator/images/qtcreator-symbian-change-runconfiguration.png
 share/doc/qtcreator/images/qtcreator-symbian-details-runconfiguration.png
+share/doc/qtcreator/images/qtcreator-symbian-run-settings.png
+share/doc/qtcreator/images/qtcreator-synchronizefocus.png
+share/doc/qtcreator/images/qtcreator-syntaxerror.png
+share/doc/qtcreator/images/qtcreator-target-remove.png
 share/doc/qtcreator/images/qtcreator-task-list.png
+share/doc/qtcreator/images/qtcreator-texfinder-filter.png
+share/doc/qtcreator/images/qtcreator-texfinder-ui-horizontal-layout.png
 share/doc/qtcreator/images/qtcreator-texteditor-behavior.png
 share/doc/qtcreator/images/qtcreator-texteditor-completion.png
 share/doc/qtcreator/images/qtcreator-texteditor-display.png
 share/doc/qtcreator/images/qtcreator-texteditor-fonts.png
+share/doc/qtcreator/images/qtcreator-textfinder-contents.png
+share/doc/qtcreator/images/qtcreator-textfinder-objectname.png
 share/doc/qtcreator/images/qtcreator-textfinder-screenshot.png
+share/doc/qtcreator/images/qtcreator-textfinder-ui-widgets.png
 share/doc/qtcreator/images/qtcreator-textfinder-ui.png
+share/doc/qtcreator/images/qtcreator-togglebookmark.png
+share/doc/qtcreator/images/qtcreator-togglebutton.png
 share/doc/qtcreator/images/qtcreator-vcs-annotate.png
 share/doc/qtcreator/images/qtcreator-vcs-commit.png
 share/doc/qtcreator/images/qtcreator-vcs-describe.png
@@ -257,11 +391,68 @@
 share/doc/qtcreator/images/qtcreator-vcs-log.png
 share/doc/qtcreator/images/qtcreator-vcs-pane.png
 share/doc/qtcreator/images/qtcreator-watcher.png
+share/doc/qtcreator/images/qtcreator-welcome-session.png
+share/doc/qtcreator/images/qtcreator-win-usb-network1.png
+share/doc/qtcreator/images/qtcreator-win-usb-network2.png
+share/doc/qtcreator/images/qtcreator-win-usb-network3.png
+share/doc/qtcreator/images/qtcreator-windows-add.png
 share/doc/qtcreator/images/qtcreator.png
+share/doc/qtcreator/images/remotecompiler-fn-logon.png
+share/doc/qtcreator/qt-defines.qdocconf
+share/doc/qtcreator/qt-html-templates.qdocconf
 share/doc/qtcreator/qt.index
+share/doc/qtcreator/qtcreator-online.qdocconf
 share/doc/qtcreator/qtcreator.qdoc
 share/doc/qtcreator/qtcreator.qdocconf
 share/doc/qtcreator/runframework.dia
+share/doc/qtcreator/templates/images/api_examples.png
+share/doc/qtcreator/templates/images/api_lookup.png
+share/doc/qtcreator/templates/images/api_topics.png
+share/doc/qtcreator/templates/images/arrow_down.png
+share/doc/qtcreator/templates/images/bg_l.png
+share/doc/qtcreator/templates/images/bg_l_blank.png
+share/doc/qtcreator/templates/images/bg_ll.png
+share/doc/qtcreator/templates/images/bg_ll_blank.png
+share/doc/qtcreator/templates/images/bg_lr.png
+share/doc/qtcreator/templates/images/bg_r.png
+share/doc/qtcreator/templates/images/bg_ul.png
+share/doc/qtcreator/templates/images/bg_ul_blank.png
+share/doc/qtcreator/templates/images/bg_ur.png
+share/doc/qtcreator/templates/images/bg_ur_blank.png
+share/doc/qtcreator/templates/images/box_bg.png
+share/doc/qtcreator/templates/images/breadcrumb.png
+share/doc/qtcreator/templates/images/bullet_dn.png
+share/doc/qtcreator/templates/images/bullet_gt.png
+share/doc/qtcreator/templates/images/bullet_sq.png
+share/doc/qtcreator/templates/images/bullet_up.png
+share/doc/qtcreator/templates/images/content_bg.png
+share/doc/qtcreator/templates/images/feedbackground.png
+share/doc/qtcreator/templates/images/form_bg.png
+share/doc/qtcreator/templates/images/header.png
+share/doc/qtcreator/templates/images/header_bg.png
+share/doc/qtcreator/templates/images/horBar.png
+share/doc/qtcreator/templates/images/page.png
+share/doc/qtcreator/templates/images/page_bg.png
+share/doc/qtcreator/templates/images/print.png
+share/doc/qtcreator/templates/images/qt_guide.png
+share/doc/qtcreator/templates/images/qt_icon.png
+share/doc/qtcreator/templates/images/qt_ref_doc.png
+share/doc/qtcreator/templates/images/qt_tools.png
+share/doc/qtcreator/templates/images/sep.png
+share/doc/qtcreator/templates/images/spinner.gif
+share/doc/qtcreator/templates/images/sprites-combined.png
+share/doc/qtcreator/templates/scripts/functions.js
+share/doc/qtcreator/templates/scripts/jquery.js
+share/doc/qtcreator/templates/scripts/narrow.js
+share/doc/qtcreator/templates/scripts/superfish.js
+share/doc/qtcreator/templates/style/OfflineStyle.css
+share/doc/qtcreator/templates/style/narrow.css
+share/doc/qtcreator/templates/style/style.css
+share/doc/qtcreator/templates/style/style_ie6.css
+share/doc/qtcreator/templates/style/style_ie7.css
+share/doc/qtcreator/templates/style/style_ie8.css
+share/doc/qtcreator/templates/style/superfish.css
+share/doc/qtcreator/templates/style/superfish_skin.css
 share/qtcreator/Makefile.static
 share/qtcreator/designer/templates.xml
 share/qtcreator/designer/templates/Dialog_with_Buttons_Bottom.ui
@@ -271,12 +462,157 @@
 share/qtcreator/designer/templates/Widget.ui
 share/qtcreator/gdbmacros/LGPL_EXCEPTION.TXT
 share/qtcreator/gdbmacros/LICENSE.LGPL
+share/qtcreator/gdbmacros/dumper.py
 share/qtcreator/gdbmacros/gdbmacros.cpp
 share/qtcreator/gdbmacros/gdbmacros.h
-share/qtcreator/gdbmacros/gdbmacros_p.h
 share/qtcreator/gdbmacros/gdbmacros.pro
+share/qtcreator/gdbmacros/gdbmacros.py
+share/qtcreator/gdbmacros/gdbmacros_p.h
+share/qtcreator/gdbmacros/pdumper.py
 share/qtcreator/gdbmacros/test/dumpertest.pro
 share/qtcreator/gdbmacros/test/main.cpp
+share/qtcreator/patches/.gitattributes
+share/qtcreator/patches/README
+share/qtcreator/patches/gdb-increased-dcache-line-size.patch
+share/qtcreator/patches/gdb-stepping-for-maemo.patch
+share/qtcreator/patches/gdb-without-dwarf-name-canonicalization.patch
+share/qtcreator/patches/gdb-work-around-trk-single-step.patch
+share/qtcreator/qml-type-descriptions/qml-builtin-types.xml
+share/qtcreator/qml-type-descriptions/qmlproject-types.xml
+share/qtcreator/qml-type-descriptions/qmlruntime-types.xml
+share/qtcreator/qmldesigner/Button.qml
+share/qtcreator/qmldesigner/gradient.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentHorizontalButtons.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/AlignmentVerticalButtons.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/AnchorButtons.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/BorderImageSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/CheckBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ColorGroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ColorLabel.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ColorScheme.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ColorTypeButtons.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ColumnSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ComboBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/DoubleSpinBoxAlternate.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ExpressionEditor.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Extended.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedFunctionButton.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedPane.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ExtendedSwitches.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/FlagedButton.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/FlickableSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/FlipableSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/FontComboBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/FontGroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/FontStyleButtons.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Geometry.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/GridSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/GroupBoxOption.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalLayout.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/HorizontalWhiteLine.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ImageSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/IntEditor.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ItemPane.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Label.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Layout.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/LayoutPane.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/LineEdit.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ListViewSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Modifiers.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/PlaceHolder.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/PropertyFrame.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleColorGroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/RectangleSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/RowSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/ScrollArea.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/SliderWidget.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/SpinBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextColorGroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/StandardTextGroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Switches.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/TextEditSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputGroupBox.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/TextInputSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/TextSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Transformation.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Type.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/VerticalLayout.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/Visibility.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/WebViewSpecifics.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbottom.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorbox.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorfill.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorhorizontal.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorleft.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorright.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorspacer.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchortop.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/anchorvertical.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/applybutton.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/aspectlock.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/cancelbutton.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/emptyPane.qml
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentbottom-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentcenterh-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentleft-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentmiddle-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmentright-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/alignmenttop-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/apply.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/behaivour.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/blended-image-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/bold-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/button.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/cancel.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/default-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/downArrow.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/expression.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/extended.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/grid-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_gradient.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_none.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/icon_color_solid.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/image-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/italic-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/item-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/layout.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/leftArrow.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/list-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/mouse-area-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/placeholder.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/rect-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/reset-button.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/rightArrow.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/standard.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/strikeout-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/submenu.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-edit-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/text-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-h-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/underline-icon.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/images/upArrow.png
+share/qtcreator/qmldesigner/propertyeditor/Qt/layoutWidget.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/propertyEditor.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/specialCheckBox.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonleft.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonmiddle.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/styledbuttonright.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/switch.css
+share/qtcreator/qmldesigner/propertyeditor/Qt/typeLabel.css
+share/qtcreator/qmldesigner/welcome-card.png
+share/qtcreator/qmldesigner/welcomescreen.qml
 share/qtcreator/runInTerminal.command
 share/qtcreator/schemes/MS_Visual_C++.kms
 share/qtcreator/schemes/Xcode.kms
@@ -288,37 +624,57 @@
 share/qtcreator/snippets/foreach.snp
 share/qtcreator/snippets/if.snp
 share/qtcreator/snippets/ifelse.snp
+share/qtcreator/snippets/qml.xml
 share/qtcreator/static.pro
-share/qtcreator/styles/fakevim.xml
-share/qtcreator/styles/grayscale.xml
+share/qtcreator/styles/darkvim.xml
 share/qtcreator/styles/default.xml
-share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_lib.pro
-share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.cpp
-share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
+share/qtcreator/styles/grayscale.xml
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.cpp
-share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h
+share/qtcreator/templates/qt4project/customwidgetwizard/tpl_collection.h
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_plugin.pro
-share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_resources.qrc
+share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.cpp
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_single.h
+share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.cpp
+share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget.h
 share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_include.pri
+share/qtcreator/templates/qt4project/customwidgetwizard/tpl_widget_lib.pro
 share/qtcreator/templates/qt4project/main.cpp
 share/qtcreator/templates/qt4project/mywidget.cpp
 share/qtcreator/templates/qt4project/mywidget.h
 share/qtcreator/templates/qt4project/mywidget_form.cpp
 share/qtcreator/templates/qt4project/mywidget_form.h
 share/qtcreator/templates/qt4project/widget.ui
+share/qtcreator/templates/wizards/README.txt
+share/qtcreator/templates/wizards/helloworld/console.png
+share/qtcreator/templates/wizards/helloworld/main.cpp
+share/qtcreator/templates/wizards/helloworld/project.pro
+share/qtcreator/templates/wizards/helloworld/wizard_sample.xml
+share/qtcreator/templates/wizards/listmodel/listmodel.cpp
+share/qtcreator/templates/wizards/listmodel/listmodel.h
+share/qtcreator/templates/wizards/listmodel/wizard_sample.xml
+share/qtcreator/templates/wizards/qml-extension/lib.png
+share/qtcreator/templates/wizards/qml-extension/object.cpp
+share/qtcreator/templates/wizards/qml-extension/object.h
+share/qtcreator/templates/wizards/qml-extension/plugin.cpp
+share/qtcreator/templates/wizards/qml-extension/plugin.h
+share/qtcreator/templates/wizards/qml-extension/project.pro
+share/qtcreator/templates/wizards/qml-extension/qmldir
+share/qtcreator/templates/wizards/qml-extension/wizard.xml
 share/qtcreator/translations/Makefile
 share/qtcreator/translations/README
+share/qtcreator/translations/check-ts.pl
+share/qtcreator/translations/check-ts.xq
+share/qtcreator/translations/extract-customwizards.xq
 share/qtcreator/translations/extract-mimetypes.xq
-share/qtcreator/translations/extract-mimetypes.xq.in
+share/qtcreator/translations/qtcreator_cs.qm
+share/qtcreator/translations/qtcreator_cs.ts
 share/qtcreator/translations/qtcreator_de.qm
 share/qtcreator/translations/qtcreator_de.ts
-share/qtcreator/translations/qtcreator_es.qm
 share/qtcreator/translations/qtcreator_es.ts
 share/qtcreator/translations/qtcreator_fr.qm
 share/qtcreator/translations/qtcreator_fr.ts
-share/qtcreator/translations/qtcreator_it.qm
+share/qtcreator/translations/qtcreator_hu.ts
 share/qtcreator/translations/qtcreator_it.ts
 share/qtcreator/translations/qtcreator_ja.qm
 share/qtcreator/translations/qtcreator_ja.ts
@@ -326,37 +682,52 @@
 share/qtcreator/translations/qtcreator_pl.ts
 share/qtcreator/translations/qtcreator_ru.qm
 share/qtcreator/translations/qtcreator_ru.ts
-share/qtcreator/translations/qtcreator_sl.qm
 share/qtcreator/translations/qtcreator_sl.ts
+share/qtcreator/translations/qtcreator_zh_CN.ts
 share/qtcreator/translations/translations.pro
 share/qtcreator/translations/translations.pro.bak
-@dirrm lib/qtcreator/plugins/Nokia
-@dirrm lib/qtcreator/plugins
-@dirrm lib/qtcreator
-@dirrm share/doc/qtcreator/api
-@dirrm share/doc/qtcreator/doxygen
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part1
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part2
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part3
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part4
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part5
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part6
-@dirrm share/doc/qtcreator/examples/addressbook-sdk/part7
-@dirrm share/doc/qtcreator/examples/addressbook-sdk
-@dirrm share/doc/qtcreator/examples/textfinder
-@dirrm share/doc/qtcreator/examples
-@dirrm share/doc/qtcreator/images/completion
-@dirrm share/doc/qtcreator/images
-@dirrm share/doc/qtcreator
-@dirrm share/qtcreator/designer/templates
-@dirrm share/qtcreator/designer
-@dirrm share/qtcreator/gdbmacros/test
-@dirrm share/qtcreator/gdbmacros
-@dirrm share/qtcreator/schemes
-@dirrm share/qtcreator/snippets
-@dirrm share/qtcreator/styles
+@dirrm share/qtcreator/translations
+@dirrm share/qtcreator/templates/wizards/qml-extension
+@dirrm share/qtcreator/templates/wizards/listmodel
+@dirrm share/qtcreator/templates/wizards/helloworld
+@dirrm share/qtcreator/templates/wizards
 @dirrm share/qtcreator/templates/qt4project/customwidgetwizard
 @dirrm share/qtcreator/templates/qt4project
 @dirrm share/qtcreator/templates
-@dirrm share/qtcreator/translations
+@dirrm share/qtcreator/styles
+@dirrm share/qtcreator/snippets
+@dirrm share/qtcreator/schemes
+@dirrm share/qtcreator/qmldesigner/propertyeditor/Qt/images
+@dirrm share/qtcreator/qmldesigner/propertyeditor/Qt
+@dirrm share/qtcreator/qmldesigner/propertyeditor
+@dirrm share/qtcreator/qmldesigner
+@dirrm share/qtcreator/qml-type-descriptions
+@dirrm share/qtcreator/patches
+@dirrm share/qtcreator/gdbmacros/test
+@dirrm share/qtcreator/gdbmacros
+@dirrm share/qtcreator/designer/templates
+@dirrm share/qtcreator/designer
 @dirrm share/qtcreator
+@dirrm share/doc/qtcreator/templates/style
+@dirrm share/doc/qtcreator/templates/scripts
+@dirrm share/doc/qtcreator/templates/images
+@dirrm share/doc/qtcreator/templates
+@dirrm share/doc/qtcreator/images/completion
+@dirrm share/doc/qtcreator/images
+@dirrm share/doc/qtcreator/examples/textfinder
+@dirrm share/doc/qtcreator/examples/batteryindicator
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part7
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part6
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part5
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part4
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part3
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part2
+@dirrm share/doc/qtcreator/examples/addressbook-sdk/part1
+@dirrm share/doc/qtcreator/examples/addressbook-sdk
+@dirrm share/doc/qtcreator/examples
+@dirrm share/doc/qtcreator/doxygen
+@dirrm share/doc/qtcreator/api
+@dirrm share/doc/qtcreator
+@dirrm lib/qtcreator/plugins/Nokia
+@dirrm lib/qtcreator/plugins
+@dirrm lib/qtcreator
Index: files/patch-src-plugins-qt4projectmanager-makestep.cpp
===================================================================
RCS file: /home/pcvs/ports/devel/qtcreator/files/patch-src-plugins-qt4projectmanager-makestep.cpp,v
retrieving revision 1.2
diff -u -r1.2 patch-src-plugins-qt4projectmanager-makestep.cpp
--- files/patch-src-plugins-qt4projectmanager-makestep.cpp	23 Mar 2010 17:09:07 -0000	1.2
+++ files/patch-src-plugins-qt4projectmanager-makestep.cpp	28 Nov 2010 21:21:21 -0000
@@ -1,13 +1,13 @@
---- src/plugins/qt4projectmanager/makestep.cpp.orig	2010-01-15 12:36:53.000000000 -0500
-+++ src/plugins/qt4projectmanager/makestep.cpp	2010-03-22 11:12:02.280703600 -0400
-@@ -106,8 +106,10 @@
-     if (toolchain)
-         type = toolchain->type();
-     if (type != ProjectExplorer::ToolChain::MSVC && type != ProjectExplorer::ToolChain::WINCE) {
+--- ./src/plugins/qt4projectmanager/makestep.cpp.orig	2010-08-24 11:46:09.000000000 +0400
++++ ./src/plugins/qt4projectmanager/makestep.cpp	2010-11-29 00:21:08.727128457 +0300
+@@ -163,8 +163,10 @@
+     if (toolchain) {
+         if (toolchain->type() != ProjectExplorer::ToolChain::MSVC &&
+             toolchain->type() != ProjectExplorer::ToolChain::WINCE) {
 +#ifndef Q_OS_FREEBSD
-         if (value(name, "makeCmd").toString().isEmpty())
-             args << "-w";
+             if (m_makeCmd.isEmpty())
+                 args << "-w";
 +#endif
+         }
      }
  
-     setEnabled(name, true);
Index: files/patch-src__libs__3rdparty__botan__src__src.pro
===================================================================
RCS file: files/patch-src__libs__3rdparty__botan__src__src.pro
diff -N files/patch-src__libs__3rdparty__botan__src__src.pro
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-src__libs__3rdparty__botan__src__src.pro	29 Nov 2010 00:50:09 -0000
@@ -0,0 +1,15 @@
+--- ./src/libs/3rdparty/botan/src/src.pro.orig	2010-08-24 11:46:09.000000000 +0400
++++ ./src/libs/3rdparty/botan/src/src.pro	2010-11-29 03:49:46.829707166 +0300
+@@ -564,10 +564,6 @@
+            timer/gettimeofday/tm_unix.cpp
+ }
+ 
+-linux*-g++* {
+-    SOURCES += timer/posix_rt/tm_posix.cpp
+-}
++SOURCES += timer/posix_rt/tm_posix.cpp
+ 
+-linux*-g++* {
+-    LIBS += -lrt
+-}
++LIBS += -lrt


>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201012012055.oB1KtnGq025603>