diff options
| author | Kavindra Palaraja <kavindra.palaraja@nokia.com> | 2008-12-16 13:21:46 +0100 |
|---|---|---|
| committer | Kavindra Palaraja <kavindra.palaraja@nokia.com> | 2008-12-16 13:21:46 +0100 |
| commit | f07394a39d6712752fa6477a0418be8471d119ba (patch) | |
| tree | a28d6e65c8d65451a7836b9721829e3c6294c3a7 | |
| parent | 7ba7d2850f6540e44e4ac165b29f5e50997676af (diff) | |
| parent | fef59aa446074e92295051b978fdfdcaff8af5e2 (diff) | |
Merge branch '0.9.1-beta' of git@scm.dev.nokia.troll.no:creator/mainline into 0.9.1-beta
| -rw-r--r-- | doc/qtcreator-class-info.png | bin | 35255 -> 48976 bytes | |||
| -rw-r--r-- | doc/qtcreator-intro-and-location.png | bin | 32434 -> 44466 bytes | |||
| -rw-r--r-- | doc/qtcreator-new-project-summary.png | bin | 0 -> 45014 bytes | |||
| -rw-r--r-- | doc/qtcreator-new-project.png | bin | 14065 -> 32196 bytes | |||
| -rw-r--r-- | doc/qtcreator-select-modules.png | bin | 45128 -> 59347 bytes | |||
| -rw-r--r-- | doc/qtcreator.qch | bin | 2407424 -> 2617344 bytes | |||
| -rw-r--r-- | doc/qtcreator.qdoc | 10 | ||||
| -rw-r--r-- | src/app/app.pro | 2 | ||||
| -rw-r--r-- | src/app/main.cpp | 1 |
9 files changed, 9 insertions, 4 deletions
diff --git a/doc/qtcreator-class-info.png b/doc/qtcreator-class-info.png Binary files differindex 757eb12856..a005239707 100644 --- a/doc/qtcreator-class-info.png +++ b/doc/qtcreator-class-info.png diff --git a/doc/qtcreator-intro-and-location.png b/doc/qtcreator-intro-and-location.png Binary files differindex e0d8c9f150..f03e4fb6a4 100644 --- a/doc/qtcreator-intro-and-location.png +++ b/doc/qtcreator-intro-and-location.png diff --git a/doc/qtcreator-new-project-summary.png b/doc/qtcreator-new-project-summary.png Binary files differnew file mode 100644 index 0000000000..05e1cf2e0d --- /dev/null +++ b/doc/qtcreator-new-project-summary.png diff --git a/doc/qtcreator-new-project.png b/doc/qtcreator-new-project.png Binary files differindex 6f7832e5cb..f6c186206e 100644 --- a/doc/qtcreator-new-project.png +++ b/doc/qtcreator-new-project.png diff --git a/doc/qtcreator-select-modules.png b/doc/qtcreator-select-modules.png Binary files differindex b5b2ead006..313934ec97 100644 --- a/doc/qtcreator-select-modules.png +++ b/doc/qtcreator-select-modules.png diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch Binary files differindex 1245104481..1e94462e89 100644 --- a/doc/qtcreator.qch +++ b/doc/qtcreator.qch diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index f95b58d58f..e4bbfa7517 100644 --- a/doc/qtcreator.qdoc +++ b/doc/qtcreator.qdoc @@ -318,12 +318,18 @@ \i \inlineimage qtcreator-class-info.png \i \bold{Specifying Class Information} - Lastly, specify the name of the class you would like to create. The + Specify the name of the class you would like to create. The \e{Header file}, \e{Source file} and \e{Form file} fields will update automatically according to your choice of class name. You also have to select the base class for your class, either a - QWidget, QDialog or QMainWindow, from the drop down box. Click + QWidget, QDialog or QMainWindow, from the drop down box. + + \row + \i \inlineimage qtcreator-new-project-summary.png + \i \bold{Creating the Project} + + Finally, review the files that will be created for you. Click \gui{Done} and your project will be generated. \endtable diff --git a/src/app/app.pro b/src/app/app.pro index ab9f20fdd5..2cb354da49 100644 --- a/src/app/app.pro +++ b/src/app/app.pro @@ -13,7 +13,7 @@ win32 { } linux-* { LIBS *= -lExtensionSystem -lAggregation - QMAKE_FLAGS+=-Wl,--enable-new-dtags + QMAKE_LFLAGS+=-Wl,--enable-new-dtags } TEMPLATE = app diff --git a/src/app/main.cpp b/src/app/main.cpp index b8d4b9d4b4..eedc9e1365 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -283,4 +283,3 @@ int main(int argc, char **argv) QTimer::singleShot(100, &pluginManager, SLOT(startTests())); return app.exec(); } - |
