Changeset 769 for trunk/src/gui/dialogs/qprintdialog_unix.cpp

Timestamp:

Aug 2, 2010, 9:27:30 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.3 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qprintdialog_unix.cpp (modified) (4 diffs)

trunk/src/gui/dialogs/qprintdialog_unix.cpp

@@ -155 +155 @@
     void setupPrinter();
     void setOptionsPane(QPrintDialogPrivate *pane);
+
+
+
 
 // slots
@@ -970 +973 @@
 void QUnixPrintWidgetPrivate::_q_btnPropertiesClicked()
 {
-    if (propertiesDialog == 0) {
+    if () {
         propertiesDialog = new QPrintPropertiesDialog(q);
         propertiesDialog->setResult(QDialog::Rejected);
@@ -989 +992 @@
     propertiesDialog->exec();
 }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 
 void QUnixPrintWidgetPrivate::setupPrinter()
@@ -1018 +1050 @@
     if (propertiesDialog && propertiesDialog->result() == QDialog::Accepted)
         propertiesDialog->setupPrinter();
+
+
+
+
 }