Переглянути джерело

COMP: QFileDialog::Options is a meta property only in Qt 4.7

Julien Finet 14 роки тому
батько
коміт
a8a3fcec42

+ 1 - 1
Libs/Widgets/Testing/Cpp/ctkDirectoryButtonTest1.cpp

@@ -35,7 +35,7 @@ int ctkDirectoryButtonTest1(int argc, char * argv [] )
   QApplication app(argc, argv);
 
   ctkDirectoryButton ctkObject;
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
   ctkObject.setOptions(QFileDialog::ShowDirsOnly | QFileDialog::ReadOnly);
 #else
   ctkObject.setOptions(ctkDirectoryButton::ShowDirsOnly |

+ 5 - 5
Libs/Widgets/ctkDirectoryButton.cpp

@@ -37,7 +37,7 @@ public:
   QDir         Directory;
   QPushButton* PushButton;
   QString      DialogCaption;
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
   QFileDialog::Options DialogOptions;
 #else
   ctkDirectoryButton::Options DialogOptions;
@@ -49,7 +49,7 @@ public:
 //-----------------------------------------------------------------------------
 ctkDirectoryButtonPrivate::ctkDirectoryButtonPrivate()
 {
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
   this->DialogOptions = QFileDialog::ShowDirsOnly;
 #else
   this->DialogOptions = ctkDirectoryButton::ShowDirsOnly;
@@ -153,7 +153,7 @@ const QString& ctkDirectoryButton::caption()const
 }
 
 //-----------------------------------------------------------------------------
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
 void ctkDirectoryButton::setOptions(const QFileDialog::Options& dialogOptions)
 #else
 void ctkDirectoryButton::setOptions(const Options& dialogOptions)
@@ -164,7 +164,7 @@ void ctkDirectoryButton::setOptions(const Options& dialogOptions)
 }
 
 //-----------------------------------------------------------------------------
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
 const QFileDialog::Options& ctkDirectoryButton::options()const
 #else
 const ctkDirectoryButton::Options& ctkDirectoryButton::options()const
@@ -183,7 +183,7 @@ void ctkDirectoryButton::browse()
       this,
       d->DialogCaption.isEmpty() ? this->toolTip() : d->DialogCaption,
       d->Directory.path(),
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
       d->DialogOptions);
 #else
       QFlags<QFileDialog::Option>(int(d->DialogOptions)));

+ 4 - 4
Libs/Widgets/ctkDirectoryButton.h

@@ -39,7 +39,7 @@ class CTK_WIDGETS_EXPORT ctkDirectoryButton: public QWidget
   Q_OBJECT
   Q_PROPERTY(QString directory READ directory WRITE setDirectory)
   Q_PROPERTY(QString caption READ caption WRITE setCaption)
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
   Q_PROPERTY(QFileDialog::Options options READ options WRITE setOptions)
 #else
   Q_PROPERTY(Options options READ options WRITE setOptions)
@@ -48,7 +48,7 @@ class CTK_WIDGETS_EXPORT ctkDirectoryButton: public QWidget
 #endif
 
 public:
-#if QT_VERSION < 0x040603
+#if QT_VERSION < 0x040700
   // QFileDialog::Options is not a meta-type, we need to create our own.
   enum Option
   {
@@ -84,7 +84,7 @@ public:
 
   /// Options of the file dialog pop up.
   /// \sa QFileDialog::getExistingDirectory
-#if QT_VERSION >= 0x040603
+#if QT_VERSION >= 0x040700
   void setOptions(const QFileDialog::Options& options);
   const QFileDialog::Options& options()const;
 #else
@@ -109,7 +109,7 @@ private:
   CTK_DECLARE_PRIVATE(ctkDirectoryButton);
 };
 
-#if QT_VERSION < 0x040603
+#if QT_VERSION < 0x040700
 Q_DECLARE_OPERATORS_FOR_FLAGS(ctkDirectoryButton::Options);
 #endif