diff --git a/doc/qtcreator-class-info.png b/doc/qtcreator-class-info.png index 757eb128566bf22902be49b7286a87cfc3e6c794..a005239707657fa71423401fe8c4c20aaf8a9252 100644 Binary files a/doc/qtcreator-class-info.png and b/doc/qtcreator-class-info.png differ diff --git a/doc/qtcreator-intro-and-location.png b/doc/qtcreator-intro-and-location.png index e0d8c9f150b833de7f100451b4d13f98b6f15fae..f03e4fb6a475ea50a3f9ee456af67ef8d2f3414e 100644 Binary files a/doc/qtcreator-intro-and-location.png and b/doc/qtcreator-intro-and-location.png differ diff --git a/doc/qtcreator-new-project-summary.png b/doc/qtcreator-new-project-summary.png new file mode 100644 index 0000000000000000000000000000000000000000..05e1cf2e0d5893564ed62f584db160fd4644d710 Binary files /dev/null and b/doc/qtcreator-new-project-summary.png differ diff --git a/doc/qtcreator-new-project.png b/doc/qtcreator-new-project.png index 6f7832e5cb8f7109874ee3fabd7c4bf7e3205a89..f6c186206e916b6d24c1885288a6188e27690568 100644 Binary files a/doc/qtcreator-new-project.png and b/doc/qtcreator-new-project.png differ diff --git a/doc/qtcreator-select-modules.png b/doc/qtcreator-select-modules.png index b5b2ead006bb4308f39d1282ce97fdcacba5e0c1..313934ec974648c07bd77ae3327d36cc16f976ad 100644 Binary files a/doc/qtcreator-select-modules.png and b/doc/qtcreator-select-modules.png differ diff --git a/doc/qtcreator.qch b/doc/qtcreator.qch index 124510448158c63b73ae28bc6a8f2370abde0202..1e94462e89fff8e6021770667a7b05ff80fae78b 100644 Binary files a/doc/qtcreator.qch and b/doc/qtcreator.qch differ diff --git a/doc/qtcreator.qdoc b/doc/qtcreator.qdoc index f95b58d58f7d3ef3a51f70675b80bba455445b90..e4bbfa75179dcc8fe6b449e7e210995c0306b61d 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 ab9f20fdd5158b45b43756ac5dc5ea644d9c0ba7..2cb354da4958b3b6f84a431f2ad02306920711eb 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 b8d4b9d4b4146052679c2aa5c6892a674d023758..eedc9e1365370a07d2e60933568a3e1dbb1aaadf 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(); } -