Merge branch '1.0.0' into master

Conflicts:
	src/plugins/debugger/gdbengine.cpp

scripts/shipping/prepare-linux-qt-for-shipping.sh

-#!/usr/bin/env bash
-
-version="4.5-rc1"
-workdir=/home/berlin/dev/qt-${version}-temp
-destdir=/home/berlin/dev/qt-${version}-shipping/qt  # "/qt" suffix for Bitrock
-dir=qt-x11-opensource-src-${version}
-file_tar="${dir}.tar"
-file_tar_gz="${file_tar}.gz"
-[ -z ${MAKE} ] && MAKE=make
-envpath=/usr/bin:/bin
-
-if gcc -dumpversion | grep '^4' ; then
-	# GCC 4.x machine
-	webkit=
-else
-	# GCC 3.3.5 machine
-	webkit='-no-webkit'
-fi
-
-
-die() {
-	echo $1 1>&2
-	exit 1
-}
-
-rand_range() {
-    incMin=$1
-    incMax=$2
-    echo $((RANDOM*(incMax-incMin+1)/32768+incMin))
-}
-
-
-setup() {
-	mkdir -p "${workdir}"
-	cd "${workdir}" || die "cd failed"
-}
-
-download() {
-	[ -f "${file_tar_gz}" ] && return
-	case `rand_range 1 2` in
-	1)
-		mirror=http://ftp.ntua.gr/pub/X11/Qt/qt/source
-		;;
-	*)
-		mirror=http://wftp.tu-chemnitz.de/pub/Qt/qt/source
-		;;
-	esac
-	wget "${mirror}/${file_tar_gz}" || die "Download failed"
-}
-
-unpack() {
-	[ -d "${dir}" ] && return
-	gzip -d "${file_tar_gz}" || die "gunzip failed"
-	tar -xf "${file_tar}" || die "untar failed"
-}
-
-build() {
-	(
-		cd "${dir}" || die "cd failed"
-		if [ ! -f config.status ] ; then
-			env -i PATH=${envpath} ./configure \
-				-prefix "${destdir}" \
-				-optimized-qmake \
-				-confirm-license \
-				\
-				-no-mmx -no-sse -no-sse2 -no-3dnow \
-				-release -fast \
-				${webkit} \
-				-qt-zlib -qt-gif -qt-libtiff -qt-libpng -qt-libmng -qt-libjpeg \
-				\
-				|| die "configure failed"
-		fi
-	
-		env -i PATH=${envpath} "${MAKE}" || die "make failed"
-	)
-	ret=$?; [ ${ret} = 0 ] || exit ${ret}
-}
-
-inst() {
-	(
-		cd "${dir}" || die "cd failed"
-		if [ ! -d "${destdir}" ]; then
-			mkdir -p "${destdir}"
-			env -i "${MAKE}" install || die "make install failed"
-		fi
-
-		# Fix rpath's
-		cd "${destdir}" || die "cd failed"
-		find bin -mindepth 1 -maxdepth 1 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../lib'
-		find lib -mindepth 1 -maxdepth 1 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN'
-		find . -mindepth 3 -maxdepth 3 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../lib'
-		find . -mindepth 4 -maxdepth 4 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../../lib'
-		find . -mindepth 5 -maxdepth 5 -type f -perm -100 | xargs -n 1 chrpath -r '$ORIGIN/../../../../lib'
-	)
-	ret=$?; [ ${ret} = 0 ] || exit ${ret}
-}
-
-main() {
-	(
-		setup
-		download
-		unpack
-		build
-		inst
-	)
-	ret=$?; [ ${ret} = 0 ] || exit ${ret}
-}
-
-main

share/qtcreator/schemes/MS_Visual_C++.kms

@@ -24,10 +24,10 @@
  <shortcut id="Debugger.AddToWatch" >
   <key value="Alt+D, Alt+W" />
  </shortcut>
- <shortcut id="QtCreator.Mode.GdbDebugger.Mode.Debug" >
+ <shortcut id="QtCreator.Mode.Debug" >
   <key value="Ctrl+3" />
  </shortcut>
- <shortcut id="Qt Script Editor.Run" >
+ <shortcut id="QtScriptEditor.Run" >
   <key value="" />
  </shortcut>
  <shortcut id="FindFilter.Files on Disk" >
@@ -168,19 +168,19 @@
  <shortcut id="QtCreator.RevertToSaved" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Windows" >
+ <shortcut id="FormEditor.Menu.Preview.Windows" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Motif" >
+ <shortcut id="FormEditor.Menu.Preview.Motif" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.CDE" >
+ <shortcut id="FormEditor.Menu.Preview.CDE" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Plastique" >
+ <shortcut id="FormEditor.Menu.Preview.Plastique" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Cleanlooks" >
+ <shortcut id="FormEditor.Menu.Preview.Cleanlooks" >
   <key value="" />
  </shortcut>
  <shortcut id="FormEditor.ViewCode" >
@@ -231,13 +231,13 @@
  <shortcut id="QtCreator.DocumentToNextGroup" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Output" >
+ <shortcut id="QtCreator.Mode.Output" >
   <key value="Ctrl+6" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Welcome" >
+ <shortcut id="QtCreator.Mode.Welcome" >
   <key value="Ctrl+1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Edit" >
+ <shortcut id="QtCreator.Mode.Edit" >
   <key value="Ctrl+2" />
  </shortcut>
  <shortcut id="Find.FindInCurrentDocument" >
@@ -264,7 +264,7 @@
  <shortcut id="Find.WholeWords" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.View.QuickOpen.ToolWindow" >
+ <shortcut id="QtCreator.QuickOpen" >
   <key value="Ctrl+D" />
  </shortcut>
  <shortcut id="Help.Home" >
@@ -291,7 +291,7 @@
  <shortcut id="Help.Context" >
   <key value="F1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.Help.HelpMode" >
+ <shortcut id="QtCreator.Mode.Help" >
   <key value="Ctrl+5" />
  </shortcut>
  <shortcut id="Help.IndexShortcut" >
@@ -306,7 +306,7 @@
  <shortcut id="TextEditor.CompleteThis" >
   <key value="Ctrl+Space" />
  </shortcut>
- <shortcut id="QtCreator.Mode.ProjectExplorer.Mode.Session" >
+ <shortcut id="QtCreator.Mode.Project" >
   <key value="Ctrl+4" />
  </shortcut>
  <shortcut id="ProjectExplorer.NewSession" >
@@ -387,10 +387,10 @@
  <shortcut id="Bookmarks.Next" >
   <key value="F2" />
  </shortcut>
- <shortcut id="Bookmarks.Previous.Document" >
+ <shortcut id="Bookmarks.PreviousDocument" >
   <key value="" />
  </shortcut>
- <shortcut id="Bookmarks.Next.Document" >
+ <shortcut id="Bookmarks.NextDocument" >
   <key value="" />
  </shortcut>
  <shortcut id="CppTools.SwitchHeaderSource" >
@@ -453,10 +453,10 @@
  <shortcut id="Perforce.Filelog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.SubmitCurrentLog" >
+ <shortcut id="Perforce.SubmitCurrentLog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.DiffSelectedFilesInLog" >
+ <shortcut id="Perforce.DiffSelectedFilesInLog" >
   <key value="" />
  </shortcut>
  <shortcut id="Debugger.StartExternal" >

share/qtcreator/schemes/Xcode.kms

@@ -114,13 +114,13 @@
  <shortcut id="QtCreator.DocumentToNextGroup" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Output" >
+ <shortcut id="QtCreator.Mode.Output" >
   <key value="Meta+6" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Welcome" >
+ <shortcut id="QtCreator.Mode.Welcome" >
   <key value="Meta+1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.QtCreator.Mode.Edit" >
+ <shortcut id="QtCreator.Mode.Edit" >
   <key value="Meta+2" />
  </shortcut>
  <shortcut id="Find.FindInCurrentDocument" >
@@ -150,13 +150,13 @@
  <shortcut id="Find.WholeWords" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.View.QuickOpen.ToolWindow" >
+ <shortcut id="QtCreator.QuickOpen" >
   <key value="Ctrl+Shift+D" />
  </shortcut>
  <shortcut id="TextEditor.CompleteThis" >
   <key value="Alt+Esc" />
  </shortcut>
- <shortcut id="QtCreator.Mode.ProjectExplorer.Mode.Session" >
+ <shortcut id="QtCreator.Mode.Project" >
   <key value="Meta+4" />
  </shortcut>
  <shortcut id="ProjectExplorer.NewSession" >
@@ -282,22 +282,22 @@
  <shortcut id="FormEditor.Preview" >
   <key value="Ctrl+Alt+R" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Windows" >
+ <shortcut id="FormEditor.Menu.Preview.Windows" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Motif" >
+ <shortcut id="FormEditor.Menu.Preview.Motif" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.CDE" >
+ <shortcut id="FormEditor.Menu.Preview.CDE" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Plastique" >
+ <shortcut id="FormEditor.Menu.Preview.Plastique" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Cleanlooks" >
+ <shortcut id="FormEditor.Menu.Preview.Cleanlooks" >
   <key value="" />
  </shortcut>
- <shortcut id="Formeditor.Menu.Preview.Macintosh (aqua)" >
+ <shortcut id="FormEditor.Menu.Preview.Macintosh (aqua)" >
   <key value="" />
  </shortcut>
  <shortcut id="FormEditor.FormSettings" >
@@ -369,7 +369,7 @@
  <shortcut id="Help.Context" >
   <key value="F1" />
  </shortcut>
- <shortcut id="QtCreator.Mode.Help.HelpMode" >
+ <shortcut id="QtCreator.Mode.Help" >
   <key value="Meta+5" />
  </shortcut>
  <shortcut id="Help.IndexShortcut" >
@@ -387,13 +387,13 @@
  <shortcut id="Qt4Builder.RunQMakeContextMenu" >
   <key value="" />
  </shortcut>
- <shortcut id="Qt Script Editor.Run" >
+ <shortcut id="QtScriptEditor.Run" >
   <key value="Ctrl+R" />
  </shortcut>
- <shortcut id="CodePaster.post" >
+ <shortcut id="CodePaster.Post" >
   <key value="Alt+C, Alt+P" />
  </shortcut>
- <shortcut id="CodePaster.fetch" >
+ <shortcut id="CodePaster.Fetch" >
   <key value="Alt+C, Alt+F" />
  </shortcut>
  <shortcut id="Debugger.StartExternal" >
@@ -456,7 +456,7 @@
  <shortcut id="Debugger.AddToWatch" >
   <key value="" />
  </shortcut>
- <shortcut id="QtCreator.Mode.Debugger.Mode.Debug" >
+ <shortcut id="QtCreator.Mode.Debug" >
   <key value="Meta+3" />
  </shortcut>
  <shortcut id="Perforce.Edit" >
@@ -504,10 +504,10 @@
  <shortcut id="Perforce.Filelog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.SubmitCurrentLog" >
+ <shortcut id="Perforce.SubmitCurrentLog" >
   <key value="" />
  </shortcut>
- <shortcut id="Nokia.Perforce.DiffSelectedFilesInLog" >
+ <shortcut id="Perforce.DiffSelectedFilesInLog" >
   <key value="" />
  </shortcut>
  <shortcut id="Bookmarks.Toggle" >
@@ -525,10 +525,10 @@
  <shortcut id="Bookmarks.Next" >
   <key value="Meta+." />
  </shortcut>
- <shortcut id="Bookmarks.Previous.Document" >
+ <shortcut id="Bookmarks.PreviousDocument" >
   <key value="" />
  </shortcut>
- <shortcut id="Bookmarks.Next.Document" >
+ <shortcut id="Bookmarks.NextDocument" >
   <key value="" />
  </shortcut>
  <shortcut id="TextEditor.SelectEncoding" >

share/share.pri

@@ -9,11 +9,9 @@ macx {
     SCHEMES.files = $$PWD/qtcreator/schemes
     GDBDEBUGGER.path = Contents/Resources
     GDBDEBUGGER.files = $$PWD/qtcreator/gdbmacros
-    LICENSE.path = Contents/Resources
-    LICENSE.files = $$PWD/qtcreator/license.txt
     RUNINTERMINAL.path = Contents/Resources
     RUNINTERMINAL.files = $$PWD/qtcreator/runInTerminal.command
-    QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER LICENSE RUNINTERMINAL
+    QMAKE_BUNDLE_DATA += SNIPPETS TEMPLATES DESIGNER SCHEMES GDBDEBUGGER RUNINTERMINAL
     QMAKE_INFO_PLIST = $$PWD/qtcreator/Info.plist
 }
 
@@ -43,9 +41,6 @@ win32|linux-* {
 }
 
 linux-* {
-    licenses.files          += $$PWD/qtcreator/license.txt
-    licenses.path            = /share/qtcreator
-
     keymaps.files           += $$PWD/qtcreator/schemes/MS_Visual_C++.kms
     keymaps.files           += $$PWD/qtcreator/schemes/Xcode.kms
     keymaps.path             = /share/qtcreator/schemes
@@ -71,7 +66,6 @@ linux-* {
     projecttemplates.path    = /share/qtcreator/templates/qt4project
 
     INSTALLS += \
-       licenses \
        keymaps \
        gdbsupport \
        designertemplates \

src/libs/utils/projectintropage.ui

@@ -70,7 +70,7 @@
         <item row="1" column="0">
          <widget class="QLabel" name="pathLabel">
           <property name="text">
-           <string>Path:</string>
+           <string>Create in:</string>
           </property>
          </widget>
         </item>

src/plugins/bookmarks/bookmarks_global.h

@@ -42,10 +42,10 @@ const char * const BOOKMARKS_MOVEUP_ACTION      = "Bookmarks.MoveUp";
 const char * const BOOKMARKS_MOVEDOWN_ACTION    = "Bookmarks.MoveDown";
 const char * const BOOKMARKS_PREV_ACTION        = "Bookmarks.Previous";
 const char * const BOOKMARKS_NEXT_ACTION        = "Bookmarks.Next";
-const char * const BOOKMARKS_PREVDIR_ACTION     = "Bookmarks.Previous.Directory";
-const char * const BOOKMARKS_NEXTDIR_ACTION     = "Bookmarks.Next.Directory";
-const char * const BOOKMARKS_PREVDOC_ACTION     = "Bookmarks.Previous.Document";
-const char * const BOOKMARKS_NEXTDOC_ACTION     = "Bookmarks.Next.Document";
+const char * const BOOKMARKS_PREVDIR_ACTION     = "Bookmarks.PreviousDirectory";
+const char * const BOOKMARKS_NEXTDIR_ACTION     = "Bookmarks.NextDirectory";
+const char * const BOOKMARKS_PREVDOC_ACTION     = "Bookmarks.PreviousDocument";
+const char * const BOOKMARKS_NEXTDOC_ACTION     = "Bookmarks.NextDocument";
 
 const char * const BOOKMARKS_MENU               = "Bookmarks.Menu";
 const char * const BOOKMARKS_CONTEXT            = "Bookmarks";

src/plugins/cmakeprojectmanager/cmakeprojectmanager.h

@@ -71,14 +71,14 @@ class CMakeRunner
 {
 public:
     CMakeRunner();
-    void run(QFutureInterface<void> &fi);
     void setExecutable(const QString &executable);
     QString executable() const;
     QString version() const;
     bool supportsQtCreator() const;
-    void waitForUpToDate() const;
 
 private:
+    void run(QFutureInterface<void> &fi);
+    void waitForUpToDate() const;
     QString m_executable;
     QString m_version;
     bool m_supportsQtCreator;

src/plugins/coreplugin/coreconstants.h

@@ -63,9 +63,9 @@ const char * const IDE_REVISION_STR      = "";
 #undef STRINGIFY_INTERNAL
 
 //modes
-const char * const MODE_WELCOME          = "QtCreator.Mode.Welcome";
-const char * const MODE_EDIT             = "QtCreator.Mode.Edit";
-const char * const MODE_OUTPUT           = "QtCreator.Mode.Output";
+const char * const MODE_WELCOME          = "Welcome";
+const char * const MODE_EDIT             = "Edit";
+const char * const MODE_OUTPUT           = "Output";
 const int          P_MODE_WELCOME        = 100;
 const int          P_MODE_EDIT           = 90;
 const int          P_MODE_OUTPUT         = 10;

src/plugins/coreplugin/html/qt.css

@@ -231,6 +231,7 @@ Layout TOP - Logo und Welcome Text
 	
 	float:left;
 	width:210px;
+	padding-top:70px;
 		
 	}
 

src/plugins/coreplugin/mainwindow.cpp

@@ -150,7 +150,9 @@ MainWindow::MainWindow() :
     OutputPaneManager::create();
 
     setWindowTitle(tr("Qt Creator"));
+#ifndef Q_OS_MAC
     qApp->setWindowIcon(QIcon(":/core/images/qtcreator_logo_128.png"));
+#endif
     QCoreApplication::setApplicationName(QLatin1String("QtCreator"));
     QCoreApplication::setApplicationVersion(QLatin1String(Core::Constants::IDE_VERSION_LONG));
     QCoreApplication::setOrganizationName(QLatin1String("Nokia"));
@@ -311,7 +313,7 @@ bool MainWindow::init(QString *errorMessage)
     // Add widget to the bottom, we create the view here instead of inside the
     // OutputPaneManager, since the ViewManager needs to be initilized before
     m_outputView = new Core::BaseView;
-    m_outputView->setUniqueViewName("OutputWindow.Buttons");
+    m_outputView->setUniqueViewName("OutputWindow");
     m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
     m_outputView->setDefaultPosition(Core::IView::Second);
     pm->addObject(m_outputView);

src/plugins/coreplugin/navigationwidget.cpp

@@ -326,7 +326,7 @@ void NavigationWidget::objectAdded(QObject * obj)
     QShortcut *shortcut = new QShortcut(this);
     shortcut->setWhatsThis(tr("Activate %1 Pane").arg(displayName));
     Core::Command *cmd = am->registerShortcut(shortcut,
-        displayName + QLatin1String(".FocusShortcut"), navicontext);
+        QLatin1String("QtCreator.Sidebar.") + displayName, navicontext);
     cmd->setDefaultKeySequence(factory->activationSequence());
     connect(shortcut, SIGNAL(activated()), this, SLOT(activateSubWidget()));