From 3b5f04843c9ab5e0ccce7f4aa8a73d45c9021c35 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Wed, 8 Apr 2009 12:47:47 +0200 Subject: update/fix configure Reviewed-by: Thiago - display the nokia internal usage text like on configure - instead of skipping the license check we need to actually call it to set QT_EDITION and friends properly. Otherwise the build gets broken. --- tools/configure/configureapp.cpp | 8 +++++--- tools/configure/tools.cpp | 7 +++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 5e77606..bcbf557 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -474,6 +474,9 @@ void Configure::parseCmdLine() else if( configCmdLine.at(i) == "-developer-build" ) dictionary[ "BUILDDEV" ] = "yes"; else if( configCmdLine.at(i) == "-nokia-developer" ) { + cout << "Detected -nokia-developer option" << endl; + cout << "Nokia employees and agents are allowed to use this software under" << endl; + cout << "the authority of Nokia Corporation and/or its subsidiary(-ies)" << endl; dictionary[ "BUILDNOKIA" ] = "yes"; dictionary[ "BUILDDEV" ] = "yes"; dictionary["LICENSE_CONFIRMED"] = "yes"; @@ -3511,9 +3514,8 @@ void Configure::readLicense() } #else } else { - if (dictionary[ "BUILDNOKIA" ] != "yes") - Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); - if (dictionary["DONE"] != "error") { + Tools::checkLicense(dictionary, licenseInfo, firstLicensePath()); + if (dictionary["DONE"] != "error" && dictionary["BUILDNOKIA"] != "yes") { // give the user some feedback, and prompt for license acceptance cout << endl << "This is the " << dictionary["PLATFORM NAME"] << " " << dictionary["EDITION"] << " Edition."<< endl << endl; if (!showLicense(dictionary["LICENSE FILE"])) { diff --git a/tools/configure/tools.cpp b/tools/configure/tools.cpp index 760c101..2649d44 100644 --- a/tools/configure/tools.cpp +++ b/tools/configure/tools.cpp @@ -58,6 +58,13 @@ using namespace std; void Tools::checkLicense(QMap &dictionary, QMap &licenseInfo, const QString &path) { + if (dictionary[ "BUILDNOKIA" ] == "yes") { + dictionary["EDITION"] = "NokiaInternalBuild"; + dictionary["LICENSE_FILE"] = ""; // No License for nokia developers + dictionary["QT_EDITION"] = "QT_EDITION_OPENSOURCE"; + return; // No license key checking in internal builds + } + QString tpLicense = dictionary["QT_SOURCE_TREE"] + "/LICENSE.PREVIEW.OPENSOURCE"; if (QFile::exists(tpLicense)) { dictionary["EDITION"] = "Preview"; -- cgit v0.12 From a08d7a675a4e7f61b80a8a92114cda6f8dbacd96 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 8 Apr 2009 12:56:08 +0200 Subject: Added some changes for 4.5.1 --- dist/changes-4.5.1 | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index eb8ec5f..17e32d4 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -52,6 +52,10 @@ Third party components * [245668] set also protocol, verifyMode and verifyDepth in setSslConfiguration() +- QStyleSheetStyle + * Improved support for setting background and foreground roles in styles + such as the text color in a combo box popup on Mac and Cleanlooks. + **************************************************************************** * Database Drivers * **************************************************************************** @@ -64,6 +68,27 @@ Third party components Qt for Linux/X11 ---------------- +- Phonon/GStreamer + * [244259] Fixed a problem where the backend would fail to indicate an + error when streaming fails. + * [233188] Fixed a problem where the seek slider would reset to 0 while + being dragged. + * [246189] Fixed a problem where the backend would fail to correctly + escape certain file names so that playback would not start + * [246097] Added support for the MediaController interface to allow audio + CD playback. + +- QGtkStyle + * The system palette is no longer strictly forced. Also behavior related + to system theme changes have been improved. + * [249363] QFrame is now styled as a GtkScrolledWindow. + * [247653] Fixed a compilation issue on solaris. + * Fixed palette and styling issues with the background color of + combo box popups. + * [239829] Disabled alt-key navigation for QGtkStyle to follow + GTK+ behavior. + * [238196] Allow middle click to set scrollbar position to follow + GTK+ behavior. Qt for Windows -------------- @@ -72,6 +97,9 @@ Qt for Windows * [247401] Fixed a bug that would cause a restarted timer to fire too early, causing Javascript in QtWebKit to consume 100% CPU on Windows. +- QWindowsXPStyle + * [248036] Fixed an issue where tool buttons would incorrectly + hover when disabled. Qt for Mac OS X --------------- @@ -122,7 +150,6 @@ Qt for Windows CE - moc - - uic * [244998] Fixed include file generation for phonon widgets. * [248070] Fixed code generation for QStringList-type properties to use -- cgit v0.12 From 27c1edac6769f863549f0940d35cf3f82e778a46 Mon Sep 17 00:00:00 2001 From: Norwegian Rock Cat Date: Wed, 8 Apr 2009 14:04:26 +0200 Subject: My changes. --- dist/changes-4.5.1 | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/dist/changes-4.5.1 b/dist/changes-4.5.1 index 17e32d4..5584c11 100644 --- a/dist/changes-4.5.1 +++ b/dist/changes-4.5.1 @@ -45,6 +45,13 @@ Third party components - QHttp * [208445] cancel request upon receiving unknown authentication method +- QMacStyle + * [248769] Fix regression where QMacStyle would only draw tabs when passed a QStyleOptionTabV3. + * Adjust the opacity value for popups. + +- QMainWindow + * [248048] Fix a regression that would cause tooltips to disappear when using the unified toolbar. + - QSharedPointer * [246843] Fixed a crash caused by using QSharedPointer in global statics @@ -104,6 +111,35 @@ Qt for Windows Qt for Mac OS X --------------- +- Cocoa port + * Fixed a bug where actions in the native menubar weren't properly disabled. + * Make shortcuts work properly when using the Dvorak-QWERTY+CMD keyboard layout. + * Fixed a bug where dialogs would be positioned in the wrong place on the screen. + * [244369] Window flags on Cocoa windows should match have a similar look as the Carbon ones. + * The build-key for Cocoa was changed in the unlikely case that a plugin may make + assumptions on how Qt was built. All Cocoa plugins built against 4.5.0 WILL NOT WORK + with 4.5.1, we don't foresee changing this again. + * Fixed a bug where some windows would not get activation when they normally should. + * Key events sent to popups do not get propagated onwards. + * [249296] Fix a bug where lineedits on a second page of a stack widget wourd not get key events + * QFileOpenEvents are no longer sent for items passed on the command line. + * Various fixes for determining metrics of text and the ability to disable kerning. + * [248918] Fixed color matching for themed text items. + * Modify the colliding mice example to work better with coalesced updates. + +- Fix a crash when showing a widget that is window modal but has no parent. +- [248803] Showing two dialogs at the same time don't get shared activation. +- Added QSysInfo::MV_10_6 as an enum to test against. +- Various compile fixes for Snow Leopard (preliminary support). + + +- The uninstall-qt.py script included in the binary package no longer complains about removing itself multiple times. + +- Document a bit clearer how qt_mac_set_dock_menu() works. + +- QTestLib + * Activate the test application when launched from the command line. + Qt for Embedded Linux --------------------- @@ -161,6 +197,7 @@ Qt for Windows CE - qmake + * [248806] Ensure that the Xcode generator includes the right path to frameworks. - configure -- cgit v0.12 From f2edb497ac2c3ff6f8c004046e216b8bdf7c4347 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Wed, 8 Apr 2009 14:34:18 +0200 Subject: BT: Fix a painting glitch in gtk combo box This improves the look of combo box with gtk style which is somewhat a regression from 4.5.0 since we did not style this part before. Reviewed-by: nrc --- src/gui/styles/qgtkstyle.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b569b5c..519fed7 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -2507,6 +2507,10 @@ void QGtkStyle::drawControl(ControlElement element, if (selected) { QRect rect = option->rect.adjusted(0, 0, -1, -1); +#ifndef QT_NO_COMBOBOX + if (qobject_cast(widget)) + rect = option->rect; +#endif gtkPainter.paintBox( gtkMenuItem, "menuitem", rect, GTK_STATE_PRELIGHT, GTK_SHADOW_OUT, style); } -- cgit v0.12