diff options
| author | Jerome Pasion <jerome.pasion@nokia.com> | 2011-10-19 08:55:43 (GMT) |
|---|---|---|
| committer | Jerome Pasion <jerome.pasion@nokia.com> | 2011-10-19 08:55:43 (GMT) |
| commit | c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2 (patch) | |
| tree | d99496ae00c9e9cddb5df85b372065a2c44135cb /examples | |
| parent | f90c18e09e8b2e275230080cb51656e3f8a31fba (diff) | |
| parent | 8051a73be276995adfc4508a0cb5ad6451e8ab45 (diff) | |
| download | Qt-c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2.zip Qt-c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2.tar.gz Qt-c6ae57e89021d44bbce71d3dd21ee1b833b9d0e2.tar.bz2 | |
Merge branch '4.8' of scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/dialogs/extension/finddialog.cpp | 2 | ||||
| -rw-r--r-- | examples/examples.pro | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp index 2ce0391..2457a5b 100644 --- a/examples/dialogs/extension/finddialog.cpp +++ b/examples/dialogs/extension/finddialog.cpp @@ -104,9 +104,11 @@ FindDialog::FindDialog(QWidget *parent) connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit())); addAction(backSoftKeyAction); #else +//! [6] buttonBox = new QDialogButtonBox(Qt::Vertical); buttonBox->addButton(findButton, QDialogButtonBox::ActionRole); buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole); +//! [6] connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool))); #endif diff --git a/examples/examples.pro b/examples/examples.pro index cf12dd6..0c4c9cb 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -63,7 +63,7 @@ contains(QT_CONFIG, opengl): SUBDIRS += opengl contains(QT_CONFIG, openvg): SUBDIRS += openvg contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(QT_CONFIG, declarative): SUBDIRS += declarative -win32: SUBDIRS += activeqt +win32:!win32-g++*: SUBDIRS += activeqt contains(QT_CONFIG, xmlpatterns):!contains(QT_CONFIG, no-gui): SUBDIRS += xmlpatterns contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent |