From 64ed30abf62bff401f391272f3c96453c26942b1 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Aug 2010 15:52:13 +0200 Subject: fix inaccurate comment qtmultimedia doesn't need gstreamer. inspired by MR 762. --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index c322634..c6e4591 100755 --- a/configure +++ b/configure @@ -5382,7 +5382,7 @@ if [ "$PLATFORM_X11" = "yes" -o "$PLATFORM_QWS" = "yes" ]; then fi fi - # Auto-detect GStreamer support (needed for both Phonon & QtMultimedia) + # Auto-detect GStreamer support (needed for Phonon) if [ "$CFG_PHONON" != "no" ]; then if [ "$CFG_GLIB" = "yes" -a "$CFG_GSTREAMER" != "no" ]; then if [ -n "$PKG_CONFIG" ]; then -- cgit v0.12 From f2b5d057252870a3d6c1cf24e848a740c697ea99 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Tue, 3 Aug 2010 16:33:43 +0200 Subject: Fix compilation with QT_NO_DBUS Merge-request: 2441 Reviewed-by: Oswald Buddenhagen --- src/plugins/bearer/connman/qconnmanservice_linux.cpp | 6 ++++++ src/plugins/bearer/connman/qconnmanservice_linux_p.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/src/plugins/bearer/connman/qconnmanservice_linux.cpp b/src/plugins/bearer/connman/qconnmanservice_linux.cpp index 00cfb31..eb88317 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux.cpp +++ b/src/plugins/bearer/connman/qconnmanservice_linux.cpp @@ -53,6 +53,8 @@ #include "qconnmanservice_linux_p.h" +#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_DBUS QT_BEGIN_NAMESPACE static QDBusConnection dbusConnection = QDBusConnection::systemBus(); @@ -1169,3 +1171,7 @@ void QConnmanDBusHelper::propertyChanged(const QString &item, const QDBusVariant ///////////////// QT_END_NAMESPACE + +#endif // QT_NO_DBUS +#endif // QT_NO_BEARERMANAGEMENT + diff --git a/src/plugins/bearer/connman/qconnmanservice_linux_p.h b/src/plugins/bearer/connman/qconnmanservice_linux_p.h index 18233b0..a2b1e73 100644 --- a/src/plugins/bearer/connman/qconnmanservice_linux_p.h +++ b/src/plugins/bearer/connman/qconnmanservice_linux_p.h @@ -65,6 +65,9 @@ #include #include +#ifndef QT_NO_BEARERMANAGEMENT +#ifndef QT_NO_DBUS + #ifndef __CONNMAN_DBUS_H #define CONNMAN_SERVICE "org.moblin.connman" @@ -385,4 +388,7 @@ Q_SIGNALS: QT_END_NAMESPACE +#endif // QT_NO_DBUS +#endif // QT_NO_BEARERMANAGEMENT + #endif //QCONNMANSERVICE_H -- cgit v0.12 From 2c7621730d30ac418874c18036a7aa34e2aae1d0 Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 3 Aug 2010 16:37:05 +0200 Subject: Improve TDS configuration through QT_LFLAGS_TDS, SYBASE, SYBASE_LIBS Consistent with QT_LFLAGS_* for other database drivers. Support added to configure shell script and configure.exe. Respect SYBASE and SYBASE_LIBS. Use QT_LFLAGS_TDS in project files. Merge-request: 2416 Reviewed-by: Oswald Buddenhagen --- configure | 8 +++++++- src/sql/drivers/tds/qsql_tds.pri | 4 +++- tools/configure/configureapp.cpp | 15 +++++++++++++++ tools/configure/configureapp.h | 2 ++ 4 files changed, 27 insertions(+), 2 deletions(-) diff --git a/configure b/configure index c6e4591..6958800 100755 --- a/configure +++ b/configure @@ -823,6 +823,7 @@ QT_LFLAGS_MYSQL_R= QT_CFLAGS_SQLITE= QT_LFLAGS_SQLITE= QT_LFLAGS_ODBC="-lodbc" +QT_LFLAGS_TDS= # flags for libdbus-1 QT_CFLAGS_DBUS= @@ -5119,7 +5120,9 @@ for _SQLDR in $CFG_SQL_AVAILABLE; do ;; tds) if [ "$CFG_SQL_tds" != "no" ]; then - if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + [ -z "$SYBASE" ] || QT_LFLAGS_TDS="-L$SYBASE/lib" + [ -z "$SYBASE_LIBS" ] || QT_LFLAGS_TDS="$QT_LFLAGS_TDS $SYBASE_LIBS" + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/unix/tds "TDS" $QT_LFLAGS_TDS $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then if [ "$CFG_SQL_tds" = "auto" ]; then CFG_SQL_tds=plugin fi @@ -7928,6 +7931,9 @@ fi if [ -n "$QT_LFLAGS_ODBC" ]; then echo "QT_LFLAGS_ODBC = $QT_LFLAGS_ODBC" >> "$CACHEFILE.tmp" fi +if [ -n "$QT_LFLAGS_TDS" ]; then + echo "QT_LFLAGS_TDS = $QT_LFLAGS_TDS" >> "$CACHEFILE.tmp" +fi if [ "$QT_EDITION" != "QT_EDITION_OPENSOURCE" ]; then echo "DEFINES *= QT_EDITION=QT_EDITION_DESKTOP" >> "$CACHEFILE.tmp" diff --git a/src/sql/drivers/tds/qsql_tds.pri b/src/sql/drivers/tds/qsql_tds.pri index c552ead..037f793 100644 --- a/src/sql/drivers/tds/qsql_tds.pri +++ b/src/sql/drivers/tds/qsql_tds.pri @@ -1,8 +1,10 @@ HEADERS += $$PWD/qsql_tds.h SOURCES += $$PWD/qsql_tds.cpp -unix { +unix|win32-g++: { + !isEmpty(QT_LFLAGS_TDS):!static:LIBS *= $$QT_LFLAGS_TDS !contains(LIBS, .*sybdb.*):LIBS += -lsybdb + QMAKE_CXXFLAGS *= $$QT_CFLAGS_TDS } else:win32-borland { LIBS *= $(BCB)/lib/PSDK/NTWDBLIB.LIB } else { diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index b7de052..953a8c9 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -1029,6 +1029,10 @@ void Configure::parseCmdLine() opensslLibs = configCmdLine.at(i); } else if (configCmdLine.at(i).startsWith("PSQL_LIBS=")) { psqlLibs = configCmdLine.at(i); + } else if (configCmdLine.at(i).startsWith("SYBASE=")) { + sybase = configCmdLine.at(i); + } else if (configCmdLine.at(i).startsWith("SYBASE_LIBS=")) { + sybaseLibs = configCmdLine.at(i); } else if ((configCmdLine.at(i) == "-override-version") || (configCmdLine.at(i) == "-version-override")){ @@ -2747,6 +2751,17 @@ void Configure::generateOutputVars() } if (!psqlLibs.isEmpty()) qmakeVars += QString("QT_LFLAGS_PSQL=") + psqlLibs.section("=", 1); + + { + QStringList lflagsTDS; + if (!sybase.isEmpty()) + lflagsTDS += QString("-L") + fixSeparators(sybase.section("=", 1) + "/lib"); + if (!sybaseLibs.isEmpty()) + lflagsTDS += sybaseLibs.section("=", 1); + if (!lflagsTDS.isEmpty()) + qmakeVars += QString("QT_LFLAGS_TDS=") + lflagsTDS.join(" "); + } + if (!qmakeSql.isEmpty()) qmakeVars += QString("sql-drivers += ") + qmakeSql.join(" "); if (!qmakeSqlPlugins.isEmpty()) diff --git a/tools/configure/configureapp.h b/tools/configure/configureapp.h index ff2ee8b..b3c07f7 100644 --- a/tools/configure/configureapp.h +++ b/tools/configure/configureapp.h @@ -134,6 +134,8 @@ private: QStringList qmakeLibs; QString opensslLibs; QString psqlLibs; + QString sybase; + QString sybaseLibs; QMap licenseInfo; QString outputLine; -- cgit v0.12 From c95cc2d8c3c0b4ba69cbc9028dcd22ca37ab7da8 Mon Sep 17 00:00:00 2001 From: Anders Bakken Date: Tue, 3 Aug 2010 16:49:30 +0200 Subject: Fix typo in docs Merge-request: 2446 Reviewed-by: Oswald Buddenhagen --- doc/src/platforms/emb-directfb-EmbLinux.qdoc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/src/platforms/emb-directfb-EmbLinux.qdoc b/doc/src/platforms/emb-directfb-EmbLinux.qdoc index b4f44bf..955258e 100644 --- a/doc/src/platforms/emb-directfb-EmbLinux.qdoc +++ b/doc/src/platforms/emb-directfb-EmbLinux.qdoc @@ -147,8 +147,8 @@ your qmake.conf. #DEFINES += \"QT_DIRECTFB_DISABLE_RASTERFALLBACKS=$$DIRECTFB_DRAWINGOPERATIONS\" \endcode -As demonstrated above, you need to Qt which drawing operations you want to -warn/disable. Since there are varying implementations of DirectFB from +As demonstrated above, you need to tell Qt which drawing operations you want +to warn/disable. Since there are varying implementations of DirectFB from manufacturer to manufacture, different operations will be optimized. This require you to define the operations you want to warn about or disable. These are listed above in the DIRECTFB_DRAWINGOPERATIONS variable. -- cgit v0.12 From 9f6bcd7ff39462ec2028ddbe27fc04911b856018 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 3 Aug 2010 21:03:35 +0200 Subject: fix compilation with -plugin-kbd-* it certainly is not such a good idea to write mouse when one means kbd ... Task-number: QTBUG-12483 --- configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure b/configure index 6958800..915d5aa 100755 --- a/configure +++ b/configure @@ -2088,7 +2088,7 @@ while [ "$#" -gt 0 ]; do [ "$VAR" = "decoration" ] && QMakeVar del "${VAR}s" "$VAL" [ "$VAR" = "decoration" ] && CFG_DECORATION_ON=`echo "${CFG_DECORATION_ON} " | sed "s,${VAL} ,,g"` && CFG_DECORATION_PLUGIN="$CFG_DECORATION_PLUGIN ${VAL}" [ "$VAR" = "kbd" ] && QMakeVar del "${VAR}s" "$VAL" - [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}" + [ "$VAR" = "kbd" ] && CFG_KBD_ON=`echo "${CFG_KBD_ON} " | sed "s,${VAL} ,,g"` && CFG_KBD_PLUGIN="$CFG_KBD_PLUGIN ${VAL}" [ "$VAR" = "mouse" ] && QMakeVar del "${VAR}s" "$VAL" [ "$VAR" = "mouse" ] && CFG_MOUSE_ON=`echo "${CFG_MOUSE_ON} " | sed "s,${VAL} ,,g"` && CFG_MOUSE_PLUGIN="$CFG_MOUSE_PLUGIN ${VAL}" [ "$VAR" = "gfx" ] && QMakeVar del "${VAR}s" "$VAL" -- cgit v0.12 From 13670a35a576d6c27bbe27f2e0a97849fd1301ff Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 4 Aug 2010 14:28:39 +0200 Subject: fix line endings --- examples/network/bearercloud/bluetooth.svg | 48 +++++++++++----------- examples/network/bearercloud/cell.svg | 50 +++++++++++----------- examples/network/bearercloud/lan.svg | 66 +++++++++++++++--------------- 3 files changed, 82 insertions(+), 82 deletions(-) diff --git a/examples/network/bearercloud/bluetooth.svg b/examples/network/bearercloud/bluetooth.svg index 7ded90a..32e2fa3 100644 --- a/examples/network/bearercloud/bluetooth.svg +++ b/examples/network/bearercloud/bluetooth.svg @@ -1,24 +1,24 @@ - - - - -]> - - - - - - - - - - - - - - + + + + +]> + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/cell.svg b/examples/network/bearercloud/cell.svg index d4ca57b..7519868 100644 --- a/examples/network/bearercloud/cell.svg +++ b/examples/network/bearercloud/cell.svg @@ -1,25 +1,25 @@ - - - - -]> - - - - - - - - - - - - - - - - - - + + + + +]> + + + + + + + + + + + + + + + + + + diff --git a/examples/network/bearercloud/lan.svg b/examples/network/bearercloud/lan.svg index b8ee999..4f7f63d 100755 --- a/examples/network/bearercloud/lan.svg +++ b/examples/network/bearercloud/lan.svg @@ -1,33 +1,33 @@ - - - - -]> - - - - - - - - - - - - - - - - - - - - - - - - + + + + +]> + + + + + + + + + + + + + + + + + + + + + + + + -- cgit v0.12 From ae1c9def5cb22d88cf10b2a23d06bc38da12725b Mon Sep 17 00:00:00 2001 From: ck Date: Wed, 4 Aug 2010 13:42:04 +0200 Subject: Assistant: Revert previous commit, issue was already fixed. --- tools/assistant/tools/assistant/mainwindow.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/assistant/tools/assistant/mainwindow.cpp b/tools/assistant/tools/assistant/mainwindow.cpp index 916e1a5..913e342 100644 --- a/tools/assistant/tools/assistant/mainwindow.cpp +++ b/tools/assistant/tools/assistant/mainwindow.cpp @@ -334,8 +334,7 @@ void MainWindow::lookForNewQtDocumentation() << QLatin1String("designer") << QLatin1String("linguist") << QLatin1String("qmake") - << QLatin1String("qt") - << QLatin1String("qml"); + << QLatin1String("qt"); QList qtDocInfos; foreach (const QString &doc, docs) qtDocInfos.append(QtDocInstaller::DocInfo(doc, helpEngine.qtDocInfo(doc))); -- cgit v0.12 From 2838cfa7809e6b196a1ee1eb71df5894fc57dd6f Mon Sep 17 00:00:00 2001 From: kh1 Date: Wed, 4 Aug 2010 16:02:44 +0200 Subject: Fix the remote command delimiter, this has cahnged at some point. Task-number: QTBUG-12485 QTBUG-12651 Reviewed-by: ck --- demos/qtdemo/menumanager.cpp | 2 +- tools/designer/src/designer/assistantclient.cpp | 2 +- tools/linguist/linguist/mainwindow.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/qtdemo/menumanager.cpp b/demos/qtdemo/menumanager.cpp index 7168b57..c9ffecb 100644 --- a/demos/qtdemo/menumanager.cpp +++ b/demos/qtdemo/menumanager.cpp @@ -313,7 +313,7 @@ void MenuManager::showDocInAssistant(const QString &name) // Send command through remote control even if the process // was started to activate assistant and bring it to front: QTextStream str(&this->assistantProcess); - str << "SetSource " << url << QLatin1Char('\0') << endl; + str << "SetSource " << url << QLatin1Char('\n') << endl; } void MenuManager::launchExample(const QString &name) diff --git a/tools/designer/src/designer/assistantclient.cpp b/tools/designer/src/designer/assistantclient.cpp index e47817f..bddaf63 100644 --- a/tools/designer/src/designer/assistantclient.cpp +++ b/tools/designer/src/designer/assistantclient.cpp @@ -101,7 +101,7 @@ bool AssistantClient::sendCommand(const QString &cmd, QString *errorMessage) return false; } QTextStream str(m_process); - str << cmd << QLatin1Char('\0') << endl; + str << cmd << QLatin1Char('\n') << endl; return true; } diff --git a/tools/linguist/linguist/mainwindow.cpp b/tools/linguist/linguist/mainwindow.cpp index 1611699..163ef54 100644 --- a/tools/linguist/linguist/mainwindow.cpp +++ b/tools/linguist/linguist/mainwindow.cpp @@ -1347,7 +1347,7 @@ void MainWindow::manual() << (QT_VERSION >> 16) << ((QT_VERSION >> 8) & 0xFF) << (QT_VERSION & 0xFF) << QLatin1String("/qdoc/linguist-manual.html") - << QLatin1Char('\0') << endl; + << QLatin1Char('\n') << endl; } void MainWindow::about() -- cgit v0.12