summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-08-19 00:35:19 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-08-19 00:35:19 (GMT)
commit0cb57328453c476b01b058d57211afee197d6a82 (patch)
tree87f58d0ba221606701c888db2a5f2262cc384cf8 /examples
parentff7f7dd596511de4c629b6c7f97d32a21049bb95 (diff)
parent7efd63b1ad26090ec15e1ab7bd9c60fa1c12e98a (diff)
downloadQt-0cb57328453c476b01b058d57211afee197d6a82.zip
Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.gz
Qt-0cb57328453c476b01b058d57211afee197d6a82.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/qt-doc-staging: Doc: Fixed qdoc warnings. Doc: Fixed qdoc warnings. Improved comment finding code. Added language information to the pure documentation parser. Doc: Fixes to Qt tutorial Fixed external link to DevNet Wiki. qdoc: Fixed a crash caused by accessing a null pointer. Doc: Fixed the example of an encoded URL in the class description. Doc: Added a copy of the online style images for the qdoc manual. Doc: Removed the Google Analytics script.
Diffstat (limited to 'examples')
-rwxr-xr-xexamples/tutorials/gettingStarted/gsQt/part2/main.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
index 24b4d77..afa26e1 100755
--- a/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
+++ b/examples/tutorials/gettingStarted/gsQt/part2/main.cpp
@@ -44,17 +44,17 @@ int main(int argv, char **args)
{
QApplication app(argv, args);
- QTextEdit textEdit;
- QPushButton quitButton("&Quit");
+ QTextEdit *textEdit = new QTextEdit;
+ QPushButton *quitButton = new QPushButton("&Quit");
- QObject::connect(&quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
+ QObject::connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit()));
- QVBoxLayout layout;
- layout.addWidget(&textEdit);
- layout.addWidget(&quitButton);
+ QVBoxLayout *layout = new QVBoxLayout;
+ layout->addWidget(textEdit);
+ layout->addWidget(quitButton);
QWidget window;
- window.setLayout(&layout);
+ window.setLayout(layout);
window.show();