Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta

7 files changed, 17 insertions, 7 deletions

diff --git a/doc/qtcreator-add-resource-wizard.png b/doc/qtcreator-add-resource-wizard.png
index 92c21e5b54..1a1ceb62e6 100644
--- a/doc/qtcreator-add-resource-wizard.png
+++ b/doc/qtcreator-add-resource-wizard.png
diff --git a/doc/qtcreator-add-resource-wizard2.png b/doc/qtcreator-add-resource-wizard2.png
new file mode 100644
index 0000000000..74569996fe
--- /dev/null
+++ b/doc/qtcreator-add-resource-wizard2.png
diff --git a/doc/qtcreator-add-resource.png b/doc/qtcreator-add-resource.png
index 8a068987f1..036ff91548 100644
--- a/doc/qtcreator-add-resource.png
+++ b/doc/qtcreator-add-resource.png
diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch
index 1e94462e89..7611ef0f79 100644
--- a/doc/qtcreator.qch
+++ b/doc/qtcreator.qch
diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc
index 7d8f5d657d..73efc0ed62 100644
--- a/doc/qtcreator.qdoc
+++ b/doc/qtcreator.qdoc
@@ -5,13 +5,13 @@
 
     \title Qt Creator Manual
 
-    \section1 Version 0.9 - Technical Preview
+    \section1 Version 0.9.1 (Beta)
 
     The goal of Qt Creator is to provide a cross-platform, complete Integrated
     Development Environment (IDE) to develop Qt projects. It is available for
     the Linux, Mac OS X and Windows platforms.
 
-    \note Qt Creator is currently released as a Technical Preview. It is
+    \note The current version of Qt Creator is 0.9.1 (Beta). It is
     possible to edit source code, compile, run and debug applications; other
     features are still under development. Please send bug reports and
     suggestions to qt-creator@trolltech.com. To subscribe, send a
@@ -55,7 +55,7 @@
        \o \l{Debugging with Qt Creator}
        \o \l{Tips and Tricks}
        \o \l{Glossary}
-       \o \l{Known Issues of Version 0.9 (Technical Preview)}
+       \o \l{Known Issues of Version 0.9.1 (Beta)}
     \endlist
 
 */
@@ -515,7 +515,14 @@
     \image qtcreator-add-resource-wizard.png
 
     Enter "textfinder" in the \gui{Name} field and use the given \gui{Path}.
-    Then, click \gui{Done}.
+    Then, click \gui{Continue}.
+
+    \image qtcreator-add-resource-wizard2.png
+
+    On this page you can choose to which project you want to add the new file.
+    Make sure that \gui{Add to Project} is checked and
+    "TextFinder" is selected as the \gui{Project}, and click
+    \gui{Done}.
 
     Your resource file will now be displayed with the Resource Editor. Click
     on the \gui{Add} drop down box and select \gui{Add Prefix}. The prefix we
@@ -1151,9 +1158,9 @@
     \previouspage creator-keyboard-shortcuts.html
     \page creator-known-issues.html
 
-    \title Known Issues of Version 0.9 (Technical Preview)
+    \title Known Issues of Version 0.9.1 (Beta)
 
-    There are some known issues with the Technical Preview.
+    There are some known issues with Qt Creator 0.9.1 (Beta).
     The development team is aware of those, there is no need to report them as bug.
 
     \list
diff --git a/src/app/app.pro b/src/app/app.pro
index 2cb354da49..52e53003f3 100644
--- a/src/app/app.pro
+++ b/src/app/app.pro
@@ -13,13 +13,15 @@ win32 {
 }
 linux-* {
     LIBS *= -lExtensionSystem -lAggregation
-    QMAKE_LFLAGS+=-Wl,--enable-new-dtags
+    QT += svg dbus
+
 }
 
 TEMPLATE = app
 TARGET = $$IDE_APP_TARGET
 DESTDIR = ../../bin
 
+
 SOURCES += main.cpp
 
 macx {
diff --git a/src/app/main.cpp b/src/app/main.cpp
index eedc9e1365..b8d4b9d4b4 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -283,3 +283,4 @@ int main(int argc, char **argv)
     QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
     return app.exec();
 }
+