Update of /cvsroot/kde-cygwin/qt-3/src/dialogs
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6831/src/dialogs
Modified Files:
Tag: QT_WIN32_3_3_BRANCH
qfiledialog.cpp qmessagebox.cpp qt_dialogs.pri
Log Message:
reapply patches which were lost during my not so good update to 3.3.5
Index: qfiledialog.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qfiledialog.cpp,v
retrieving revision 1.1.1.21
retrieving revision 1.1.1.22
diff -u -r1.1.1.21 -r1.1.1.22
--- qfiledialog.cpp 22 Sep 2005 12:53:56 -0000 1.1.1.21
+++ qfiledialog.cpp 30 Sep 2005 16:58:31 -0000 1.1.1.22
@@ -113,6 +113,20 @@
#undef check
#endif
+#if defined(Q_OS_CYGWIN) && defined(QT_THREAD_SUPPORT) && defined(_POSIX_THREAD_SAFE_FUNCTIONS)
+int getlogin_r (char* name, size_t namesize )
+{
+ char *s = getlogin();
+ if (s) {
+ strncpy (name, s, namesize);
+ return 0;
+ }
+ else {
+ return -1;
+ }
+}
+#endif
+
/* XPM */
static const char * const start_xpm[]={
"16 15 8 1",
@@ -5708,6 +5722,9 @@
{
return d->url;
}
+#if defined(Q_CYGWIN_WIN)
+Q_EXPORT int qt_ntfs_permission_lookup = 0;
+#endif
static bool isRoot( const QUrl &u )
{
Index: qmessagebox.cpp
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qmessagebox.cpp,v
retrieving revision 1.1.1.16
retrieving revision 1.1.1.17
diff -u -r1.1.1.16 -r1.1.1.17
--- qmessagebox.cpp 22 Sep 2005 12:53:53 -0000 1.1.1.16
+++ qmessagebox.cpp 30 Sep 2005 16:58:31 -0000 1.1.1.17
@@ -595,7 +595,12 @@
"<p>Qt is a Trolltech product. "
"See <tt>http://www.trolltech.com/qt/</tt> "
"for more information.</p>"
- ).arg( QT_VERSION_STR );
+ ).arg( QT_VERSION_STR ) + tr (
+ "<hr><p>This is Qt/Windows Free Edition, an open-source "
+ "version of Qt/Windows developed independently of "
+ "Trolltech. See <tt>http://kde-cygwin.sourceforge.net/qt3-win32/</tt> "
+ "for more information.</p>"
+ );
#endif
}
Index: qt_dialogs.pri
===================================================================
RCS file: /cvsroot/kde-cygwin/qt-3/src/dialogs/qt_dialogs.pri,v
retrieving revision 1.1.1.10
retrieving revision 1.1.1.11
diff -u -r1.1.1.10 -r1.1.1.11
--- qt_dialogs.pri 22 Sep 2005 12:53:57 -0000 1.1.1.10
+++ qt_dialogs.pri 30 Sep 2005 16:58:31 -0000 1.1.1.11
@@ -9,6 +9,7 @@
$$DIALOGS_H/qfiledialog.h \
$$DIALOGS_H/qfontdialog.h \
$$DIALOGS_H/qmessagebox.h \
+ $$DIALOGS_H/qprintdialog.h \
$$DIALOGS_H/qprogressdialog.h \
$$DIALOGS_H/qsemimodal.h \
$$DIALOGS_H/qtabdialog.h \
@@ -17,8 +18,6 @@
!embedded:mac:SOURCES += $$DIALOGS_CPP/qfiledialog_mac.cpp $$DIALOGS_CPP/qcolordialog_mac.cpp
win32:SOURCES += $$DIALOGS_CPP/qfiledialog_win.cpp
- unix:SOURCES += $$DIALOGS_CPP/qprintdialog.cpp
- unix:HEADERS += $$DIALOGS_H/qprintdialog.h
SOURCES += $$DIALOGS_CPP/qcolordialog.cpp \
$$DIALOGS_CPP/qdialog.cpp \
@@ -26,6 +25,7 @@
$$DIALOGS_CPP/qfiledialog.cpp \
$$DIALOGS_CPP/qfontdialog.cpp \
$$DIALOGS_CPP/qmessagebox.cpp \
+ $$DIALOGS_CPP/qprintdialog.cpp \
$$DIALOGS_CPP/qprogressdialog.cpp \
$$DIALOGS_CPP/qtabdialog.cpp \
$$DIALOGS_CPP/qwizard.cpp \
|
