diff --git a/plugins/src/sqldrivers/odbc/odbc.pro b/plugins/src/sqldrivers/odbc/odbc.pro
index ac0cf3c..36d35b5 100644
--- a/plugins/src/sqldrivers/odbc/odbc.pro
+++ b/plugins/src/sqldrivers/odbc/odbc.pro
@@ -17,7 +17,7 @@ mac {
unix {
OBJECTS_DIR = .obj
!contains( LIBS, .*odbc.* ) {
- LIBS *= -liodbc
+ LIBS *= -lodbc
}
}
diff --git a/src/kernel/qwidget_x11.cpp b/src/kernel/qwidget_x11.cpp
index 775829c..b4133d0 100644
--- a/src/kernel/qwidget_x11.cpp
+++ b/src/kernel/qwidget_x11.cpp
@@ -630,7 +630,10 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
wsa.save_under = True;
XChangeWindowAttributes( dpy, id, CWOverrideRedirect | CWSaveUnder,
&wsa );
- x11SetWindowType();
+ XClassHint class_hint;
+ class_hint.res_name = (char *) qAppName(); // application name
+ class_hint.res_class = (char *) qAppClass(); // application class
+ XSetClassHint( dpy, id, &class_hint );
} else if ( topLevel && !desktop ) { // top-level widget
QWidget *p = parentWidget(); // real parent
if (p)
@@ -693,8 +696,6 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
else
XDeleteProperty(dpy, id, qt_xa_motif_wm_hints);
- x11SetWindowType();
-
// set _NET_WM_WINDOW_STATE
if (curr_winstate > 0)
XChangeProperty(dpy, id, qt_net_wm_state, XA_ATOM, 32, PropModeReplace,
@@ -709,11 +710,6 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
else
XDeleteProperty(dpy, id, qt_net_wm_action);
- // set _NET_WM_PID
- long curr_pid = getpid();
- XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
- (unsigned char *) &curr_pid, 1);
-
#ifndef QT_NO_XSYNC
// set _NET_WM_SYNC_COUNTER
createSyncCounter();
@@ -725,19 +721,31 @@ void QWidget::create( WId window, bool initializeWindow, bool destroyOldWindow)
// when we create a toplevel widget, the frame strut should be dirty
fstrut_dirty = 1;
+ } else {
+ // non-toplevel widgets don't have a frame, so no need to
+ // update the strut
+ fstrut_dirty = 0;
+ }
+
+ if (initializeWindow && (popup || (topLevel && !desktop))) { // properties set on all toplevel windows
+ x11SetWindowType();
+
+ // set _NET_WM_PID
+ long curr_pid = getpid();
+ XChangeProperty(dpy, id, qt_net_wm_pid, XA_CARDINAL, 32, PropModeReplace,
+ (unsigned char *) &curr_pid, 1);
+
// declare the widget's object name as window role
XChangeProperty( dpy, id,
qt_window_role, XA_STRING, 8, PropModeReplace,
(unsigned char *)name(), qstrlen( name() ) );
// set client leader property
+ if ( !qt_x11_wm_client_leader )
+ qt_x11_create_wm_client_leader();
XChangeProperty( dpy, id, qt_wm_client_leader,
XA_WINDOW, 32, PropModeReplace,
(unsigned char *)&qt_x11_wm_client_leader, 1 );
- } else {
- // non-toplevel widgets don't have a frame, so no need to
- // update the strut
- fstrut_dirty = 0;
}
if ( initializeWindow ) {
diff --git a/src/sql/drivers/odbc/qsql_odbc.cpp b/src/sql/drivers/odbc/qsql_odbc.cpp
index b09afd2..8b0b58b 100644
--- a/src/sql/drivers/odbc/qsql_odbc.cpp
+++ b/src/sql/drivers/odbc/qsql_odbc.cpp
@@ -61,19 +61,18 @@
#endif
// newer platform SDKs use SQLLEN instead of SQLINTEGER
-#ifdef SQLLEN
+#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLLEN SQLLEN
#else
# define QSQLLEN SQLINTEGER
#endif
-#ifdef SQLULEN
+#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
# define QSQLULEN SQLULEN
#else
# define QSQLULEN SQLUINTEGER
#endif
-
static const QSQLLEN COLNAMESIZE = 256;
//Map Qt parameter types to ODBC types
static const SQLSMALLINT qParamType[ 4 ] = { SQL_PARAM_INPUT, SQL_PARAM_INPUT, SQL_PARAM_OUTPUT, SQL_PARAM_INPUT_OUTPUT };
diff --git a/src/sql/qt_sql.pri b/src/sql/qt_sql.pri
index 5533c6f..17a6d40 100644
--- a/src/sql/qt_sql.pri
+++ b/src/sql/qt_sql.pri
@@ -110,13 +110,13 @@ sql {
mac {
!contains( LIBS, .*odbc.* ) {
- LIBS *= -liodbc
+ LIBS *= -lodbc
}
}
unix {
!contains( LIBS, .*odbc.* ) {
- LIBS *= -liodbc
+ LIBS *= -lodbc
}
}
diff --git a/translations/qt_zh-tw.ts b/translations/qt_zh-tw.ts
index 8260fe4..0f0eaa8 100644
--- a/translations/qt_zh-tw.ts
+++ b/translations/qt_zh-tw.ts
@@ -115,7 +115,7 @@
Menu
- Menu
+ 選單
Help
@@ -337,7 +337,7 @@
A&lpha channel:
- Alpha 色頻(&L)：
+ 透明色頻(&L)：
&Basic colors
@@ -429,11 +429,11 @@
Read: %1
- 讀取： %1
+ 讀取：%1
Write: %1
- 寫入： %1
+ 寫入：%1
Cancel
@@ -1194,7 +1194,7 @@ to
Customize...
- 自訂...
+ 自訂…
@@ -1264,7 +1264,7 @@ to
<h3>About Qt</h3><p>This program uses Qt version %1.</p><p>Qt is a C++ toolkit for multiplatform GUI & application development.</p><p>Qt provides single-source portability across MS Windows, Mac OS X, Linux, and all major commercial Unix variants.<br>Qt is also available for embedded devices.</p><p>Qt is a Trolltech product. See <tt>http://www.trolltech.com/qt/</tt> for more information.</p>
- <h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平台 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS Windows、Mac OS X、Linux 和所有主要的商用 Unix 變異版本，提供跨平台的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p>
+ <h3>關於 Qt</h3><p>本程式使用 Qt 版本 %1。</p><p>Qt 是用於多平臺 GUI 和應用程式開發的 C++ 工具套件。</p><p>Qt 為 MS Windows、Mac OS X、Linux 和所有主要的商用 Unix 變異版本，提供跨平臺的單一原始碼可攜性。<br>Qt 也可用於內嵌裝置。</p><p>Qt 是 Trolltech 的產品。如需詳細資訊，請參閱 <tt>http://www.trolltech.com/qt/</tt>。</p>
@@ -1282,7 +1282,7 @@ to
Aliases: %1
- 別名： %1
+ 別名：%1
unknown
@@ -1338,7 +1338,7 @@ to
Browse...
- 瀏覽...
+ 瀏覽…
Options
@@ -1386,123 +1386,123 @@ to
A0 (841 x 1189 mm)
- A0 (841 x 1189 mm)
+ A0 (841 x 1189 公釐)
A1 (594 x 841 mm)
- A1 (594 x 841 mm)
+ A1 (594 x 841 公釐)
A2 (420 x 594 mm)
- A2 (420 x 594 mm)
+ A2 (420 x 594 公釐)
A3 (297 x 420 mm)
- A3 (297 x 420 mm)
+ A3 (297 x 420 公釐)
A4 (210x297 mm, 8.26x11.7 inches)
- A4 (210x297 mm，8.26x11.7 英吋)
+ A4 (210x297 公釐，8.26x11.7 英吋)
A5 (148 x 210 mm)
- A5 (148 x 210 mm)
+ A5 (148 x 210 公釐)
A6 (105 x 148 mm)
- A6 (105 x 148 mm)
+ A6 (105 x 148 公釐)
A7 (74 x 105 mm)
- A7 (74 x 105 mm)
+ A7 (74 x 105 公釐)
A8 (52 x 74 mm)
- A8 (52 x 74 mm)
+ A8 (52 x 74 公釐)
A9 (37 x 52 mm)
- A9 (37 x 52 mm)
+ A9 (37 x 52 公釐)
B0 (1000 x 1414 mm)
- B0 (1000 x 1414 mm)
+ B0 (1000 x 1414 公釐)
B1 (707 x 1000 mm)
- B1 (707 x 1000 mm)
+ B1 (707 x 1000 公釐)
B2 (500 x 707 mm)
- B2 (500 x 707 mm)
+ B2 (500 x 707 公釐)
B3 (353 x 500 mm)
- B3 (353 x 500 mm)
+ B3 (353 x 500 公釐)
B4 (250 x 353 mm)
- B4 (250 x 353 mm)
+ B4 (250 x 353 公釐)
B5 (176 x 250 mm, 6.93x9.84 inches)
- B5 (176 x 250 mm，6.93x9.84 英吋)
+ B5 (176 x 250 公釐，6.93x9.84 英吋)
B6 (125 x 176 mm)
- B6 (125 x 176 mm)
+ B6 (125 x 176 公釐)
B7 (88 x 125 mm)
- B7 (88 x 125 mm)
+ B7 (88 x 125 公釐)
B8 (62 x 88 mm)
- B8 (62 x 88 mm)
+ B8 (62 x 88 公釐)
B9 (44 x 62 mm)
- B9 (44 x 62 mm)
+ B9 (44 x 62 公釐)
B10 (31 x 44 mm)
- B10 (31 x 44 mm)
+ B10 (31 x 44 公釐)
C5E (163 x 229 mm)
- C5E (163 x 229 mm)
+ C5E (163 x 229 公釐)
DLE (110 x 220 mm)
- DLE (110 x 220 mm)
+ DLE (110 x 220 公釐)
Executive (7.5x10 inches, 191x254 mm)
- Executive (7.5x10 英吋，191x254 mm)
+ Executive (7.5x10 英吋，191x254 公釐)
Folio (210 x 330 mm)
- Folio (210 x 330 mm)
+ Folio (210 x 330 公釐)
Ledger (432 x 279 mm)
- Ledger (432 x 279 mm)
+ Ledger (432 x 279 公釐)
Legal (8.5x14 inches, 216x356 mm)
- Legal (8.5x14 英吋，216x356 mm)
+ Legal (8.5x14 英吋，216x356 公釐)
Letter (8.5x11 inches, 216x279 mm)
- Letter (8.5x11 英吋，216x279 mm)
+ Letter (8.5x11 英吋，216x279 公釐)
Tabloid (279 x 432 mm)
- Tabloid (279 x 432 mm)
+ Tabloid (279 x 432 公釐)
US Common #10 Envelope (105 x 241 mm)
- 美國一般 10 號信封 (105 x 241 mm)
+ 美國一般 10 號信封 (105 x 241 公釐)
Setup Printer
@@ -1691,7 +1691,7 @@ to
QToolBar
More...
- 其他...
+ 其他…
@@ -1811,7 +1811,7 @@ to
&Help
- 說明(&H)
+ 求助(&H)
@@ -1988,7 +1988,7 @@ to
Paste special...
- 選擇性貼上...
+ 選擇性貼上…
Clear