Commit f07394a3 authored by Kavindra Palaraja's avatar Kavindra Palaraja
Browse files

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

parents 7ba7d285 fef59aa4
doc/qtcreator-class-info.png

34.4 KB | W: | H:

doc/qtcreator-class-info.png

47.8 KB | W: | H:

doc/qtcreator-class-info.png
doc/qtcreator-class-info.png
doc/qtcreator-class-info.png
doc/qtcreator-class-info.png
  • 2-up
  • Swipe
  • Onion skin
doc/qtcreator-intro-and-location.png

31.7 KB | W: | H:

doc/qtcreator-intro-and-location.png

43.4 KB | W: | H:

doc/qtcreator-intro-and-location.png
doc/qtcreator-intro-and-location.png
doc/qtcreator-intro-and-location.png
doc/qtcreator-intro-and-location.png
  • 2-up
  • Swipe
  • Onion skin
doc/qtcreator-new-project.png

13.7 KB | W: | H:

doc/qtcreator-new-project.png

31.4 KB | W: | H:

doc/qtcreator-new-project.png
doc/qtcreator-new-project.png
doc/qtcreator-new-project.png
doc/qtcreator-new-project.png
  • 2-up
  • Swipe
  • Onion skin
doc/qtcreator-select-modules.png

44.1 KB | W: | H:

doc/qtcreator-select-modules.png

58 KB | W: | H:

doc/qtcreator-select-modules.png
doc/qtcreator-select-modules.png
doc/qtcreator-select-modules.png
doc/qtcreator-select-modules.png
  • 2-up
  • Swipe
  • Onion skin
No preview for this file type
...@@ -318,12 +318,18 @@ ...@@ -318,12 +318,18 @@
\i \inlineimage qtcreator-class-info.png \i \inlineimage qtcreator-class-info.png
\i \bold{Specifying Class Information} \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 \e{Header file}, \e{Source file} and \e{Form file} fields will update
automatically according to your choice of class name. automatically according to your choice of class name.
You also have to select the base class for your class, either a 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. \gui{Done} and your project will be generated.
\endtable \endtable
......
...@@ -13,7 +13,7 @@ win32 { ...@@ -13,7 +13,7 @@ win32 {
} }
linux-* { linux-* {
LIBS *= -lExtensionSystem -lAggregation LIBS *= -lExtensionSystem -lAggregation
QMAKE_FLAGS+=-Wl,--enable-new-dtags QMAKE_LFLAGS+=-Wl,--enable-new-dtags
} }
TEMPLATE = app TEMPLATE = app
......
...@@ -283,4 +283,3 @@ int main(int argc, char **argv) ...@@ -283,4 +283,3 @@ int main(int argc, char **argv)
QTimer::singleShot(100, &pluginManager, SLOT(startTests())); QTimer::singleShot(100, &pluginManager, SLOT(startTests()));
return app.exec(); return app.exec();
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment